From 1c6e2c73c1bef940f4e5b907f1b739a1168e2a42 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 19 Nov 2017 20:43:29 +0100 Subject: [PATCH] - up to 1.1.0g - updated optflags,man-namespace,asflag,ca-certificates patches - removed outdated alpha-ccc,include,ldflags patches --- openssl-alpha-ccc.patch | 11 - openssl-asflag.patch | 37 +- openssl-ca-certificates.patch | 9 +- openssl-include.patch | 30 -- openssl-ldflags.patch | 25 -- openssl-man-namespace.patch | 666 ++++++++++++++++++++++++++++++++-- openssl-optflags.patch | 153 +------- openssl.spec | 299 ++++++++++----- 8 files changed, 889 insertions(+), 341 deletions(-) delete mode 100644 openssl-alpha-ccc.patch delete mode 100644 openssl-include.patch delete mode 100644 openssl-ldflags.patch diff --git a/openssl-alpha-ccc.patch b/openssl-alpha-ccc.patch deleted file mode 100644 index f16485a..0000000 --- a/openssl-alpha-ccc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN openssl-1.0.2a.orig/Configure openssl-1.0.2a/Configure ---- openssl-1.0.2a.orig/Configure 2015-03-19 14:30:36.000000000 +0100 -+++ openssl-1.0.2a/Configure 2015-03-20 14:30:07.165989047 +0100 -@@ -442,6 +442,7 @@ - "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", - "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", -+"linux-alpha+bwx-ccc-generic","ccc:-fast -generic -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", - - # Android: linux-* but without pointers to headers and libs. - "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -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)", diff --git a/openssl-asflag.patch b/openssl-asflag.patch index aadad1b..d6613a6 100644 --- a/openssl-asflag.patch +++ b/openssl-asflag.patch @@ -1,11 +1,28 @@ ---- openssl-1.0.0/Makefile.org.orig 2010-04-10 11:17:55.964995600 +0200 -+++ openssl-1.0.0/Makefile.org 2010-04-10 11:19:41.144993924 +0200 -@@ -178,7 +178,7 @@ +--- openssl-1.1.0g/Configurations/unix-Makefile.tmpl.orig 2017-11-19 10:16:26.044446930 +0100 ++++ openssl-1.1.0g/Configurations/unix-Makefile.tmpl 2017-11-19 17:44:59.020806300 +0100 +@@ -208,8 +208,7 @@ + # dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC + # gcc, then the driver will automatically translate it to -xarch=v8plus + # and pass it down to assembler. +-AS=$(CC) -c +-ASFLAG=$(CFLAGS) ++ASFLAG= + PERLASM_SCHEME= {- $target{perlasm_scheme} -} - BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ - CC='$(CC)' CFLAG='$(CFLAG)' \ -- AS='$(CC)' ASFLAG='$(CFLAG) -c' \ -+ AS='$(AS)' ASFLAG='$(ASFLAG)' \ - AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ - CROSS_COMPILE='$(CROSS_COMPILE)' \ - PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \ + # For x86 assembler: Set PROCESSOR to 386 if you want to support +@@ -847,13 +846,14 @@ + my $ecflags = { lib => '$(LIB_CFLAGS)', + dso => '$(DSO_CFLAGS)', + bin => '$(BIN_CFLAGS)' } -> {$args{intent}}; ++ my $asflags = ($srcs =~ /\.[Ss]$/) ? '$(ASFLAG)' : ''; + my $makedepprog = $config{makedepprog}; + my $recipe = <<"EOF"; + $obj$objext: $deps + EOF + if (!$disabled{makedepend} && $makedepprog !~ /\/makedepend/) { + $recipe .= <<"EOF"; +- \$(CC) $incs \$(CFLAGS) $ecflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs ++ \$(CC) $incs \$(CFLAGS) $ecflags $asflags -MMD -MF $obj$depext.tmp -MT \$\@ -c -o \$\@ $srcs + \@touch $obj$depext.tmp + \@if cmp $obj$depext.tmp $obj$depext > /dev/null 2> /dev/null; then \\ + rm -f $obj$depext.tmp; \\ diff --git a/openssl-ca-certificates.patch b/openssl-ca-certificates.patch index 8f366ad..6ca4bcf 100644 --- a/openssl-ca-certificates.patch +++ b/openssl-ca-certificates.patch @@ -1,12 +1,11 @@ -diff -ruN openssl-1.0.2.orig/crypto/cryptlib.h openssl-1.0.2/crypto/cryptlib.h ---- openssl-1.0.2.orig/crypto/cryptlib.h 2015-01-22 15:58:32.000000000 +0100 -+++ openssl-1.0.2/crypto/cryptlib.h 2015-01-27 15:48:31.239123780 +0100 -@@ -82,7 +82,7 @@ +--- openssl-1.1.0g/crypto/include/internal/cryptlib.h.orig 2017-11-02 15:29:03.000000000 +0100 ++++ openssl-1.1.0g/crypto/include/internal/cryptlib.h 2017-11-18 21:05:07.408322386 +0100 +@@ -42,7 +42,7 @@ # ifndef OPENSSL_SYS_VMS # define X509_CERT_AREA OPENSSLDIR # define X509_CERT_DIR OPENSSLDIR "/certs" -# define X509_CERT_FILE OPENSSLDIR "/cert.pem" +# define X509_CERT_FILE "/etc/certs/ca-certificates.crt" # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" # else - # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/openssl-include.patch b/openssl-include.patch deleted file mode 100644 index 65e3373..0000000 --- a/openssl-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ruN openssl-1.0.2.orig/Makefile.org openssl-1.0.2/Makefile.org ---- openssl-1.0.2.orig/Makefile.org 2015-01-22 15:58:06.000000000 +0100 -+++ openssl-1.0.2/Makefile.org 2015-01-27 16:04:30.564519915 +0100 -@@ -360,7 +360,7 @@ - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ -- echo 'includedir=$${prefix}/include'; \ -+ echo 'includedir=$${prefix}/include/openssl'; \ - echo ''; \ - echo 'Name: OpenSSL-libcrypto'; \ - echo 'Description: OpenSSL cryptography library'; \ -@@ -374,7 +374,7 @@ - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ -- echo 'includedir=$${prefix}/include'; \ -+ echo 'includedir=$${prefix}/include/openssl'; \ - echo ''; \ - echo 'Name: OpenSSL-libssl'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries'; \ -@@ -388,7 +388,7 @@ - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ -- echo 'includedir=$${prefix}/include'; \ -+ echo 'includedir=$${prefix}/include/openssl'; \ - echo ''; \ - echo 'Name: OpenSSL'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ diff --git a/openssl-ldflags.patch b/openssl-ldflags.patch deleted file mode 100644 index d53dd6f..0000000 --- a/openssl-ldflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -updated from http://bugs.gentoo.org/181438 - -make sure we respect LDFLAGS - ---- openssl-1.0.0/Makefile.org.orig 2010-04-10 11:21:33.852993924 +0200 -+++ openssl-1.0.0/Makefile.org 2010-04-10 11:22:52.248992248 +0200 -@@ -189,6 +189,7 @@ - MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \ - DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \ - MAKEDEPPROG='$(MAKEDEPPROG)' \ -+ LDFLAGS='$(LDFLAGS)' \ - SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \ - KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \ - ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ ---- openssl-0.9.8h/Makefile.shared -+++ openssl-0.9.8h/Makefile.shared -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)" - - #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/openssl-man-namespace.patch b/openssl-man-namespace.patch index e5aba06..1f45418 100644 --- a/openssl-man-namespace.patch +++ b/openssl-man-namespace.patch @@ -1,25 +1,643 @@ ---- openssl-1.0.0/Makefile.org.orig 2010-04-10 11:05:35.900993086 +0200 -+++ openssl-1.0.0/Makefile.org 2010-04-10 11:16:15.052993924 +0200 -@@ -610,7 +610,7 @@ - --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ - $(PERL) util/extract-names.pl < $$i | \ -- (grep -v $$filecase "^$$fn\$$"; true) | \ -+ (grep -v $$filecase "^$${fn#openssl_}\$$"; true) | \ - (grep -v "[ ]"; true) | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ -@@ -627,11 +627,11 @@ - --release=$(VERSION) `basename $$i`") \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ - $(PERL) util/extract-names.pl < $$i | \ -- (grep -v $$filecase "^$$fn\$$"; true) | \ -+ (grep -v -E $$filecase "^$${fn#openssl_}\$$"; true) | \ - (grep -v "[ ]"; true) | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ - while read n; do \ -- PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ -+ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) openssl_"$$n".$${sec}$(MANSUFFIX); \ - done); \ - done +--- openssl-1.1.0g/doc/apps.orig/asn1parse.pod 2017-11-18 21:11:40.631651229 +0100 ++++ openssl-1.1.0g/doc/apps/asn1parse.pod 2017-11-18 22:11:19.351610367 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-asn1parse, +-asn1parse - ASN.1 parsing tool ++openssl-asn1parse - ASN.1 parsing tool + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/ca.pod 2017-11-18 21:11:40.631651229 +0100 ++++ openssl-1.1.0g/doc/apps/ca.pod 2017-11-18 22:11:35.488276847 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-ca, +-ca - sample minimal CA application ++openssl-ca - sample minimal CA application + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/ciphers.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/ciphers.pod 2017-11-18 22:11:40.291610128 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-ciphers, +-ciphers - SSL cipher display and cipher list tool ++openssl-ciphers - SSL cipher display and cipher list tool + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/cms.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/cms.pod 2017-11-18 22:11:44.688276745 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-cms, +-cms - CMS utility ++openssl-cms - CMS utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/config.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/config.pod 2017-11-18 22:12:08.614943137 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-config - OpenSSL CONF library configuration files ++openssl-config - OpenSSL CONF library configuration files + + =head1 DESCRIPTION + +--- openssl-1.1.0g/doc/apps.orig/crl2pkcs7.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/crl2pkcs7.pod 2017-11-18 22:12:19.048276350 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-crl2pkcs7, +-crl2pkcs7 - Create a PKCS#7 structure from a CRL and certificates ++openssl-crl2pkcs7 - Create a PKCS#7 structure from a CRL and certificates + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/crl.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/crl.pod 2017-11-18 22:12:14.178276408 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-crl, +-crl - CRL utility ++openssl-crl - CRL utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/dgst.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/dgst.pod 2017-11-18 22:16:24.078273554 +0100 +@@ -2,8 +2,8 @@ + + =head1 NAME + + openssl-dgst, +-dgst, sha, sha1, mdc2, ripemd160, sha224, sha256, sha384, sha512, md4, md5, blake2b, blake2s - message digests ++openssl-sha, openssl-sha1, openssl-mdc2, openssl-ripemd160, openssl-sha224, openssl-sha256, openssl-sha384, openssl-sha512, openssl-md4, openssl-md5, openssl-blake2b, openssl-blake2s - message digests + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/dhparam.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/dhparam.pod 2017-11-18 22:16:30.061606818 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-dhparam, +-dhparam - DH parameter manipulation and generation ++openssl-dhparam - DH parameter manipulation and generation + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/dsaparam.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/dsaparam.pod 2017-11-18 22:16:57.851606501 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-dsaparam, +-dsaparam - DSA parameter manipulation and generation ++openssl-dsaparam - DSA parameter manipulation and generation + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/dsa.pod 2017-11-18 21:11:40.634984563 +0100 ++++ openssl-1.1.0g/doc/apps/dsa.pod 2017-11-18 22:16:35.008273429 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-dsa, +-dsa - DSA key processing ++openssl-dsa - DSA key processing + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/ecparam.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/ecparam.pod 2017-11-18 22:17:05.754939744 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-ecparam, +-ecparam - EC parameter manipulation and generation ++openssl-ecparam - EC parameter manipulation and generation + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/ec.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/ec.pod 2017-11-18 22:17:01.598273125 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-ec, +-ec - EC key processing ++openssl-ec - EC key processing + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/enc.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/enc.pod 2017-11-18 22:17:09.651606365 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-enc, +-enc - symmetric cipher routines ++openssl-enc - symmetric cipher routines + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/engine.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/engine.pod 2017-11-18 22:17:13.671606321 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-engine, +-engine - load and query engines ++openssl-engine - load and query engines + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/errstr.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/errstr.pod 2017-11-18 22:17:18.051606269 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-errstr, +-errstr - lookup error codes ++openssl-errstr - lookup error codes + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/gendsa.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/gendsa.pod 2017-11-18 22:17:22.581606218 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-gendsa, +-gendsa - generate a DSA private key from a set of parameters ++openssl-gendsa - generate a DSA private key from a set of parameters + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/genpkey.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/genpkey.pod 2017-11-18 22:17:27.084939502 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-genpkey, +-genpkey - generate a private key ++openssl-genpkey - generate a private key + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/genrsa.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/genrsa.pod 2017-11-18 22:17:31.698272782 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-genrsa, +-genrsa - generate an RSA private key ++openssl-genrsa - generate an RSA private key + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/list.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/list.pod 2017-11-18 22:17:36.478272728 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-list, +-list - list algorithms and features ++openssl-list - list algorithms and features + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/nseq.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/nseq.pod 2017-11-18 22:17:41.141606007 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-nseq, +-nseq - create or examine a Netscape certificate sequence ++openssl-nseq - create or examine a Netscape certificate sequence + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/ocsp.pod 2017-11-18 21:11:40.638317896 +0100 ++++ openssl-1.1.0g/doc/apps/ocsp.pod 2017-11-18 22:17:44.971605965 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-ocsp, +-ocsp - Online Certificate Status Protocol utility ++openssl-ocsp - Online Certificate Status Protocol utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/passwd.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/passwd.pod 2017-11-18 22:17:50.224939239 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-passwd, +-passwd - compute password hashes ++openssl-passwd - compute password hashes + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/pkcs12.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/pkcs12.pod 2017-11-18 22:17:54.221605863 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-pkcs12, +-pkcs12 - PKCS#12 file utility ++openssl-pkcs12 - PKCS#12 file utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/pkcs7.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/pkcs7.pod 2017-11-18 22:17:58.274939145 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-pkcs7, +-pkcs7 - PKCS#7 utility ++openssl-pkcs7 - PKCS#7 utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/pkcs8.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/pkcs8.pod 2017-11-18 22:18:10.504939007 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-pkcs8, +-pkcs8 - PKCS#8 format private key conversion tool ++openssl-pkcs8 - PKCS#8 format private key conversion tool + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/pkeyparam.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/pkeyparam.pod 2017-11-18 22:18:18.624938915 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-pkeyparam, +-pkeyparam - public key algorithm parameter processing tool ++openssl-pkeyparam - public key algorithm parameter processing tool + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/pkey.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/pkey.pod 2017-11-18 22:18:14.328272296 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-pkey, +-pkey - public or private key processing tool ++openssl-pkey - public or private key processing tool + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/pkeyutl.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/pkeyutl.pod 2017-11-18 22:20:24.651604144 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-pkeyutl, +-pkeyutl - public key algorithm utility ++openssl-pkeyutl - public key algorithm utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/rand.pod 2017-11-18 21:11:40.641651229 +0100 ++++ openssl-1.1.0g/doc/apps/rand.pod 2017-11-18 22:20:29.008270756 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-rand, +-rand - generate pseudo-random bytes ++openssl-rand - generate pseudo-random bytes + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/rehash.pod 2017-11-18 21:11:40.644984563 +0100 ++++ openssl-1.1.0g/doc/apps/rehash.pod 2017-11-18 22:20:40.954937287 +0100 +@@ -5,8 +5,8 @@ + + =head1 NAME + + openssl-c_rehash, openssl-rehash, +-c_rehash, rehash - Create symbolic links to files named by the hash values ++c_rehash - Create symbolic links to files named by the hash values + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/req.pod 2017-11-18 21:11:40.644984563 +0100 ++++ openssl-1.1.0g/doc/apps/req.pod 2017-11-18 22:20:45.291603904 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-req, +-req - PKCS#10 certificate request and certificate generating utility ++openssl-req - PKCS#10 certificate request and certificate generating utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/rsa.pod 2017-11-18 21:11:40.644984563 +0100 ++++ openssl-1.1.0g/doc/apps/rsa.pod 2017-11-18 22:20:49.321603857 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-rsa, +-rsa - RSA key processing tool ++openssl-rsa - RSA key processing tool + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/rsautl.pod 2017-11-18 21:11:40.644984563 +0100 ++++ openssl-1.1.0g/doc/apps/rsautl.pod 2017-11-18 22:20:53.051603815 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-rsautl, +-rsautl - RSA utility ++openssl-rsautl - RSA utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/s_client.pod 2017-11-18 21:11:40.644984563 +0100 ++++ openssl-1.1.0g/doc/apps/s_client.pod 2017-11-18 22:20:57.391603766 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-s_client, +-s_client - SSL/TLS client program ++openssl-s_client - SSL/TLS client program + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/sess_id.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/sess_id.pod 2017-11-18 22:21:09.698270292 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-sess_id, +-sess_id - SSL/TLS session handling utility ++openssl-sess_id - SSL/TLS session handling utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/smime.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/smime.pod 2017-11-18 22:21:14.074936908 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-smime, +-smime - S/MIME utility ++openssl-smime - S/MIME utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/speed.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/speed.pod 2017-11-18 22:21:18.004936863 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-speed, +-speed - test library performance ++openssl-speed - test library performance + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/spkac.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/spkac.pod 2017-11-18 22:21:21.928270153 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-spkac, +-spkac - SPKAC printing and generating utility ++openssl-spkac - SPKAC printing and generating utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/s_server.pod 2017-11-18 21:11:40.644984563 +0100 ++++ openssl-1.1.0g/doc/apps/s_server.pod 2017-11-18 22:21:01.728270382 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-s_server, +-s_server - SSL/TLS server program ++openssl-s_server - SSL/TLS server program + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/s_time.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/s_time.pod 2017-11-18 22:21:05.601603672 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-s_time, +-s_time - SSL/TLS performance timing program ++openssl-s_time - SSL/TLS performance timing program + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/tsget.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/tsget.pod 2017-11-18 22:21:29.594936730 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-tsget, +-tsget - Time Stamping HTTP/HTTPS client ++openssl-tsget - Time Stamping HTTP/HTTPS client + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/ts.pod 2017-11-18 21:11:40.648317896 +0100 ++++ openssl-1.1.0g/doc/apps/ts.pod 2017-11-18 22:21:25.714936777 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-ts, +-ts - Time Stamping Authority tool (client/server) ++openssl-ts - Time Stamping Authority tool (client/server) + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/verify.pod 2017-11-18 21:11:40.651651229 +0100 ++++ openssl-1.1.0g/doc/apps/verify.pod 2017-11-18 22:21:34.651603340 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-verify, +-verify - Utility to verify certificates ++openssl-verify - Utility to verify certificates + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/version.pod 2017-11-18 21:11:40.651651229 +0100 ++++ openssl-1.1.0g/doc/apps/version.pod 2017-11-18 22:21:39.154936623 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-version, +-version - print OpenSSL version information ++openssl-version - print OpenSSL version information + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps.orig/x509.pod 2017-11-18 21:11:40.651651229 +0100 ++++ openssl-1.1.0g/doc/apps/x509.pod 2017-11-18 22:21:43.518269906 +0100 +@@ -2,8 +2,7 @@ + + =head1 NAME + +-openssl-x509, +-x509 - Certificate display and signing utility ++openssl-x509 - Certificate display and signing utility + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/apps/x509v3_config.pod.orig 2017-11-19 10:20:58.684443817 +0100 ++++ openssl-1.1.0g/doc/apps/x509v3_config.pod 2017-11-19 10:44:33.141094334 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-x509v3_config - X509 V3 certificate extension configuration format ++openssl-x509v3_config - X509 V3 certificate extension configuration format + + =head1 DESCRIPTION + +--- openssl-1.1.0g/doc/crypto/bio.pod.orig 2017-11-02 15:29:04.000000000 +0100 ++++ openssl-1.1.0g/doc/crypto/bio.pod 2017-11-19 19:02:56.120752895 +0100 +@@ -1,10 +1,10 @@ + =pod + +-=for comment openssl_manual_section 7 ++=for comment openssl_manual_section:7 + + =head1 NAME + +-bio - Basic I/O abstraction ++openssl-bio - Basic I/O abstraction + + =for comment generic + +--- openssl-1.1.0g/doc/crypto/crypto.pod.orig 2017-11-02 15:29:04.000000000 +0100 ++++ openssl-1.1.0g/doc/crypto/crypto.pod 2017-11-19 19:01:54.180753602 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-crypto - OpenSSL cryptographic library ++openssl-crypto - OpenSSL cryptographic library + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/crypto/ct.pod.orig 2017-11-02 15:29:04.000000000 +0100 ++++ openssl-1.1.0g/doc/crypto/ct.pod 2017-11-19 19:03:51.987418924 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-ct - Certificate Transparency ++openssl-ct - Certificate Transparency + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/crypto/des_modes.pod.orig 2017-11-02 15:29:04.000000000 +0100 ++++ openssl-1.1.0g/doc/crypto/des_modes.pod 2017-11-19 19:02:08.827420102 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-des_modes - the variants of DES and other crypto algorithms of OpenSSL ++openssl-des_modes - the variants of DES and other crypto algorithms of OpenSSL + + =head1 DESCRIPTION + +--- openssl-1.1.0g/doc/crypto/evp.pod.orig 2017-11-02 15:29:04.000000000 +0100 ++++ openssl-1.1.0g/doc/crypto/evp.pod 2017-11-19 19:03:58.387418854 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-evp - high-level cryptographic functions ++openssl-evp - high-level cryptographic functions + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/crypto/x509.pod.orig 2017-11-02 15:29:04.000000000 +0100 ++++ openssl-1.1.0g/doc/crypto/x509.pod 2017-11-19 19:02:24.704086588 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-x509 - X.509 certificate handling ++openssl-x509 - X.509 certificate handling + + =head1 SYNOPSIS + +--- openssl-1.1.0g/doc/ssl/ssl.pod.orig 2017-11-02 15:29:05.000000000 +0100 ++++ openssl-1.1.0g/doc/ssl/ssl.pod 2017-11-19 19:18:07.534075826 +0100 +@@ -4,7 +4,7 @@ + + =head1 NAME + +-ssl - OpenSSL SSL/TLS library ++openssl-ssl - OpenSSL SSL/TLS library + + =head1 SYNOPSIS diff --git a/openssl-optflags.patch b/openssl-optflags.patch index a6d077e..a9477f9 100644 --- a/openssl-optflags.patch +++ b/openssl-optflags.patch @@ -1,144 +1,11 @@ -Remove -f/-m/-O flags which would conflict with RPM_OPT_FLAGS or cause code -built on a i686/ev6/sparcv9 to not run on a i386/ev5/sparcv7 and so on. - -...add $ENV{OPTFLAGS} instead - ---- openssl-1.0.2b/Configure.orig 2015-06-12 16:21:24.540170216 +0200 -+++ openssl-1.0.2b/Configure 2015-06-12 18:45:01.027153237 +0200 -@@ -185,8 +185,8 @@ - #"b2-is-ri-dp", "${tcc}:${tflags}::${tlib}:${bits2}IDEA_SHORT RC4_INDEX DES_PTR:${tbn_mul}::", +--- openssl-1.1.0g/Configurations/unix-Makefile.tmpl.orig 2017-11-19 17:44:59.020806300 +0100 ++++ openssl-1.1.0g/Configurations/unix-Makefile.tmpl 2017-11-19 17:50:26.124135897 +0100 +@@ -174,7 +174,7 @@ - # Our development configs --"purify", "purify gcc:-g -DPURIFY -Wall::(unknown)::-lsocket -lnsl::::", --"debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::", -+"purify", "purify gcc:-g -DPURIFY $ENV{OPTFLAGS} -Wall::(unknown)::-lsocket -lnsl::::", -+"debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 $ENV{OPTFLAGS} -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::", - "debug-ben", "gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe::(unknown):::::", - "debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::", - "debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::", -@@ -209,14 +209,14 @@ - "debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "debug-geoff32","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "debug-geoff64","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-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)", --"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", --"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", --"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o::des-586.o crypt586.o:aes_x86core.o aes_cbc.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::ghash-x86.o::elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g -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)", --"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -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)", --"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -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", -+"debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", -+"debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", -+"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -g $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -fomit-frame-pointer $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o::des-586.o crypt586.o:aes_x86core.o aes_cbc.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::ghash-x86.o::elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -g $ENV{OPTFLAGS} -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)", -+"debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g $ENV{OPTFLAGS} -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)", -+"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g $ENV{OPTFLAGS} -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", - "dist", "cc:-O::(unknown)::::::", - - # Basic configs that should work on any (32 and less bit) box -@@ -365,8 +365,8 @@ - #### - # *-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:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"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)", -+"linux-generic32","gcc:-fomit-frame-pointer $ENV{OPTFLAGS} -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)", -+"linux-ppc", "gcc:-DB_ENDIAN $ENV{OPTFLAGS} -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)", - - ####################################################################### - # Note that -march is not among compiler options in below linux-armv4 -@@ -395,31 +395,31 @@ - # - # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 - # --"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_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: $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-aarch64","gcc: $ENV{OPTFLAGS} -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)", - # 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=32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-mips64", "gcc:-mabi=n32 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32", --"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", -+"linux-mips32", "gcc:-mabi=32 $ENV{OPTFLAGS} -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-mips64", "gcc:-mabi=n32 $ENV{OPTFLAGS} -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32", -+"linux64-mips64", "gcc:-mabi=64 $ENV{OPTFLAGS} -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", - #### IA-32 targets... --"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)", --"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)", --"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", -+"linux-ia32-icc", "icc:-DL_ENDIAN $ENV{OPTFLAGS}::-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)", -+"linux-elf", "gcc:-DL_ENDIAN $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-aout", "gcc:-DL_ENDIAN $ENV{OPTFLAGS} -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 RC4_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_FOUR_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_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:$ppc64_asm:linux64le:dlfcn: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:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"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)", --"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", --"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", --"debug-linux-x86_64-clang", "clang: -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -g -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", --"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", --"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", --"linux64-s390x", "gcc:-m64 -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux-generic64","gcc:$ENV{OPTFLAGS} -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)", -+"linux-ppc64", "gcc:-m64 -DB_ENDIAN $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_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 $ENV{OPTFLAGS} -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):::", -+"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO $ENV{OPTFLAGS} -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)", -+"linux-ia64-icc","icc:-DL_ENDIAN $ENV{OPTFLAGS} -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)", -+"linux-x86_64", "gcc:-m64 -DL_ENDIAN $ENV{OPTFLAGS} -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", -+"linux-x86_64-clang", "clang: -m64 -DL_ENDIAN $ENV{OPTFLAGS} -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", -+"debug-linux-x86_64-clang", "clang: -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN $ENV{OPTFLAGS} -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", -+"linux-x86_64-icc", "icc:-DL_ENDIAN $ENV{OPTFLAGS}::-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", -+"linux-x32", "gcc:-mx32 -DL_ENDIAN $ENV{OPTFLAGS} -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", -+"linux64-s390x", "gcc:-m64 -DB_ENDIAN $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::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 -@@ -432,16 +432,16 @@ - # ldconfig and run-time linker to autodiscover. Unfortunately it - # doesn't work just yet, because of couple of bugs in glibc - # sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1... --"linux32-s390x", "gcc:-m31 -Wa,-mzarch -DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$s390x_asm;$asm=~s/bn\-s390x\.o/bn_asm.o/;$asm}.":31:dlfcn:linux-shared:-fPIC:-m31:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/highgprs", -+"linux32-s390x", "gcc:-m31 -Wa,-mzarch -DB_ENDIAN $ENV{OPTFLAGS} -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$s390x_asm;$asm=~s/bn\-s390x\.o/bn_asm.o/;$asm}.":31:dlfcn:linux-shared:-fPIC:-m31:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/highgprs", - #### SPARC Linux setups - # Ray Miller has patiently - # assisted with debugging of following two configs. --"linux-sparcv8","gcc:-mcpu=v8 -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=v8 -DB_ENDIAN $ENV{OPTFLAGS} -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)", - # it's a real mess with -mcpu=ultrasparc option under Linux, but - # -Wa,-Av8plus should do the trick no matter what. --"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN $ENV{OPTFLAGS} -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - # GCC 3.1 is a requirement --"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", -+"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN $ENV{OPTFLAGS} -Wall::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::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 -@@ -455,8 +455,8 @@ - # - # - # --"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-alpha-gcc","gcc:$ENV{OPTFLAGS} -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-alpha+bwx-gcc","gcc:$ENV{OPTFLAGS} -DL_ENDIAN::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", - "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", - "linux-alpha+bwx-ccc-generic","ccc:-fast -generic -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", -@@ -1765,7 +1765,7 @@ - elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) - { - my $sotmp = $1; -- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; -+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SOVER) .s$sotmp/; - } - elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) - { + CROSS_COMPILE= {- $config{cross_compile_prefix} -} + CC= $(CROSS_COMPILE){- $target{cc} -} +-CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} ++CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} $(OPTFLAGS) + CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} + LDFLAGS= {- $target{lflags} -} + PLIB_LDFLAGS= {- $target{plib_lflags} -} diff --git a/openssl.spec b/openssl.spec index 8f8dbc5..3474838 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,15 +1,9 @@ -# TODO -# - consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames -# - find a way to simplify (drop) openssl-optflags.patch, it's pain to update here in pld -# - pass our cflags (currently built with -O3) # # Conditional build: %bcond_without tests # don't perform "make tests" %bcond_without zlib # zlib: note - enables CVE-2012-4929 vulnerability %bcond_without sslv2 # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0 %bcond_without sslv3 # SSLv3: note - enables CVE-2014-3566 vulnerability -%bcond_with purify # Compile openssl with "-DPURIFY", useful when one wants to - # use valgrind debugger against openssl-linked programs %bcond_with snap # use GitHub snapshot to build branch release %define rel 0.1 @@ -25,26 +19,23 @@ Summary(uk.UTF-8): Бібліотеки та утиліти для з'єднан Name: openssl # Version 1.1.0 will be supported until 2018-08-31. # https://www.openssl.org/about/releasestrat.html -Version: 1.1.0a +Version: 1.1.0g Release: 1 License: Apache-like Group: Libraries %if %{without snap} Source0: https://www.openssl.org/source/%{name}-%{version}.tar.gz -# Source0-md5: 38a0bf2883ab4951acb15b1886b7f5aa +# Source0-md5: ba5f1b8b835b88cadbce9b35ed9531a6 %else Source1: https://github.com/openssl/openssl/archive/OpenSSL_1_1_0-stable/%{name}-%{version}-dev.tar.gz %endif Source2: %{name}.1.pl Source3: %{name}-ssl-certificate.sh Source4: %{name}-c_rehash.sh -Patch0: %{name}-alpha-ccc.patch Patch1: %{name}-optflags.patch -Patch2: %{name}-include.patch Patch3: %{name}-man-namespace.patch Patch4: %{name}-asflag.patch Patch5: %{name}-ca-certificates.patch -Patch6: %{name}-ldflags.patch Patch7: %{name}-find.patch Patch8: pic.patch Patch10: %{name}_fix_for_x32.patch @@ -264,17 +255,14 @@ RC4, RSA и SSL. Включает статические библиотеки д %prep %if %{with snap} %setup -qcT -a1 -mv %{name}-OpenSSL_1_1_0-stable/* . +%{__mv} %{name}-OpenSSL_1_1_0-stable/* . %else %setup -q %{?subver:-n %{name}-%{version}-%{subver}} %endif -#%patch0 -p1 # alpha patch from year 2000 - drop it -#%patch1 -p1 # flags list has been nuked (thank god!) -#%patch2 -p1 # openssl include subdir. check this -#%patch3 -p1 # patched Makefile.org no longer exists -#%patch4 -p1 # patched Makefile.org no longer exists -#%patch5 -p1 # check -#%patch6 -p1 # patched Makefile.org no longer exists +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch7 -p1 %patch8 -p1 %ifarch x32 @@ -285,10 +273,6 @@ mv %{name}-OpenSSL_1_1_0-stable/* . %build touch Makefile.* -# util/perlpath.pl no longer exists -#%{__perl} util/perlpath.pl %{__perl} - -OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \ PERL="%{__perl}" \ %{__perl} ./Configure \ --prefix=%{_prefix} \ @@ -318,7 +302,7 @@ PERL="%{__perl}" \ %endif %endif %ifarch alpha - linux-alpha+bwx-gcc + linux-alpha-gcc %endif %ifarch %{x8664} linux-x86_64 @@ -344,29 +328,31 @@ PERL="%{__perl}" \ %ifarch sparc64 linux64-sparcv9 %endif -%ifarch armv4 armv5 armv5t armv5te armv5tel +%ifarch %{arm} linux-armv4 %endif +%ifarch aarch64 + linux-aarch64 +%endif v=$(awk -F= '/^VERSION/{print $2}' Makefile) test "$v" = %{version}%{?subver:-%{subver}}%{?with_snap:-dev} %{__make} -j1 all %{?with_tests:tests} \ CC="%{__cc}" \ - ASFLAG='$(CFLAG) -Wa,--noexecstack' \ + ASFLAG="-Wa,--noexecstack" \ + OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \ INSTALLTOP=%{_prefix} -# Rename POD sources of man pages. "openssl_" prefix is added to each +# Rename POD sources of man pages. "openssl-" prefix is added to each # manpage to avoid potential conflicts with other packages. +# (libcrypto/libssl function names are not affected) -for dir in doc/{apps,ssl,crypto}; do - cd $dir || exit 1; - %{__perl} -pi -e 's/(\W)((?