commit 77ba44ef96d1005810c38a80f89aae78b419925a Author: Sebastian Hahn sebastian@torproject.org Date: Thu Apr 26 14:59:20 2012 +0200

Openssl 1.0.1b released, fixes 1.0.1a compile on osx

That means we can get rid of the patch again... --- build-scripts/versions.mk | 2 +- .../openssl/0002-Fix-openssl-1.0.1a-compile.patch | 26 -------------------- 2 files changed, 1 insertions(+), 27 deletions(-)

diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index fdc67c0..9788cfb 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35

ZLIB_VER=1.2.6 -OPENSSL_VER=1.0.1a +OPENSSL_VER=1.0.1b LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 diff --git a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch b/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch deleted file mode 100644 index 3fbd39c..0000000 --- a/src/current-patches/openssl/0002-Fix-openssl-1.0.1a-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 24d73c226f53c01d1d8400cc4fdad23f5a45412b Mon Sep 17 00:00:00 2001 -From: Sebastian Hahn sebastian@torproject.org -Date: Wed, 25 Apr 2012 23:58:47 +0200 -Subject: [PATCH] Fix openssl 1.0.1a compile - ---- - crypto/evp/e_rc4_hmac_md5.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c -index 3f32b25..e65380d 100644 ---- a/crypto/evp/e_rc4_hmac_md5.c -+++ b/crypto/evp/e_rc4_hmac_md5.c -@@ -103,7 +103,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, - #if !defined(OPENSSL_NO_ASM) && ( \ - defined(__x86_64) || defined(__x86_64__) || \ - defined(_M_AMD64) || defined(_M_X64) || \ -- defined(__INTEL__) ) -+ defined(__INTEL__) ) && \ -+ !(defined(__APPLE__) && defined(__MACH__)) - #define STITCHED_CALL - #endif - --- -1.7.10 -