From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 31 Mar 2010 13:41:06 +0000 (+0200)
Subject: openssl: Update to 1.0.0.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc05f75b6927b088656f277dc10f56f2b0859d1;p=ipfire-3.x.git

openssl: Update to 1.0.0.
---

diff --git a/pkgs/core/openssl/openssl.nm b/pkgs/core/openssl/openssl.nm
index bc32f57b7..46cb5e4d5 100644
--- a/pkgs/core/openssl/openssl.nm
+++ b/pkgs/core/openssl/openssl.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = openssl
-PKG_VER        = 1.0.0-beta5
+PKG_VER        = 1.0.0
 PKG_REL        = 0
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-beta5-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0-beta5-version.patch
deleted file mode 100644
index cf3bcf6c1..000000000
--- a/pkgs/core/openssl/patches/openssl-1.0.0-beta5-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-We have to keep the beta status on 3 as some applications (OpenSSH) incorrectly insist
-on having the same beta status of OpenSSL library as they were built against.
-diff -up openssl-1.0.0-beta5/crypto/opensslv.h.version openssl-1.0.0-beta5/crypto/opensslv.h
---- openssl-1.0.0-beta5/crypto/opensslv.h.version	2010-01-20 18:16:43.000000000 +0100
-+++ openssl-1.0.0-beta5/crypto/opensslv.h	2010-01-20 20:20:23.000000000 +0100
-@@ -25,7 +25,7 @@
-  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
-  *  major minor fix final patch/beta)
-  */
--#define OPENSSL_VERSION_NUMBER	0x10000005L
-+#define OPENSSL_VERSION_NUMBER	0x10000003L
- #ifdef OPENSSL_FIPS
- #define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0-fips-beta5 20 Jan 2010"
- #else
diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0-version.patch
new file mode 100644
index 000000000..adaea6a38
--- /dev/null
+++ b/pkgs/core/openssl/patches/openssl-1.0.0-version.patch
@@ -0,0 +1,13 @@
+diff -up openssl-1.0.0/crypto/opensslv.h.version openssl-1.0.0/crypto/opensslv.h
+--- openssl-1.0.0/crypto/opensslv.h.version	2010-03-30 10:59:26.000000000 +0200
++++ openssl-1.0.0/crypto/opensslv.h	2010-03-30 11:00:52.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	0x1000000fL
++/* we have to keep the version number to not break the abi */
++#define OPENSSL_VERSION_NUMBER	0x10000003L
+ #ifdef OPENSSL_FIPS
+ #define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.0-fips 29 Mar 2010"
+ #else