]>
Commit | Line | Data |
---|---|---|
377eaee2 MT |
1 | diff -Nur openssl-1.0.2d/Configure openssl-1.0.2d.patched/Configure |
2 | --- openssl-1.0.2d/Configure 2015-07-09 11:57:15.000000000 +0000 | |
3 | +++ openssl-1.0.2d.patched/Configure 2015-08-22 20:44:19.487000000 +0000 | |
4 | @@ -365,7 +365,7 @@ | |
1245aa72 MT |
5 | #### |
6 | # *-generic* is endian-neutral target, but ./config is free to | |
7 | # throw in -D[BL]_ENDIAN, whichever appropriate... | |
8 | -"linux-generic32","gcc:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
9 | +"linux-generic32","gcc:\$(CFLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC:\$(CFLAGS):.so.\$(SHLIB_SONAMEVER)", | |
10 | "linux-ppc", "gcc:-DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
11 | ||
12 | ####################################################################### | |
377eaee2 | 13 | @@ -406,7 +406,7 @@ |
37de68c9 MT |
14 | "linux64-mips64", "gcc:-mabi=64 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", |
15 | #### IA-32 targets... | |
16 | "linux-ia32-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
17 | -"linux-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
18 | +"linux-elf", "gcc:-DL_ENDIAN \$(CFLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_SONAMEVER)", | |
19 | "linux-aout", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", | |
20 | #### | |
21 | "linux-generic64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
377eaee2 MT |
22 | @@ -414,7 +414,7 @@ |
23 | "linux-ppc64le","gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:$ppc64_asm:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", | |
24 | "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
25 | "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", | |
26 | -"linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", | |
27 | +"linux-x86_64", "gcc:-m64 -DL_ENDIAN \$(CFLAGS) -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_SONAMEVER):::64", | |
28 | "linux-x86_64-clang", "clang: -m64 -DL_ENDIAN -O3 -Wall -Wextra $clang_disabled_warnings -Qunused-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", | |
29 | "linux-x86_64-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", | |
30 | "linux-x32", "gcc:-mx32 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", | |
31 | @@ -1764,7 +1764,7 @@ | |
a0297133 MT |
32 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) |
33 | { | |
34 | my $sotmp = $1; | |
35 | - s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; | |
36 | + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/; | |
37 | } | |
38 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) | |
39 | { | |
377eaee2 MT |
40 | |
41 | diff -Nur openssl-1.0.2d/Makefile.org openssl-1.0.2d.patched/Makefile.org | |
42 | --- openssl-1.0.2d/Makefile.org 2015-07-09 11:57:15.000000000 +0000 | |
43 | +++ openssl-1.0.2d.patched/Makefile.org 2015-08-22 20:41:49.921000000 +0000 | |
37de68c9 | 44 | @@ -10,6 +10,7 @@ |
a0297133 MT |
45 | SHLIB_MAJOR= |
46 | SHLIB_MINOR= | |
47 | SHLIB_EXT= | |
48 | +SHLIB_SONAMEVER=10 | |
49 | PLATFORM=dist | |
50 | OPTIONS= | |
51 | CONFIGURE_ARGS= | |
377eaee2 | 52 | @@ -339,10 +340,9 @@ |
a0297133 MT |
53 | link-shared: |
54 | @ set -e; for i in $(SHLIBDIRS); do \ | |
55 | $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ | |
56 | - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ | |
57 | + LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ | |
58 | LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ | |
59 | symlink.$(SHLIB_TARGET); \ | |
60 | - libs="$$libs -l$$i"; \ | |
61 | done | |
62 | ||
63 | build-shared: do_$(SHLIB_TARGET) link-shared | |
377eaee2 | 64 | @@ -353,7 +353,7 @@ |
a0297133 MT |
65 | libs="$(LIBKRB5) $$libs"; \ |
66 | fi; \ | |
67 | $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ | |
68 | - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ | |
69 | + LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ | |
70 | LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ | |
71 | LIBDEPS="$$libs $(EX_LIBS)" \ |