This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 2dc05f75b6927b088656f277dc10f56f2b0859d1 (commit) via 1dada106b9ec7a2ad7cbefdbcec18082bdb50032 (commit) from 8842229fdb00cff0807d8c456dc41deb2baf8592 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 2dc05f75b6927b088656f277dc10f56f2b0859d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 15:41:06 2010 +0200

openssl: Update to 1.0.0.

commit 1dada106b9ec7a2ad7cbefdbcec18082bdb50032 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Mar 31 15:40:16 2010 +0200

Update .mailmap.

-----------------------------------------------------------------------

Summary of changes: .mailmap | 1 + pkgs/core/openssl/openssl.nm | 2 +- .../patches/openssl-1.0.0-beta5-version.patch | 14 -------------- .../openssl/patches/openssl-1.0.0-version.patch | 13 +++++++++++++ 4 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 pkgs/core/openssl/patches/openssl-1.0.0-beta5-version.patch create mode 100644 pkgs/core/openssl/patches/openssl-1.0.0-version.patch

Difference in files: diff --git a/.mailmap b/.mailmap index c57afe4..9ec06e7 100644 --- a/.mailmap +++ b/.mailmap @@ -12,3 +12,4 @@ Michael Tremer delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 Michael Tremer ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 Michael Tremer root@ipfire.tremer.info Rene Zingel linuxadmin@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 +Stefan Schantl Stevee@ipfire.org diff --git a/pkgs/core/openssl/openssl.nm b/pkgs/core/openssl/openssl.nm index bc32f57..46cb5e4 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 cf3bcf6..0000000 --- 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 0000000..adaea6a --- /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

hooks/post-receive -- IPFire 3.x development tree