[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (34ef0ce8c5df7debf6e9156278ce6c03a205e502)

Ladislav Hagara scm at sourcemage.org
Thu Oct 11 19:19:55 EDT 2007


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 crypto/openssl/DETAILS        |    6 +++---
 crypto/openssl/HISTORY        |    4 ++++
 crypto/openssl/PRE_BUILD      |    3 +--
 crypto/openssl/evp_lib.c.diff |   11 -----------
 4 files changed, 8 insertions(+), 16 deletions(-)

New commits:
commit 34ef0ce8c5df7debf6e9156278ce6c03a205e502
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    openssl 0.9.8f

diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 6fb0266..932cfec 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,6 +1,6 @@
            SPELL=openssl
-         VERSION=0.9.8e
-      PATCHLEVEL=1
+         VERSION=0.9.8f
+      PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[2]=ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/$SOURCE
    SOURCE_URL[3]=ftp://ftp.mirror.ac.uk/sites/ftp.openssl.org/source/$SOURCE
    SOURCE_URL[4]=ftp://sunsite.uio.no/pub/security/openssl/source/$SOURCE
-     SOURCE_HASH=sha512:e62f3269b7016e2803d95ccb71b2ef0eadb68d2efb0d9195348b9642b5bc22ceedd8efea2e094c84a51947193e267aefcc24c56be7125baad982068a33411309
+     SOURCE_HASH=sha512:642dcef556a6f5a62cac779b5bd952b4ac56349c2a395fc4f1b27c244e3e145cb30d4cbc79e8061ef73140921b17caac171280097e5c6122313e545e8db249a8
         WEB_SITE=http://www.openssl.org
          ENTERED=20010922
   SECURITY_PATCH=2
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 19fbe2c..b2ac411 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2007-10-12 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.9.8f
+	* PRE_BUILD, evp_lib.c.diff: removed patch
+
 2007-06-19 Thomas Orgis <sobukus at orgis.org>
 	* PRE_BUILD: sed the retarded config for not issuing -march=ev6; fixes alpha
 	* BUILD: exclude alpha arch from the -O hack, as it is an arch with a
diff --git a/crypto/openssl/PRE_BUILD b/crypto/openssl/PRE_BUILD
index 390c349..8c1bf56 100755
--- a/crypto/openssl/PRE_BUILD
+++ b/crypto/openssl/PRE_BUILD
@@ -1,5 +1,4 @@
 default_pre_build      &&
 cd $SOURCE_DIRECTORY   &&
 # braindead openssl 0.9.8e config: -march=evXX is _not_ valid
-sed -i -e 's/ -march=ev5//' -e 's/ -march=ev56//' -e 's/ -march=ev6//' config &&
-patch  crypto/evp/evp_lib.c  <  $SPELL_DIRECTORY/evp_lib.c.diff
+sed -i -e 's/ -march=ev5//' -e 's/ -march=ev56//' -e 's/ -march=ev6//' config
diff --git a/crypto/openssl/evp_lib.c.diff b/crypto/openssl/evp_lib.c.diff
deleted file mode 100644
index 416e77d..0000000
--- a/crypto/openssl/evp_lib.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- evp_lib.c	2006/11/29 20:47:13	1.10.2.1
-+++ evp_lib.c	2007/02/27 18:42:52	1.10.2.2
-@@ -225,7 +225,7 @@
- 
- int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
- 	{
--	return ctx->cipher->key_len;
-+	return ctx->key_len;
- 	}
- 
- int EVP_CIPHER_nid(const EVP_CIPHER *cipher)



More information about the SM-Commit mailing list