[SM-Commit] GIT changes to stable-0.9 grimoire by Jeremy Blosser (f2d0238de107c389ce99d6e8e0033bf5f73024d7)

Jeremy Blosser scm at sourcemage.org
Tue May 1 14:26:19 EDT 2007


GIT changes to stable-0.9 grimoire by Jeremy Blosser <jblosser-smgl at firinn.org>:

 VERSION                       |    2 +-
 crypto/openssl/DETAILS        |    1 +
 crypto/openssl/HISTORY        |    4 ++++
 crypto/openssl/PRE_BUILD      |    4 ++++
 crypto/openssl/evp_lib.c.diff |   11 +++++++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit f2d0238de107c389ce99d6e8e0033bf5f73024d7
Author: Jeremy Blosser <jblosser-smgl at firinn.org>
Commit: Jeremy Blosser <jblosser-smgl at firinn.org>

    VERSION: 0.9-5

commit 102b044e9583f41f9b5025173bc339db22b80ba1
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Jeremy Blosser <jblosser-smgl at firinn.org>

    openssl: applied upstream patch [Bug 13750]
    (cherry picked from commit a0d2840128a713905c900fe2b0090f6d31e040dc)

diff --git a/VERSION b/VERSION
index 72f07a5..a25e54b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9-4
+0.9-5
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 3e3a9f2..6fb0266 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -1,5 +1,6 @@
            SPELL=openssl
          VERSION=0.9.8e
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.openssl.org/source/$SOURCE
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 8636a84..443f8db 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2007-05-01 Ladislav Hagara <hgr at vabo.cz>
+	* PRE_BUILD, evp_lib.c.diff: applied upstream patch [Bug 13750]
+	* DETAILS: PATCHLEVEL=1
+
 2007-02-24 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.9.8e
 
diff --git a/crypto/openssl/PRE_BUILD b/crypto/openssl/PRE_BUILD
new file mode 100755
index 0000000..1141bcf
--- /dev/null
+++ b/crypto/openssl/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd $SOURCE_DIRECTORY   &&
+
+patch  crypto/evp/evp_lib.c  <  $SPELL_DIRECTORY/evp_lib.c.diff
diff --git a/crypto/openssl/evp_lib.c.diff b/crypto/openssl/evp_lib.c.diff
new file mode 100644
index 0000000..416e77d
--- /dev/null
+++ b/crypto/openssl/evp_lib.c.diff
@@ -0,0 +1,11 @@
+--- 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