diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2013-02-07 10:21:20 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2013-02-07 10:21:20 +0000 |
| commit | 361d85064a456626de3cef491bd797604e9e9d6b (patch) | |
| tree | 1132f1454d5f9429e5e61e70dcee044daa812271 | |
| parent | 79f1ebc65eae4d9fd12fc13c16717c2be5cabf95 (diff) | |
| download | aports-361d85064a456626de3cef491bd797604e9e9d6b.tar.bz2 aports-361d85064a456626de3cef491bd797604e9e9d6b.tar.xz | |
main/openssl: eglibc update verioned symbols
| -rw-r--r-- | main/openssl/APKBUILD | 4 | ||||
| -rw-r--r-- | main/openssl/openssl-1.0.1-version-eglibc.patch | 55 |
2 files changed, 57 insertions, 2 deletions
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index cf042ea605..284fb38196 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -20,7 +20,7 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch 0004-crypto-engine-autoload-padlock-dynamic-engine.patch 0005-s_client-ircv3-starttls.patch - version-script-eglibc.patch" + openssl-1.0.1-version-eglibc.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -97,4 +97,4 @@ ddb5fc155145d5b852425adaec32234d 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESH d95bbaa38889836afd3c52f3962f3b54 0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch c32f42451a07267ee5dfb3781fa40c00 0004-crypto-engine-autoload-padlock-dynamic-engine.patch c5b1042a3acaf3591f3f5620b7086e12 0005-s_client-ircv3-starttls.patch -fcf44e9894d87a8bfe368e9b134647d5 version-script-eglibc.patch" +d1f3aaad7c36590f21355682983cd14e openssl-1.0.1-version-eglibc.patch" diff --git a/main/openssl/openssl-1.0.1-version-eglibc.patch b/main/openssl/openssl-1.0.1-version-eglibc.patch new file mode 100644 index 0000000000..eb5bb2ed50 --- /dev/null +++ b/main/openssl/openssl-1.0.1-version-eglibc.patch @@ -0,0 +1,55 @@ +diff -up openssl-1.0.1/crypto/cversion.c.version openssl-1.0.1/crypto/cversion.c +--- openssl-1.0.1/crypto/cversion.c.version 2004-04-19 20:09:22.000000000 +0200 ++++ openssl-1.0.1/crypto/cversion.c 2012-03-14 20:58:20.630352536 +0100 +@@ -110,8 +110,15 @@ const char *SSLeay_version(int t) + return("not available"); + } + +-unsigned long SSLeay(void) ++unsigned long _original_SSLeay(void) ++ { ++ return(0x10000003); ++ } ++ ++unsigned long _current_SSLeay(void) + { + return(SSLEAY_VERSION_NUMBER); + } + ++__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.1d" + + + #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 +@@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \ + SHLIB_SUFFIX=; \ + ALLSYMSFLAGS='-Wl,--whole-archive'; \ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ +- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" ++ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--default-symver,--version-script=version.map -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" + + DO_GNU_APP=LDFLAGS="$(CFLAGS)" + +diff -up openssl-1.0.1/version.map.version openssl-1.0.1/version.map +--- openssl-1.0.1/version.map.version 2012-03-14 20:58:20.631352556 +0100 ++++ openssl-1.0.1/version.map 2012-03-14 20:58:20.631352556 +0100 +@@ -0,0 +1,7 @@ ++OPENSSL_1.0.1 { ++ global: ++ SSLeay; ++ local: ++ _original*; ++ _current*; ++}; |