]> git.ipfire.org Git - ipfire-3.x.git/blob - compat-openssl/patches/openssl-1.0.2a-version.patch
git: Update to 2.23.0
[ipfire-3.x.git] / compat-openssl / patches / openssl-1.0.2a-version.patch
1 diff -up openssl-1.0.2a/crypto/cversion.c.version openssl-1.0.2a/crypto/cversion.c
2 --- openssl-1.0.2a/crypto/cversion.c.version 2015-03-19 14:30:36.000000000 +0100
3 +++ openssl-1.0.2a/crypto/cversion.c 2015-04-21 16:48:56.285535316 +0200
4 @@ -62,7 +62,7 @@
5 # include "buildinf.h"
6 #endif
7
8 -const char *SSLeay_version(int t)
9 +const char *_current_SSLeay_version(int t)
10 {
11 if (t == SSLEAY_VERSION)
12 return OPENSSL_VERSION_TEXT;
13 @@ -101,7 +101,40 @@ const char *SSLeay_version(int t)
14 return ("not available");
15 }
16
17 -unsigned long SSLeay(void)
18 +const char *_original_SSLeay_version(int t)
19 +{
20 + if (t == SSLEAY_VERSION)
21 + return "OpenSSL 1.0.0-fips 29 Mar 2010";
22 + else
23 + return _current_SSLeay_version(t);
24 +}
25 +
26 +const char *_original101_SSLeay_version(int t)
27 +{
28 + if (t == SSLEAY_VERSION)
29 + return "OpenSSL 1.0.1e-fips 11 Feb 2013";
30 + else
31 + return _current_SSLeay_version(t);
32 +}
33 +
34 +unsigned long _original_SSLeay(void)
35 +{
36 + return (0x10000003L);
37 +}
38 +
39 +unsigned long _original101_SSLeay(void)
40 +{
41 + return (0x1000105fL);
42 +}
43 +
44 +unsigned long _current_SSLeay(void)
45 {
46 return (SSLEAY_VERSION_NUMBER);
47 }
48 +
49 +__asm__(".symver _original_SSLeay,SSLeay@");
50 +__asm__(".symver _original_SSLeay_version,SSLeay_version@");
51 +__asm__(".symver _original101_SSLeay,SSLeay@OPENSSL_1.0.1");
52 +__asm__(".symver _original101_SSLeay_version,SSLeay_version@OPENSSL_1.0.1");
53 +__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.2");
54 +__asm__(".symver _current_SSLeay_version,SSLeay_version@@OPENSSL_1.0.2");
55 diff -up openssl-1.0.2a/Makefile.shared.version openssl-1.0.2a/Makefile.shared
56 --- openssl-1.0.2a/Makefile.shared.version 2015-04-21 16:43:02.624170648 +0200
57 +++ openssl-1.0.2a/Makefile.shared 2015-04-21 16:43:02.676171879 +0200
58 @@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
59 SHLIB_SUFFIX=; \
60 ALLSYMSFLAGS='-Wl,--whole-archive'; \
61 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
62 - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
63 + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--default-symver,--version-script=version.map -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
64
65 DO_GNU_APP=LDFLAGS="$(CFLAGS)"
66
67 diff -up openssl-1.0.2a/version.map.version openssl-1.0.2a/version.map
68 --- openssl-1.0.2a/version.map.version 2015-04-21 16:43:02.676171879 +0200
69 +++ openssl-1.0.2a/version.map 2015-04-21 16:51:49.621630589 +0200
70 @@ -0,0 +1,13 @@
71 +OPENSSL_1.0.1 {
72 + global:
73 + SSLeay;
74 + SSLeay_version;
75 + local:
76 + _original*;
77 + _current*;
78 +};
79 +OPENSSL_1.0.2 {
80 + global:
81 + SSLeay;
82 + SSLeay_version;
83 +} OPENSSL_1.0.1;