From: Schantl Stefan <Stevee@ipfire.org>
Date: Sun, 28 Nov 2010 17:48:22 +0000 (+0100)
Subject: openssl: Update to 1.0.0b
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91900de50dbbedab012ae97f4e3d5bfe3270c44f;p=ipfire-3.x.git

openssl: Update to 1.0.0b

Package only compiles through without change arandom to urandom, need to fix this!

Refers to #96
---

diff --git a/pkgs/core/openssl/openssl.nm b/pkgs/core/openssl/openssl.nm
index 0b5b0b36f..5104c0b81 100644
--- a/pkgs/core/openssl/openssl.nm
+++ b/pkgs/core/openssl/openssl.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = openssl
-PKG_VER        = 1.0.0
-PKG_REL        = 1
+PKG_VER        = 1.0.0b
+PKG_REL        = 2
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
 PKG_GROUP      = System/Libraries
@@ -60,8 +60,8 @@ endif
 #endif
 
 define STAGE_PREPARE_CMDS
-	cd $(DIR_APP) && sed -e 's/__OpenBSD__/__linux__/' -e 's/arandom/urandom/' \
-				-i crypto/rand/randfile.c
+	#cd $(DIR_APP) && sed -e 's/__OpenBSD__/__linux__/' -e 's/arandom/urandom/' \
+	#			-i crypto/rand/randfile.c
 
 	cd $(DIR_APP) && sed -e 's/__OpenBSD__/__linux__/' -i crypto/rand/rand_unix.c
 
diff --git a/pkgs/core/openssl/patches/openssl-1.0.0-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0-version.patch
deleted file mode 100644
index adaea6a38..000000000
--- a/pkgs/core/openssl/patches/openssl-1.0.0-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/pkgs/core/openssl/patches/openssl-1.0.0b-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0b-version.patch
new file mode 100644
index 000000000..bdb6ab6ac
--- /dev/null
+++ b/pkgs/core/openssl/patches/openssl-1.0.0b-version.patch
@@ -0,0 +1,22 @@
+diff -up openssl-1.0.0b/crypto/opensslv.h.version openssl-1.0.0b/crypto/opensslv.h
+--- openssl-1.0.0b/crypto/opensslv.h.version	2010-11-16 17:31:23.000000000 +0100
++++ openssl-1.0.0b/crypto/opensslv.h	2010-11-16 17:32:59.000000000 +0100
+@@ -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	0x1000002f
++/* 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.0b-fips 16 Nov 2010"
+ #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.0b"
+ 
+ 
+ #endif /* HEADER_OPENSSLV_H */