From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH] compat-openssl: Update to 1.1.1s Date: Tue, 29 Nov 2022 17:54:49 +0100 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7213083171513967018==" List-Id: --===============7213083171513967018== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is required as a dependency for many other packages. However, it has to be noted that OpenSSL's testsuite currently fails, which is why it is temporarily disabled in order to resolve a blocker in IPFire 3 development. Cc: Stefan Schantl Signed-off-by: Peter M=C3=BCller --- compat-openssl/compat-openssl.nm | 41 ++----- compat-openssl/openssl.cnf | 94 -------------- .../patches/openssl-0.9.8a-no-rpath.patch | 11 -- .../patches/openssl-1.0.0-beta4-ca-dir.patch | 36 ------ .../openssl-1.0.0-beta5-enginesdir.patch | 52 -------- .../patches/openssl-1.0.2a-version.patch | 83 ------------- .../patches/openssl-1.0.2e-rpmbuild.patch | 115 ------------------ 7 files changed, 9 insertions(+), 423 deletions(-) delete mode 100644 compat-openssl/openssl.cnf delete mode 100644 compat-openssl/patches/openssl-0.9.8a-no-rpath.patch delete mode 100644 compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch delete mode 100644 compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.pat= ch delete mode 100644 compat-openssl/patches/openssl-1.0.2a-version.patch delete mode 100644 compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl= .nm index c45089dfc..eeb266c57 100644 --- a/compat-openssl/compat-openssl.nm +++ b/compat-openssl/compat-openssl.nm @@ -4,13 +4,13 @@ ############################################################################= ### =20 name =3D compat-openssl -version =3D 1.0.2n +version =3D 1.1.1s release =3D 1 thisapp =3D openssl-%{version} =20 maintainer =3D Michael Tremer groups =3D System/Libraries -url =3D http://www.openssl.org/ +url =3D https://www.openssl.org/ license =3D OpenSSL summary =3D A general purpose cryptography library with TLS implementatio= n. =20 @@ -20,13 +20,14 @@ description libraries which provide various cryptographic algorithms and protocols. end =20 -source_dl =3D http://openssl.org/source/ +source_dl =3D https://openssl.org/source/ =20 build requires bc gnutls-devel perl + perl(Test::Harness) util-linux zlib-devel end @@ -36,43 +37,24 @@ build =20 prepare_cmds sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/'= \ - -i crypto/opensslv.h + -i include/openssl/opensslv.h =20 find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=3D/&-Wa,--noexecstack /' -i {} \; - - # Generate a table with the compile settings for my perusal. - touch Makefile - make TABLE PERL=3D/usr/bin/perl end =20 # Set default ssl_arch. ssl_arch =3D linux-%{DISTRO_ARCH} =20 - if "%{DISTRO_ARCH}" =3D=3D "i686" - # 386 implies no-sse2 - ssl_arch =3D linux-elf no-asm 386 - end - - if "%{DISTRO_ARCH}" =3D=3D "armv5tel" - ssl_arch =3D linux-armv4 - end - - if "%{DISTRO_ARCH}" =3D=3D "armv7hl" - ssl_arch =3D linux-armv4 - end - build ./Configure \ --prefix=3D/usr \ --openssldir=3D/etc/pki/tls \ - --enginesdir=3D%{libdir}/openssl/engines \ shared \ zlib-dynamic \ enable-camellia \ enable-md2 \ enable-seed \ - enable-tlsext \ enable-rfc3779 \ no-idea \ no-mdc2 \ @@ -85,17 +67,12 @@ build # Build. make depend make all - - # Generate hashes for the included certs. - make rehash end =20 - test - # Revert ca-dir patch. Otherwise the tests will fail. - patch -Np1 -R < %{DIR_PATCHES}/openssl-1.0.0-beta4-ca-dir.patch - - make test - end + #test + # + # #make test + #end =20 install make install INSTALL_PREFIX=3D%{BUILDROOT} diff --git a/compat-openssl/openssl.cnf b/compat-openssl/openssl.cnf deleted file mode 100644 index 41947652d..000000000 --- a/compat-openssl/openssl.cnf +++ /dev/null @@ -1,94 +0,0 @@ -HOME =3D . -RANDFILE =3D /var/tmp/.rnd -oid_section =3D new_oids - -[ new_oids ] - -[ ca ] -default_ca =3D IPFire - -[ IPFire ] -dir =3D /var/ipfire -certs =3D $dir/certs -crl_dir =3D $dir/crls -database =3D $dir/certs/index.txt -new_certs_dir =3D $dir/certs -certificate =3D $dir/ca/cacert.pem -serial =3D $dir/certs/serial -crl =3D $dir/crls/cacrl.pem -private_key =3D $dir/private/cakey.pem -RANDFILE =3D $dir/tmp/.rand -x509_extensions =3D usr_cert -default_days =3D 999999 -default_crl_days=3D 30 -default_md =3D md5 -preserve =3D no -policy =3D policy_match -email_in_dn =3D no - -[ policy_match ] -countryName =3D optional -stateOrProvinceName =3D optional -organizationName =3D optional -organizationalUnitName =3D optional -commonName =3D supplied -emailAddress =3D optional - -[ req ] -default_bits =3D 1024 -default_keyfile =3D privkey.pem -distinguished_name =3D req_distinguished_name -attributes =3D req_attributes -x509_extensions =3D v3_ca -string_mask =3D nombstr - -[ req_distinguished_name ] -countryName =3D Country Name (2 letter code) -countryName_default =3D DE -countryName_min =3D 2 -countryName_max =3D 2 - -stateOrProvinceName =3D State or Province Name (full name) -stateOrProvinceName_default =3D - -localityName =3D Locality Name (eg, city) -#localityName_default =3D - -0.organizationName =3D Organization Name (eg, company) -0.organizationName_default =3D IPFire - -organizationalUnitName =3D Organizational Unit Name (eg, section) -#organizationalUnitName_default =3D - -commonName =3D Common Name (eg, your name or your server\'s hostname) -commonName_max =3D 64 - -emailAddress =3D Email Address -emailAddress_max =3D 40 - -[ req_attributes ] -challengePassword =3D A challenge password -challengePassword_min =3D 4 -challengePassword_max =3D 20 -unstructuredName =3D An optional company name - -[ usr_cert ] -basicConstraints=3DCA:FALSE -nsComment =3D "OpenSSL Generated Certificate" -subjectKeyIdentifier=3Dhash -authorityKeyIdentifier=3Dkeyid,issuer:always - -[ v3_req ] -basicConstraints =3D CA:FALSE -keyUsage =3D nonRepudiation, digitalSignature, keyEncipherment - -[ v3_ca ] -subjectKeyIdentifier=3Dhash -authorityKeyIdentifier=3Dkeyid:always,issuer:always -basicConstraints =3D CA:true - -[ crl_ext ] -authorityKeyIdentifier=3Dkeyid:always,issuer:always - -[ engine ] -default =3D openssl diff --git a/compat-openssl/patches/openssl-0.9.8a-no-rpath.patch b/compat-op= enssl/patches/openssl-0.9.8a-no-rpath.patch deleted file mode 100644 index 8f8fb912e..000000000 --- a/compat-openssl/patches/openssl-0.9.8a-no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openssl-0.9.8a/Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0= 200 -+++ openssl-0.9.8a/Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS=3D'-Wl,--no-whole-archive'; \ - SHAREDFLAGS=3D"$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-son= ame=3D$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -=20 --DO_GNU_APP=3DLDFLAGS=3D"$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=3DLDFLAGS=3D"$(CFLAGS)" -=20 - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch b/compat= -openssl/patches/openssl-1.0.0-beta4-ca-dir.patch deleted file mode 100644 index 751cabdd9..000000000 --- a/compat-openssl/patches/openssl-1.0.0-beta4-ca-dir.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up openssl-1.0.0-beta4/apps/CA.pl.in.ca-dir openssl-1.0.0-beta4/apps/C= A.pl.in ---- openssl-1.0.0-beta4/apps/CA.pl.in.ca-dir 2006-04-28 02:30:49.000000000 += 0200 -+++ openssl-1.0.0-beta4/apps/CA.pl.in 2009-11-12 12:33:13.000000000 +0100 -@@ -53,7 +53,7 @@ $VERIFY=3D"$openssl verify"; - $X509=3D"$openssl x509"; - $PKCS12=3D"$openssl pkcs12"; -=20 --$CATOP=3D"./demoCA"; -+$CATOP=3D"/etc/pki/CA"; - $CAKEY=3D"cakey.pem"; - $CAREQ=3D"careq.pem"; - $CACERT=3D"cacert.pem"; -diff -up openssl-1.0.0-beta4/apps/CA.sh.ca-dir openssl-1.0.0-beta4/apps/CA.sh ---- openssl-1.0.0-beta4/apps/CA.sh.ca-dir 2009-10-15 19:27:47.000000000 +0200 -+++ openssl-1.0.0-beta4/apps/CA.sh 2009-11-12 12:35:14.000000000 +0100 -@@ -68,7 +68,7 @@ VERIFY=3D"$OPENSSL verify" - X509=3D"$OPENSSL x509" - PKCS12=3D"openssl pkcs12" -=20 --if [ -z "$CATOP" ] ; then CATOP=3D./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=3D/etc/pki/CA ; fi - CAKEY=3D./cakey.pem - CAREQ=3D./careq.pem - CACERT=3D./cacert.pem -diff -up openssl-1.0.0-beta4/apps/openssl.cnf.ca-dir openssl-1.0.0-beta4/app= s/openssl.cnf ---- openssl-1.0.0-beta4/apps/openssl.cnf.ca-dir 2009-11-12 12:33:13.00000000= 0 +0100 -+++ openssl-1.0.0-beta4/apps/openssl.cnf 2009-11-12 12:33:13.000000000 +0100 -@@ -39,7 +39,7 @@ default_ca =3D CA_default # The default c - #################################################################### - [ CA_default ] -=20 --dir =3D ./demoCA # Where everything is kept -+dir =3D /etc/pki/CA # Where everything is kept - certs =3D $dir/certs # Where the issued certs are kept - crl_dir =3D $dir/crl # Where the issued crl are kept - database =3D $dir/index.txt # database index file. diff --git a/compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch b/co= mpat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch deleted file mode 100644 index d942d6e2b..000000000 --- a/compat-openssl/patches/openssl-1.0.0-beta5-enginesdir.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up openssl-1.0.0-beta5/Configure.enginesdir openssl-1.0.0-beta5/Config= ure ---- openssl-1.0.0-beta5/Configure.enginesdir 2010-01-20 18:07:05.000000000 += 0100 -+++ openssl-1.0.0-beta5/Configure 2010-01-20 18:10:48.000000000 +0100 -@@ -622,6 +622,7 @@ my $idx_multilib =3D $idx++; - my $prefix=3D""; - my $libdir=3D""; - my $openssldir=3D""; -+my $enginesdir=3D""; - my $exe_ext=3D""; - my $install_prefix=3D "$ENV{'INSTALL_PREFIX'}"; - my $cross_compile_prefix=3D""; -@@ -833,6 +834,10 @@ PROCESS_ARGS: - { - $openssldir=3D$1; - } -+ elsif (/^--enginesdir=3D(.*)$/) -+ { -+ $enginesdir=3D$1; -+ } - elsif (/^--install.prefix=3D(.*)$/) - { - $install_prefix=3D$1; -@@ -1053,7 +1058,7 @@ chop $prefix if $prefix =3D~ /.\/$/; -=20 - $openssldir=3D$prefix . "/ssl" if $openssldir eq ""; - $openssldir=3D$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]= :[\\\/])/; -- -+$enginesdir=3D"$prefix/lib/engines" if $enginesdir eq ""; -=20 - print "IsMK1MF=3D$IsMK1MF\n"; -=20 -@@ -1673,7 +1678,7 @@ while () - } - elsif (/^#define\s+ENGINESDIR/) - { -- my $foo =3D "$prefix/$libdir/engines"; -+ my $foo =3D "$enginesdir"; - $foo =3D~ s/\\/\\\\/g; - print OUT "#define ENGINESDIR \"$foo\"\n"; - } -diff -up openssl-1.0.0-beta5/engines/Makefile.enginesdir openssl-1.0.0-beta5= /engines/Makefile ---- openssl-1.0.0-beta5/engines/Makefile.enginesdir 2010-01-16 21:06:09.0000= 00000 +0100 -+++ openssl-1.0.0-beta5/engines/Makefile 2010-01-20 18:07:05.000000000 +0100 -@@ -124,7 +124,7 @@ install: - sfx=3D".so"; \ - cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l= $$sfx.new; \ - fi; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$s= fx.new; \ -+ chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$s= fx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.n= ew $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ - done; \ - fi diff --git a/compat-openssl/patches/openssl-1.0.2a-version.patch b/compat-ope= nssl/patches/openssl-1.0.2a-version.patch deleted file mode 100644 index 25dfff51b..000000000 --- a/compat-openssl/patches/openssl-1.0.2a-version.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff -up openssl-1.0.2a/crypto/cversion.c.version openssl-1.0.2a/crypto/cver= sion.c ---- openssl-1.0.2a/crypto/cversion.c.version 2015-03-19 14:30:36.000000000 += 0100 -+++ openssl-1.0.2a/crypto/cversion.c 2015-04-21 16:48:56.285535316 +0200 -@@ -62,7 +62,7 @@ - # include "buildinf.h" - #endif -=20 --const char *SSLeay_version(int t) -+const char *_current_SSLeay_version(int t) - { - if (t =3D=3D SSLEAY_VERSION) - return OPENSSL_VERSION_TEXT; -@@ -101,7 +101,40 @@ const char *SSLeay_version(int t) - return ("not available"); - } -=20 --unsigned long SSLeay(void) -+const char *_original_SSLeay_version(int t) -+{ -+ if (t =3D=3D SSLEAY_VERSION) -+ return "OpenSSL 1.0.0-fips 29 Mar 2010"; -+ else -+ return _current_SSLeay_version(t); -+} -+ -+const char *_original101_SSLeay_version(int t) -+{ -+ if (t =3D=3D SSLEAY_VERSION) -+ return "OpenSSL 1.0.1e-fips 11 Feb 2013"; -+ else -+ return _current_SSLeay_version(t); -+} -+ -+unsigned long _original_SSLeay(void) -+{ -+ return (0x10000003L); -+} -+ -+unsigned long _original101_SSLeay(void) -+{ -+ return (0x1000105fL); -+} -+ -+unsigned long _current_SSLeay(void) - { - return (SSLEAY_VERSION_NUMBER); - } -+ -+__asm__(".symver _original_SSLeay,SSLeay@"); -+__asm__(".symver _original_SSLeay_version,SSLeay_version@"); -+__asm__(".symver _original101_SSLeay,SSLeay(a)OPENSSL_1.0.1"); -+__asm__(".symver _original101_SSLeay_version,SSLeay_version(a)OPENSSL_1.0.1= "); -+__asm__(".symver _current_SSLeay,SSLeay@@OPENSSL_1.0.2"); -+__asm__(".symver _current_SSLeay_version,SSLeay_version@@OPENSSL_1.0.2"); -diff -up openssl-1.0.2a/Makefile.shared.version openssl-1.0.2a/Makefile.shar= ed ---- openssl-1.0.2a/Makefile.shared.version 2015-04-21 16:43:02.624170648 +02= 00 -+++ openssl-1.0.2a/Makefile.shared 2015-04-21 16:43:02.676171879 +0200 -@@ -151,7 +151,7 @@ DO_GNU_SO=3D$(CALC_VERSIONS); \ - SHLIB_SUFFIX=3D; \ - ALLSYMSFLAGS=3D'-Wl,--whole-archive'; \ - NOALLSYMSFLAGS=3D'-Wl,--no-whole-archive'; \ -- SHAREDFLAGS=3D"$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-son= ame=3D$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" -+ SHAREDFLAGS=3D"$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--de= fault-symver,--version-script=3Dversion.map -Wl,-soname=3D$$SHLIB$$SHLIB_SOVE= R$$SHLIB_SUFFIX" -=20 - DO_GNU_APP=3DLDFLAGS=3D"$(CFLAGS)" -=20 -diff -up openssl-1.0.2a/version.map.version openssl-1.0.2a/version.map ---- openssl-1.0.2a/version.map.version 2015-04-21 16:43:02.676171879 +0200 -+++ openssl-1.0.2a/version.map 2015-04-21 16:51:49.621630589 +0200 -@@ -0,0 +1,13 @@ -+OPENSSL_1.0.1 { -+ global: -+ SSLeay; -+ SSLeay_version; -+ local: -+ _original*; -+ _current*; -+}; -+OPENSSL_1.0.2 { -+ global: -+ SSLeay; -+ SSLeay_version; -+} OPENSSL_1.0.1; diff --git a/compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch b/compat-op= enssl/patches/openssl-1.0.2e-rpmbuild.patch deleted file mode 100644 index db1460cb7..000000000 --- a/compat-openssl/patches/openssl-1.0.2e-rpmbuild.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up openssl-1.0.2e/Configure.rpmbuild openssl-1.0.2e/Configure ---- openssl-1.0.2e/Configure.rpmbuild 2015-12-03 15:04:23.000000000 +0100 -+++ openssl-1.0.2e/Configure 2015-12-04 13:20:22.996835604 +0100 -@@ -365,8 +365,8 @@ my %table=3D( - #### - # *-generic* is endian-neutral target, but ./config is free to - # throw in -D[BL]_ENDIAN, whichever appropriate... --"linux-generic32","gcc:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:B= N_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-sh= ared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-ppc", "gcc:-DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHA= R RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPI= C::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-generic32","gcc:-Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro = -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:li= nux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)", -+"linux-ppc", "gcc:-DB_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,= relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linu= x32:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)", -=20 - ####################################################################### - # Note that -march is not among compiler options in below linux-armv4 -@@ -395,31 +395,31 @@ my %table=3D( - # - # ./Configure linux-armv4 -march=3Darmv6 -D__ARM_MAX_ARCH__=3D8 - # --"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CH= UNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(S= HLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4= _CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-= shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-armv4", "gcc:-Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro -ld= l:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:li= nux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)", -+"linux-aarch64","gcc:-DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,= -z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PT= R:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SH= LIB_SONAMEVER):::64", - # Configure script adds minimally required -march for assembly support, - # if no -march was specified at command line. mips32 and mips64 below - # refer to contemporary MIPS Architecture specifications, MIPS32 and - # MIPS64, rather than to kernel bitness. --"linux-mips32", "gcc:-mabi=3D32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:BN= _LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:l= inux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-mips64", "gcc:-mabi=3Dn32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl= :SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n3= 2:dlfcn:linux-shared:-fPIC:-mabi=3Dn32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::= 32", --"linux64-mips64", "gcc:-mabi=3D64 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ld= l:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_a= sm}:64:dlfcn:linux-shared:-fPIC:-mabi=3D64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR= ):::64", -+"linux-mips32", "gcc:-mabi=3D32 -Wall \$(RPM_OPT_FLAGS) -DBN_DIV3W::-D_REEN= TRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PT= R:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_S= ONAMEVER)", -+"linux-mips64", "gcc:-mabi=3Dn32 -Wall \$(RPM_OPT_FLAGS) -DBN_DIV3W::-D_R= EENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNR= OLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=3Dn32 \$(RPM_OPT_= FLAGS):.so.\$(SHLIB_SONAMEVER):::32", -+"linux64-mips64", "gcc:-mabi=3D64 -Wall \$(RPM_OPT_FLAGS) -DBN_DIV3W::-D_= REENTRANT::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT D= ES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=3D64 \$(RPM_= OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64", - #### IA-32 targets... - "linux-ia32-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLON= G ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so= .\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"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-share= d:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-elf", "gcc:-DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,= relro -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux= -shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)", - "linux-aout", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=3Di486 -Wall:= :(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", - #### --"linux-generic64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC= 4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC= ::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-ppc64", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOU= R_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn= :linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", --"linux-ppc64le","gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FO= UR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:$ppc64_asm:linux64le:dlfc= n:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::", --"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:-fP= IC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-generic64","gcc:-Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z,relro = -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_as= m}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64", -+"linux-ppc64", "gcc:-m64 -DB_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::= -Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL= :${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(= SHLIB_SONAMEVER):::64", -+"linux-ppc64le","gcc:-m64 -DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:= :-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROL= L:$ppc64_asm:linux64le:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$= (SHLIB_SONAMEVER):::64", -+"linux-ia64", "gcc:-DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT::-Wl,-z= ,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfc= n:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)", - "linux-ia64-icc","icc:-DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl -no_cpprt:SI= XTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:= -fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-x86_64", "gcc:-m64 -DL_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FO= UR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared= :-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux-x86_64", "gcc:-m64 -DL_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT:= :-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_= asm}:elf:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEV= ER):::64", - "linux-x86_64-clang", "clang: -m64 -DL_ENDIAN -O3 -Wall -Wextra $clang_disa= bled_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", - "debug-linux-x86_64-clang", "clang: -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DC= RYPTO_MDEBUG -m64 -DL_ENDIAN -g -Wall -Wextra $clang_disabled_warnings -Qunus= ed-arguments::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UN= ROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(S= HLIB_MINOR):::64", - "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-sha= red:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - "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:-fP= IC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32", --"linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_F= OUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linu= x-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux64-s390x", "gcc:-m64 -DB_ENDIAN -Wall \$(RPM_OPT_FLAGS)::-D_REENTRANT= ::-Wl,-z,relro -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL= :${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB= _SONAMEVER):::64", - #### So called "highgprs" target for z/Architecture CPUs - # "Highgprs" is kernel feature first implemented in Linux 2.6.32, see - # /proc/cpuinfo. The idea is to preserve most significant bits of -@@ -437,12 +437,12 @@ my %table=3D( - #### SPARC Linux setups - # Ray Miller has patiently - # assisted with debugging of following two configs. --"linux-sparcv8","gcc:-mcpu=3Dv8 -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -= DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:$= {sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sparcv8","gcc:-mcpu=3Dv8 -DB_ENDIAN -Wall \$(RPM_OPT_FLAGS) -DBN_DIV= 2W::-D_REENTRANT::-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF= _PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC:\$(RPM_OPT_FLAGS):.so.\$(SHLIB_S= ONAMEVER)", - # it's a real mess with -mcpu=3Dultrasparc option under Linux, but - # -Wa,-Av8plus should do the trick no matter what. --"linux-sparcv9","gcc:-m32 -mcpu=3Dultrasparc -DB_ENDIAN -O3 -fomit-frame-po= inter -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC= 4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m= 32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sparcv9","gcc:-m32 -mcpu=3Dultrasparc -DB_ENDIAN -Wall \$(RPM_OPT_FL= AGS) -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-Wl,-z,relro -ldl:BN_LL= ONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-f= PIC:-m32 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER)", - # GCC 3.1 is a requirement --"linux64-sparcv9","gcc:-m64 -mcpu=3Dultrasparc -DB_ENDIAN -O3 -fomit-frame-= pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_I= NT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPI= C:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux64-sparcv9","gcc:-m64 -mcpu=3Dultrasparc -DB_ENDIAN -Wall \$(RPM_OPT_= FLAGS)::-D_REENTRANT:ULTRASPARC:-Wl,-z,relro -ldl:BN_LLONG RC4_CHAR RC4_CHUNK= DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-share= d:-fPIC:-m64 \$(RPM_OPT_FLAGS):.so.\$(SHLIB_SONAMEVER):::64", - #### Alpha Linux with GNU C and Compaq C setups - # Special notes: - # - linux-alpha+bwx-gcc is ment to be used from ./config only. If you -@@ -1767,7 +1767,7 @@ while () - elsif ($shared_extension ne "" && $shared_extension =3D~ /^\.s([ol])\.[^\.= ]*\.[^\.]*$/) - { - my $sotmp =3D $1; -- s/^SHARED_LIBS_LINK_EXTS=3D.*/SHARED_LIBS_LINK_EXTS=3D.s$sotmp.\$(SHLIB_M= AJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=3D.*/SHARED_LIBS_LINK_EXTS=3D.s$sotmp.\$(SHLIB_S= ONAMEVER) .s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =3D~ /^\.[^\.]*\.[^\.]= *\.dylib$/) - { -diff -up openssl-1.0.2e/Makefile.org.rpmbuild openssl-1.0.2e/Makefile.org ---- openssl-1.0.2e/Makefile.org.rpmbuild 2015-12-03 15:04:23.000000000 +0100 -+++ openssl-1.0.2e/Makefile.org 2015-12-04 13:18:44.913538616 +0100 -@@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY=3D - SHLIB_MAJOR=3D - SHLIB_MINOR=3D - SHLIB_EXT=3D -+SHLIB_SONAMEVER=3D10 - PLATFORM=3Ddist - OPTIONS=3D - CONFIGURE_ARGS=3D -@@ -341,10 +342,9 @@ clean-shared: - link-shared: - @ set -e; for i in $(SHLIBDIRS); do \ - $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ -- LIBNAME=3D$$i LIBVERSION=3D$(SHLIB_MAJOR).$(SHLIB_MINOR) \ -+ LIBNAME=3D$$i LIBVERSION=3D$(SHLIB_SONAMEVER) \ - LIBCOMPATVERSIONS=3D";$(SHLIB_VERSION_HISTORY)" \ - symlink.$(SHLIB_TARGET); \ -- libs=3D"$$libs -l$$i"; \ - done -=20 - build-shared: do_$(SHLIB_TARGET) link-shared -@@ -355,7 +355,7 @@ do_$(SHLIB_TARGET): - libs=3D"$(LIBKRB5) $$libs"; \ - fi; \ - $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ -- LIBNAME=3D$$i LIBVERSION=3D$(SHLIB_MAJOR).$(SHLIB_MINOR) \ -+ LIBNAME=3D$$i LIBVERSION=3D$(SHLIB_SONAMEVER) \ - LIBCOMPATVERSIONS=3D";$(SHLIB_VERSION_HISTORY)" \ - LIBDEPS=3D"$$libs $(EX_LIBS)" \ - link_a.$(SHLIB_TARGET); \ --=20 2.34.1 --===============7213083171513967018==--