src/patches/openssl-1.0.2a-rpmbuild.patch

   1 diff -Nur openssl-1.0.2a-vanilla/Configure openssl-1.0.2a/Configure
   2 --- openssl-1.0.2a-vanilla/Configure    2015-03-19 13:30:36.000000000 +0000
   3 +++ openssl-1.0.2a/Configure    2015-04-23 10:31:41.336569854 +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  #######################################################################
  13 @@ -389,7 +389,7 @@
  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)",
  22 @@ -1737,7 +1737,7 @@
  23         elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  24                 {
  25                 my $sotmp = $1;
  26 -               s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
  27 +               s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SONAMEVER) .s$sotmp/;
  28                 }
  29         elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
  30                 {
  31 diff -Nur openssl-1.0.2a-vanilla/Makefile.org openssl-1.0.2a/Makefile.org
  32 --- openssl-1.0.2a-vanilla/Makefile.org 2015-03-19 13:30:36.000000000 +0000
  33 +++ openssl-1.0.2a/Makefile.org 2015-04-23 10:30:03.184371933 +0000
  34 @@ -10,6 +10,7 @@
  35  SHLIB_MAJOR=
  36  SHLIB_MINOR=
  37  SHLIB_EXT=
  38 +SHLIB_SONAMEVER=10
  39  PLATFORM=dist
  40  OPTIONS=
  41  CONFIGURE_ARGS=
  42 @@ -335,10 +336,9 @@
  43  link-shared:
  44         @ set -e; for i in $(SHLIBDIRS); do \
  45                 $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
  46 -                       LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
  47 +                       LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \
  48                         LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
  49                         symlink.$(SHLIB_TARGET); \
  50 -               libs="$$libs -l$$i"; \
  51         done
  52
  53  build-shared: do_$(SHLIB_TARGET) link-shared
  54 @@ -349,7 +349,7 @@
  55                         libs="$(LIBKRB5) $$libs"; \
  56                 fi; \
  57                 $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
  58 -                       LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
  59 +                       LIBNAME=$$i LIBVERSION=$(SHLIB_SONAMEVER) \
  60                         LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
  61                         LIBDEPS="$$libs $(EX_LIBS)" \
  62                         link_a.$(SHLIB_TARGET); \