From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Sep 2011 12:43:46 +0000 (+0200)
Subject: openssl: Update to 1.0.0e.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5416a00f95ac532f501731424b1cd9c16bb10ad5;p=people%2Fms%2Fipfire-3.x.git

openssl: Update to 1.0.0e.

Fixes #259, CVE-2011-3207 and CVE-2011-3210.
More information at: http://openssl.org/news/secadv_20110906.txt
---

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index fd66c7800..278f3e13f 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = openssl
-version    = 1.0.0d
-release    = 3
+version    = 1.0.0e
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -19,7 +19,7 @@ description
 	libraries which provide various cryptographic algorithms and protocols.
 end
 
-source_dl  =
+source_dl  = http://openssl.org/source/
 
 build
 	requires
diff --git a/openssl/patches/openssl-1.0.0d-version.patch b/openssl/patches/openssl-1.0.0e-version.patch
similarity index 57%
rename from openssl/patches/openssl-1.0.0d-version.patch
rename to openssl/patches/openssl-1.0.0e-version.patch
index da50fb4f9..0a45f74b0 100644
--- a/openssl/patches/openssl-1.0.0d-version.patch
+++ b/openssl/patches/openssl-1.0.0e-version.patch
@@ -1,22 +1,22 @@
-diff -up openssl-1.0.0d/crypto/opensslv.h.version openssl-1.0.0d/crypto/opensslv.h
---- openssl-1.0.0d/crypto/opensslv.h.version	2011-02-10 14:24:52.000000000 +0100
-+++ openssl-1.0.0d/crypto/opensslv.h	2011-02-10 14:48:00.000000000 +0100
+diff -up openssl-1.0.0e/crypto/opensslv.h.version openssl-1.0.0e/crypto/opensslv.h
+--- openssl-1.0.0e/crypto/opensslv.h.version	2011-09-07 13:55:52.000000000 +0200
++++ openssl-1.0.0e/crypto/opensslv.h	2011-09-07 13:59:28.000000000 +0200
 @@ -25,7 +25,8 @@
   * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
   *  major minor fix final patch/beta)
   */
--#define OPENSSL_VERSION_NUMBER	0x1000004fL
+-#define OPENSSL_VERSION_NUMBER	0x1000005fL
 +/* we have to keep the version number to not break the abi */
 +#define OPENSSL_VERSION_NUMBER	0x10000003
  #ifdef OPENSSL_FIPS
- #define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0d-fips 8 Feb 2011"
+ #define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0e-fips 6 Sep 2011"
  #else
 @@ -83,7 +84,7 @@
   * should only keep the versions that are binary compatible with the current.
   */
  #define SHLIB_VERSION_HISTORY ""
 -#define SHLIB_VERSION_NUMBER "1.0.0"
-+#define SHLIB_VERSION_NUMBER "1.0.0d"
++#define SHLIB_VERSION_NUMBER "1.0.0e"
  
  
  #endif /* HEADER_OPENSSLV_H */