projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| a0297133 | 1 | diff -up openssl-1.0.1e/Configure.rpmbuild openssl-1.0.1e/Configure |
| 1245aa72 MT |
2 | --- openssl-1.0.2a.vanilla/Configure 2015-03-19 13:30:36.000000000 +0000 |
| 3 | +++ openssl-1.0.2a/Configure 2015-04-19 09:53:04.381491868 +0000 | |
| 4 | @@ -348,7 +348,7 @@ | |
| 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 | ####################################################################### | |
| a0297133 MT |
13 | @@ -1675,7 +1676,7 @@ while (<IN>) |
| 14 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) | |
| 15 | { | |
| 16 | my $sotmp = $1; | |
| 17 | - s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; | |
| 18 | + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/; | |
| 19 | } | |
| 20 | elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) | |
| 21 | { | |
| 22 | diff -up openssl-1.0.1e/Makefile.org.rpmbuild openssl-1.0.1e/Makefile.org | |
| 23 | --- openssl-1.0.1e/Makefile.org.rpmbuild 2013-02-11 16:26:04.000000000 +0100 | |
| 24 | +++ openssl-1.0.1e/Makefile.org 2014-08-13 19:19:53.218005759 +0200 | |
| 25 | @@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY= | |
| 26 | SHLIB_MAJOR= | |
| 27 | SHLIB_MINOR= | |
| 28 | SHLIB_EXT= | |
| 29 | +SHLIB_SONAMEVER=10 | |
| 30 | PLATFORM=dist | |
| 31 | OPTIONS= | |
| 32 | CONFIGURE_ARGS= | |
| 33 | @@ -333,10 +334,9 @@ clean-shared: | |
| 34 | link-shared: | |
| 35 | @ set -e; for i in $(SHLIBDIRS); do \ | |
| 36 | $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ | |
| 37 | - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ | |
| 38 | + LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ | |
| 39 | LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ | |
| 40 | symlink.$(SHLIB_TARGET); \ | |
| 41 | - libs="$$libs -l$$i"; \ | |
| 42 | done | |
| 43 | ||
| 44 | build-shared: do_$(SHLIB_TARGET) link-shared | |
| 45 | @@ -347,7 +347,7 @@ do_$(SHLIB_TARGET): | |
| 46 | libs="$(LIBKRB5) $$libs"; \ | |
| 47 | fi; \ | |
| 48 | $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ | |
| 49 | - LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ | |
| 50 | + LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \ | |
| 51 | LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ | |
| 52 | LIBDEPS="$$libs $(EX_LIBS)" \ | |
| 53 | link_a.$(SHLIB_TARGET); \ |