From 9cf55df55b18e97d42326cdf45b8a7e5cd5796f2 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 19 Feb 2013 20:35:16 +0100 Subject: [PATCH] fix up the SHLIB_VERSION_NUMBER --- openssl-1.0.1-version.patch | 12 ------------ openssl.spec | 8 ++++++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/openssl-1.0.1-version.patch b/openssl-1.0.1-version.patch index 4b8f584..831aa61 100644 --- a/openssl-1.0.1-version.patch +++ b/openssl-1.0.1-version.patch @@ -18,18 +18,6 @@ diff -up openssl-1.0.1/crypto/cversion.c.version openssl-1.0.1/crypto/cversion.c +__asm__(".symver _original_SSLeay,SSLeay@"); +__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.1"); -diff -up openssl-1.0.1/crypto/opensslv.h.version openssl-1.0.1/crypto/opensslv.h ---- openssl-1.0.1/crypto/opensslv.h.version 2012-03-14 20:58:19.914337879 +0100 -+++ openssl-1.0.1/crypto/opensslv.h 2012-03-14 20:58:20.630352536 +0100 -@@ -83,7 +83,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.1c" - - - #endif /* HEADER_OPENSSLV_H */ diff -up openssl-1.0.1/Makefile.shared.version openssl-1.0.1/Makefile.shared --- openssl-1.0.1/Makefile.shared.version 2012-03-14 20:58:20.553350959 +0100 +++ openssl-1.0.1/Makefile.shared 2012-03-14 20:58:20.631352556 +0100 diff --git a/openssl.spec b/openssl.spec index c281a26..1ff3703 100644 --- a/openssl.spec +++ b/openssl.spec @@ -21,8 +21,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.0.1e -# Do not forget to bump SHLIB_VERSION on version upgrades -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source # tarball with the hobble-openssl script which is included below. @@ -176,6 +175,8 @@ from other formats to the formats used by the OpenSSL toolkit. %patch81 -p1 -b .padlock64 %patch82 -p1 -b .backports +sed -i 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' crypto/opensslv.h + # Modify the various perl scripts to reference perl in the right location. perl util/perlpath.pl `dirname %{__perl}` @@ -430,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.* %postun libs -p /sbin/ldconfig %changelog +* Tue Feb 19 2013 Tomas Mraz 1.0.1e-3 +- fix up the SHLIB_VERSION_NUMBER + * Tue Feb 19 2013 Tomas Mraz 1.0.1e-2 - disable ZLIB loading by default (due to CRIME attack)