]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - openssl/patches/openssl-1.0.1-version.patch
Merge remote-tracking branch 'arne_f/autoconf'
[people/ms/ipfire-3.x.git] / openssl / patches / openssl-1.0.1-version.patch
1 diff -up openssl-1.0.1/crypto/cversion.c.version openssl-1.0.1/crypto/cversion.c
2 --- openssl-1.0.1/crypto/cversion.c.version 2004-04-19 20:09:22.000000000 +0200
3 +++ openssl-1.0.1/crypto/cversion.c 2012-03-14 20:58:20.630352536 +0100
4 @@ -110,8 +110,15 @@ const char *SSLeay_version(int t)
5 return("not available");
6 }
7
8 -unsigned long SSLeay(void)
9 +unsigned long _original_SSLeay(void)
10 + {
11 + return(0x10000003);
12 + }
13 +
14 +unsigned long _current_SSLeay(void)
15 {
16 return(SSLEAY_VERSION_NUMBER);
17 }
18
19 +__asm__(".symver _original_SSLeay,SSLeay@");
20 +__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.1");
21 diff -up openssl-1.0.1/crypto/opensslv.h.version openssl-1.0.1/crypto/opensslv.h
22 --- openssl-1.0.1/crypto/opensslv.h.version 2012-03-14 20:58:19.914337879 +0100
23 +++ openssl-1.0.1/crypto/opensslv.h 2012-03-14 20:58:20.630352536 +0100
24 @@ -83,7 +83,7 @@
25 * should only keep the versions that are binary compatible with the current.
26 */
27 #define SHLIB_VERSION_HISTORY ""
28 -#define SHLIB_VERSION_NUMBER "1.0.0"
29 +#define SHLIB_VERSION_NUMBER "1.0.1"
30
31
32 #endif /* HEADER_OPENSSLV_H */
33 diff -up openssl-1.0.1/Makefile.shared.version openssl-1.0.1/Makefile.shared
34 --- openssl-1.0.1/Makefile.shared.version 2012-03-14 20:58:20.553350959 +0100
35 +++ openssl-1.0.1/Makefile.shared 2012-03-14 20:58:20.631352556 +0100
36 @@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
37 SHLIB_SUFFIX=; \
38 ALLSYMSFLAGS='-Wl,--whole-archive'; \
39 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
40 - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
41 + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--default-symver,--version-script=version.map -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
42
43 DO_GNU_APP=LDFLAGS="$(CFLAGS)"
44
45 diff -up openssl-1.0.1/version.map.version openssl-1.0.1/version.map
46 --- openssl-1.0.1/version.map.version 2012-03-14 20:58:20.631352556 +0100
47 +++ openssl-1.0.1/version.map 2012-03-14 20:58:20.631352556 +0100
48 @@ -0,0 +1,7 @@
49 +OPENSSL_1.0.1 {
50 + global:
51 + SSLeay;
52 + local:
53 + _original*;
54 + _current*;
55 +};