]> git.pld-linux.org Git - packages/openssl.git/commitdiff
Merge branch 'dev-1.1'
authorJakub Bogusz <qboosh@pld-linux.org>
Sat, 15 Sep 2018 19:18:22 +0000 (21:18 +0200)
committerJakub Bogusz <qboosh@pld-linux.org>
Sat, 15 Sep 2018 19:18:22 +0000 (21:18 +0200)
engines-dir.patch [new file with mode: 0644]
openssl-alpha-ccc.patch [deleted file]
openssl-asflag.patch [deleted file]
openssl-ca-certificates.patch
openssl-include.patch [deleted file]
openssl-ldflags.patch [deleted file]
openssl-man-namespace.patch
openssl-optflags.patch
openssl.spec
openssl_fix_for_x32.patch [deleted file]

diff --git a/engines-dir.patch b/engines-dir.patch
new file mode 100644 (file)
index 0000000..20f5d1a
--- /dev/null
@@ -0,0 +1,11 @@
+--- openssl-1.1.1/Configurations/unix-Makefile.tmpl~   2018-09-13 13:40:10.000000000 +0200
++++ openssl-1.1.1/Configurations/unix-Makefile.tmpl    2018-09-13 13:40:42.065819616 +0200
+@@ -170,7 +170,7 @@ LIBDIR={- our $libdir = $config{libdir};
+ # $(libdir) is chosen to be compatible with the GNU coding standards
+ libdir={- file_name_is_absolute($libdir)
+           ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
+-ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}
++ENGINESDIR=/$(LIBDIR)/engines-{- $sover_dirname -}
+ # Convenience variable for those who want to set the rpath in shared
+ # libraries and applications
diff --git a/openssl-alpha-ccc.patch b/openssl-alpha-ccc.patch
deleted file mode 100644 (file)
index f16485a..0000000
+++ /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
deleted file mode 100644 (file)
index aadad1b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- 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)'             \
index 0221ac2b24fb216127fbf848597b76636ce82d27..1afdbfbda0cd7ca9c6c6f49b5ad07be0a9668aaa 100644 (file)
@@ -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.1/include/internal/cryptlib.h~ 2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/include/internal/cryptlib.h  2018-09-11 22:14:32.008012409 +0200
+@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM);
  # 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/pki/tls/certs/ca-bundle.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 (file)
index 7b7b1cd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
---- openssl-1.0.2i/Makefile.org~       2016-09-19 18:24:29.000000000 +0300
-+++ openssl-1.0.2i/Makefile.org        2016-09-19 18:24:58.456803714 +0300
-@@ -367,7 +367,7 @@
-       @ ( echo 'prefix=$(INSTALLTOP)'; \
-           echo 'exec_prefix=$${prefix}'; \
-           echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
--          echo 'includedir=$${prefix}/include'; \
-+          echo 'includedir=$${prefix}/include/openssl'; \
-           echo 'enginesdir=$${libdir}/engines'; \
-           echo ''; \
-           echo 'Name: OpenSSL-libcrypto'; \
-@@ -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 (file)
index d53dd6f..0000000
+++ /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
index 2c3bd12022a5896f8c7db0ef556612066814aaa7..20c2cdc60a53c769fdea169f6ae545bd266f2819 100644 (file)
---- 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 -E $$filecase "^$${fn}|$${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
+diff -urN openssl-1.1.1/doc.org/man1/asn1parse.pod openssl-1.1.1/doc/man1/asn1parse.pod
+--- openssl-1.1.1/doc.org/man1/asn1parse.pod   2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/asn1parse.pod       2018-09-11 22:09:16.148714293 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-asn1parse,
+-asn1parse - ASN.1 parsing tool
++openssl-asn1parse - ASN.1 parsing tool
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/ca.pod openssl-1.1.1/doc/man1/ca.pod
+--- openssl-1.1.1/doc.org/man1/ca.pod  2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/ca.pod      2018-09-11 22:08:39.447633905 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-ca,
+-ca - sample minimal CA application
++openssl-ca - sample minimal CA application
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/ciphers.pod openssl-1.1.1/doc/man1/ciphers.pod
+--- openssl-1.1.1/doc.org/man1/ciphers.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/ciphers.pod 2018-09-11 22:09:10.135203937 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/cms.pod openssl-1.1.1/doc/man1/cms.pod
+--- openssl-1.1.1/doc.org/man1/cms.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/cms.pod     2018-09-11 22:08:34.790830156 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-cms,
+-cms - CMS utility
++openssl-cms - CMS utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/crl2pkcs7.pod openssl-1.1.1/doc/man1/crl2pkcs7.pod
+--- openssl-1.1.1/doc.org/man1/crl2pkcs7.pod   2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/crl2pkcs7.pod       2018-09-11 22:11:06.401959876 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/crl.pod openssl-1.1.1/doc/man1/crl.pod
+--- openssl-1.1.1/doc.org/man1/crl.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/crl.pod     2018-09-11 22:10:43.631289563 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-crl,
+-crl - CRL utility
++openssl-crl - CRL utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/dgst.pod openssl-1.1.1/doc/man1/dgst.pod
+--- openssl-1.1.1/doc.org/man1/dgst.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/dgst.pod    2018-09-11 22:12:41.804768298 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-dgst,
+-dgst - perform digest operations
++openssl-dgst - perform digest operations
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/dhparam.pod openssl-1.1.1/doc/man1/dhparam.pod
+--- openssl-1.1.1/doc.org/man1/dhparam.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/dhparam.pod 2018-09-11 22:08:08.440054452 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-dhparam,
+-dhparam - DH parameter manipulation and generation
++openssl-dhparam - DH parameter manipulation and generation
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/dsaparam.pod openssl-1.1.1/doc/man1/dsaparam.pod
+--- openssl-1.1.1/doc.org/man1/dsaparam.pod    2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/dsaparam.pod        2018-09-11 22:09:26.799027812 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-dsaparam,
+-dsaparam - DSA parameter manipulation and generation
++openssl-dsaparam - DSA parameter manipulation and generation
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/dsa.pod openssl-1.1.1/doc/man1/dsa.pod
+--- openssl-1.1.1/doc.org/man1/dsa.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/dsa.pod     2018-09-11 22:09:37.069330144 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-dsa,
+-dsa - DSA key processing
++openssl-dsa - DSA key processing
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/ecparam.pod openssl-1.1.1/doc/man1/ecparam.pod
+--- openssl-1.1.1/doc.org/man1/ecparam.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/ecparam.pod 2018-09-11 22:09:50.416389716 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-ecparam,
+-ecparam - EC parameter manipulation and generation
++openssl-ecparam - EC parameter manipulation and generation
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/ec.pod openssl-1.1.1/doc/man1/ec.pod
+--- openssl-1.1.1/doc.org/man1/ec.pod  2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/ec.pod      2018-09-11 22:10:38.384468443 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-ec,
+-ec - EC key processing
++openssl-ec - EC key processing
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/enc.pod openssl-1.1.1/doc/man1/enc.pod
+--- openssl-1.1.1/doc.org/man1/enc.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/enc.pod     2018-09-11 22:07:38.422504142 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-enc,
+-enc - symmetric cipher routines
++openssl-enc - symmetric cipher routines
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/engine.pod openssl-1.1.1/doc/man1/engine.pod
+--- openssl-1.1.1/doc.org/man1/engine.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/engine.pod  2018-09-11 22:11:28.725950372 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-engine,
+-engine - load and query engines
++openssl-engine - load and query engines
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/errstr.pod openssl-1.1.1/doc/man1/errstr.pod
+--- openssl-1.1.1/doc.org/man1/errstr.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/errstr.pod  2018-09-11 22:07:46.686080735 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-errstr,
+-errstr - lookup error codes
++openssl-errstr - lookup error codes
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/gendsa.pod openssl-1.1.1/doc/man1/gendsa.pod
+--- openssl-1.1.1/doc.org/man1/gendsa.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/gendsa.pod  2018-09-11 22:12:17.117374895 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/genpkey.pod openssl-1.1.1/doc/man1/genpkey.pod
+--- openssl-1.1.1/doc.org/man1/genpkey.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/genpkey.pod 2018-09-11 22:10:07.880237141 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-genpkey,
+-genpkey - generate a private key
++openssl-genpkey - generate a private key
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/genrsa.pod openssl-1.1.1/doc/man1/genrsa.pod
+--- openssl-1.1.1/doc.org/man1/genrsa.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/genrsa.pod  2018-09-11 22:11:11.535444327 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-genrsa,
+-genrsa - generate an RSA private key
++openssl-genrsa - generate an RSA private key
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/list.pod openssl-1.1.1/doc/man1/list.pod
+--- openssl-1.1.1/doc.org/man1/list.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/list.pod    2018-09-11 22:08:58.891539618 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-list,
+-list - list algorithms and features
++openssl-list - list algorithms and features
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/nseq.pod openssl-1.1.1/doc/man1/nseq.pod
+--- openssl-1.1.1/doc.org/man1/nseq.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/nseq.pod    2018-09-11 22:10:48.351428513 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/ocsp.pod openssl-1.1.1/doc/man1/ocsp.pod
+--- openssl-1.1.1/doc.org/man1/ocsp.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/ocsp.pod    2018-09-11 22:08:49.024582492 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-ocsp,
+-ocsp - Online Certificate Status Protocol utility
++openssl-ocsp - Online Certificate Status Protocol utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/passwd.pod openssl-1.1.1/doc/man1/passwd.pod
+--- openssl-1.1.1/doc.org/man1/passwd.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/passwd.pod  2018-09-11 22:12:23.680901443 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-passwd,
+-passwd - compute password hashes
++openssl-passwd - compute password hashes
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/pkcs12.pod openssl-1.1.1/doc/man1/pkcs12.pod
+--- openssl-1.1.1/doc.org/man1/pkcs12.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/pkcs12.pod  2018-09-11 22:12:08.627124963 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-pkcs12,
+-pkcs12 - PKCS#12 file utility
++openssl-pkcs12 - PKCS#12 file utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/pkcs7.pod openssl-1.1.1/doc/man1/pkcs7.pod
+--- openssl-1.1.1/doc.org/man1/pkcs7.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/pkcs7.pod   2018-09-11 22:08:44.624452964 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-pkcs7,
+-pkcs7 - PKCS#7 utility
++openssl-pkcs7 - PKCS#7 utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/pkcs8.pod openssl-1.1.1/doc/man1/pkcs8.pod
+--- openssl-1.1.1/doc.org/man1/pkcs8.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/pkcs8.pod   2018-09-11 22:10:34.057674407 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/pkeyparam.pod openssl-1.1.1/doc/man1/pkeyparam.pod
+--- openssl-1.1.1/doc.org/man1/pkeyparam.pod   2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/pkeyparam.pod       2018-09-11 22:09:32.382525509 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/pkey.pod openssl-1.1.1/doc/man1/pkey.pod
+--- openssl-1.1.1/doc.org/man1/pkey.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/pkey.pod    2018-09-11 22:09:57.529932454 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/pkeyutl.pod openssl-1.1.1/doc/man1/pkeyutl.pod
+--- openssl-1.1.1/doc.org/man1/pkeyutl.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/pkeyutl.pod 2018-09-11 22:11:00.448451286 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-pkeyutl,
+-pkeyutl - public key algorithm utility
++openssl-pkeyutl - public key algorithm utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/prime.pod openssl-1.1.1/doc/man1/prime.pod
+--- openssl-1.1.1/doc.org/man1/prime.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/prime.pod   2018-09-11 22:10:55.561640764 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-prime,
+-prime - compute prime numbers
++openssl-prime - compute prime numbers
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/rand.pod openssl-1.1.1/doc/man1/rand.pod
+--- openssl-1.1.1/doc.org/man1/rand.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/rand.pod    2018-09-11 22:11:39.589603508 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-rand,
+-rand - generate pseudo-random bytes
++openssl-rand - generate pseudo-random bytes
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/rehash.pod openssl-1.1.1/doc/man1/rehash.pod
+--- openssl-1.1.1/doc.org/man1/rehash.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/rehash.pod  2018-09-11 22:08:28.943991372 +0200
+@@ -5,8 +5,7 @@
+ =head1 NAME
+-openssl-c_rehash, openssl-rehash,
+-c_rehash, rehash - Create symbolic links to files named by the hash values
++c_rehash, openssl-rehash - Create symbolic links to files named by the hash values
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/req.pod openssl-1.1.1/doc/man1/req.pod
+--- openssl-1.1.1/doc.org/man1/req.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/req.pod     2018-09-11 22:08:54.174734102 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/rsa.pod openssl-1.1.1/doc/man1/rsa.pod
+--- openssl-1.1.1/doc.org/man1/rsa.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/rsa.pod     2018-09-11 22:12:34.427884475 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-rsa,
+-rsa - RSA key processing tool
++openssl-rsa - RSA key processing tool
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/rsautl.pod openssl-1.1.1/doc/man1/rsautl.pod
+--- openssl-1.1.1/doc.org/man1/rsautl.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/rsautl.pod  2018-09-11 22:11:19.782353762 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-rsautl,
+-rsautl - RSA utility
++openssl-rsautl - RSA utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/s_client.pod openssl-1.1.1/doc/man1/s_client.pod
+--- openssl-1.1.1/doc.org/man1/s_client.pod    2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/s_client.pod        2018-09-11 22:12:02.190268812 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-s_client,
+-s_client - SSL/TLS client program
++openssl-s_client - SSL/TLS client program
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/sess_id.pod openssl-1.1.1/doc/man1/sess_id.pod
+--- openssl-1.1.1/doc.org/man1/sess_id.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/sess_id.pod 2018-09-11 22:11:56.426765815 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/smime.pod openssl-1.1.1/doc/man1/smime.pod
+--- openssl-1.1.1/doc.org/man1/smime.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/smime.pod   2018-09-11 22:10:19.807254909 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-smime,
+-smime - S/MIME utility
++openssl-smime - S/MIME utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/speed.pod openssl-1.1.1/doc/man1/speed.pod
+--- openssl-1.1.1/doc.org/man1/speed.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/speed.pod   2018-09-11 22:09:21.542206398 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-speed,
+-speed - test library performance
++openssl-speed - test library performance
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/spkac.pod openssl-1.1.1/doc/man1/spkac.pod
+--- openssl-1.1.1/doc.org/man1/spkac.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/spkac.pod   2018-09-11 22:10:29.570875660 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-spkac,
+-spkac - SPKAC printing and generating utility
++openssl-spkac - SPKAC printing and generating utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/srp.pod openssl-1.1.1/doc/man1/srp.pod
+--- openssl-1.1.1/doc.org/man1/srp.pod 2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/srp.pod     2018-09-11 22:10:02.696751220 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-srp,
+-srp - maintain SRP password file
++openssl-srp - maintain SRP password file
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/s_server.pod openssl-1.1.1/doc/man1/s_server.pod
+--- openssl-1.1.1/doc.org/man1/s_server.pod    2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/s_server.pod        2018-09-11 22:09:04.541705946 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-s_server,
+-s_server - SSL/TLS server program
++openssl-s_server - SSL/TLS server program
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/s_time.pod openssl-1.1.1/doc/man1/s_time.pod
+--- openssl-1.1.1/doc.org/man1/s_time.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/s_time.pod  2018-09-11 22:09:44.646219856 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/storeutl.pod openssl-1.1.1/doc/man1/storeutl.pod
+--- openssl-1.1.1/doc.org/man1/storeutl.pod    2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/storeutl.pod        2018-09-11 22:07:55.473006066 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-storeutl,
+-storeutl - STORE utility
++openssl-storeutl - STORE utility
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/tsget.pod openssl-1.1.1/doc/man1/tsget.pod
+--- openssl-1.1.1/doc.org/man1/tsget.pod       2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/tsget.pod   2018-09-11 22:10:15.233786945 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-tsget,
+-tsget - Time Stamping HTTP/HTTPS client
++openssl-tsget - Time Stamping HTTP/HTTPS client
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/ts.pod openssl-1.1.1/doc/man1/ts.pod
+--- openssl-1.1.1/doc.org/man1/ts.pod  2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/ts.pod      2018-09-11 22:10:24.110714927 +0200
+@@ -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
+diff -urN openssl-1.1.1/doc.org/man1/verify.pod openssl-1.1.1/doc/man1/verify.pod
+--- openssl-1.1.1/doc.org/man1/verify.pod      2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/verify.pod  2018-09-11 22:11:51.053274300 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-verify,
+-verify - Utility to verify certificates
++openssl-verify - Utility to verify certificates
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/version.pod openssl-1.1.1/doc/man1/version.pod
+--- openssl-1.1.1/doc.org/man1/version.pod     2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/version.pod 2018-09-11 22:11:45.803119749 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-openssl-version,
+-version - print OpenSSL version information
++openssl-version - print OpenSSL version information
+ =head1 SYNOPSIS
+diff -urN openssl-1.1.1/doc.org/man1/x509.pod openssl-1.1.1/doc/man1/x509.pod
+--- openssl-1.1.1/doc.org/man1/x509.pod        2018-09-11 14:48:22.000000000 +0200
++++ openssl-1.1.1/doc/man1/x509.pod    2018-09-11 22:08:15.893607199 +0200
+@@ -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.1/doc/man5/config.pod~ 2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man5/config.pod  2018-09-13 18:55:53.379314240 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-config - OpenSSL CONF library configuration files
++openssl-config - OpenSSL CONF library configuration files
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man5/x509v3_config.pod~  2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man5/x509v3_config.pod   2018-09-13 18:56:06.236359843 +0200
+@@ -2,7 +2,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.1/doc/man7/bio.pod~    2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/bio.pod     2018-09-13 19:13:57.454822064 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-bio - Basic I/O abstraction
++openssl-bio - Basic I/O abstraction
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/crypto.pod~ 2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/crypto.pod  2018-09-13 19:14:03.525002575 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-crypto - OpenSSL cryptographic library
++openssl-crypto - OpenSSL cryptographic library
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/ct.pod~     2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/ct.pod      2018-09-13 19:14:07.405117959 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-ct - Certificate Transparency
++openssl-ct - Certificate Transparency
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/des_modes.pod~      2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/des_modes.pod       2018-09-13 19:14:10.988557855 +0200
+@@ -2,7 +2,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.1/doc/man7/evp.pod~    2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/evp.pod     2018-09-13 19:14:15.148681567 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-evp - high-level cryptographic functions
++openssl-evp - high-level cryptographic functions
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/ssl.pod~    2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/ssl.pod     2018-09-13 19:14:35.495953306 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-ssl - OpenSSL SSL/TLS library
++openssl-ssl - OpenSSL SSL/TLS library
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/x509.pod~   2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/x509.pod    2018-09-13 19:14:40.996116867 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-x509 - X.509 certificate handling
++openssl-x509 - X.509 certificate handling
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/Ed25519.pod~        2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/Ed25519.pod 2018-09-13 19:27:15.788862330 +0200
+@@ -2,9 +2,7 @@
+ =head1 NAME
+-Ed25519,
+-Ed448
+-- EVP_PKEY Ed25519 and Ed448 support
++openssl-Ed25519, openssl-Ed448 - EVP_PKEY Ed25519 and Ed448 support
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man7/passphrase-encoding.pod~    2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/passphrase-encoding.pod     2018-09-13 19:27:38.656220157 +0200
+@@ -4,7 +4,7 @@
+ =head1 NAME
+-passphrase-encoding
++openssl-passphrase-encoding
+ - How diverse parts of OpenSSL treat pass phrases character encoding
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man7/RAND_DRBG.pod~      2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/RAND_DRBG.pod       2018-09-13 19:27:45.693099512 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-RAND_DRBG - the deterministic random bit generator
++openssl-RAND_DRBG - the deterministic random bit generator
+ =head1 SYNOPSIS
+--- openssl-1.1.1/doc/man7/RAND.pod~   2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/RAND.pod    2018-09-13 19:27:53.023321066 +0200
+@@ -2,8 +2,7 @@
+ =head1 NAME
+-RAND
+-- the OpenSSL random generator
++openssl-RAND - the OpenSSL random generator
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man7/RSA-PSS.pod~        2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/RSA-PSS.pod 2018-09-13 19:27:58.186810465 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-RSA-PSS - EVP_PKEY RSA-PSS algorithm support
++openssl - RSA-PSS - EVP_PKEY RSA-PSS algorithm support
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man7/scrypt.pod~ 2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/scrypt.pod  2018-09-13 19:28:04.880346108 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-scrypt - EVP_PKEY scrypt KDF support
++openssl-scrypt - EVP_PKEY scrypt KDF support
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man7/SM2.pod~    2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/SM2.pod     2018-09-13 19:28:09.697158362 +0200
+@@ -2,7 +2,7 @@
+ =head1 NAME
+-SM2 - Chinese SM2 signature and encryption algorithm support
++openssl-SM2 - Chinese SM2 signature and encryption algorithm support
+ =head1 DESCRIPTION
+--- openssl-1.1.1/doc/man7/X25519.pod~ 2018-09-11 14:48:23.000000000 +0200
++++ openssl-1.1.1/doc/man7/X25519.pod  2018-09-13 19:28:23.594245064 +0200
+@@ -2,9 +2,7 @@
+ =head1 NAME
+-X25519,
+-X448
+-- EVP_PKEY X25519 and X448 support
++openssl-X25519, openssl-X448 - EVP_PKEY X25519 and X448 support
+ =head1 DESCRIPTION
  
index a6d077e4cd0ad72c0982a699e94f837a84528910..b80afc89ee9908fb90cbeab12890b4d794d8190f 100644 (file)
-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}::",
- # 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 <ray.miller@computing-services.oxford.ac.uk> 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 @@
- #
- #                                     <appro@fy.chalmers.se>
- #
--"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$/)
-               {
+--- openssl-1.1.1/Configurations/unix-Makefile.tmpl~   2018-09-13 13:08:19.000000000 +0200
++++ openssl-1.1.1/Configurations/unix-Makefile.tmpl    2018-09-13 13:15:24.200834530 +0200
+@@ -205,7 +205,7 @@ CPPFLAGS={- our $cppflags1 = join(" ",
+                                   (map { "-D".$_} @{$config{CPPDEFINES}}),
+                                   (map { "-I".$_} @{$config{CPPINCLUDES}}),
+                                   @{$config{CPPFLAGS}}) -}
+-CFLAGS={- join(' ', @{$config{CFLAGS}}) -}
++CFLAGS={- join(' ', @{$config{CFLAGS}}) -} $(OPTFLAGS)
+ CXXFLAGS={- join(' ', @{$config{CXXFLAGS}}) -}
+ LDFLAGS= {- join(' ', @{$config{LDFLAGS}}) -}
+ EX_LIBS= {- join(' ', @{$config{LDLIBS}}) -}
index ecfec628a5662cb3335b7ff3f90e3ed86b8e4d0a..c433de3d88936db7b6d21bc2ee84b00e1fa3a06d 100644 (file)
@@ -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
 #
 # 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
+%bcond_with    sslv2   # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
+%bcond_with    sslv3   # SSLv3: note - enables  CVE-2014-3566 vulnerability
 
 %include       /usr/lib/rpm/macros.perl
 Summary:       OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
@@ -21,36 +15,29 @@ Summary(pt_BR.UTF-8):       Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):     Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
-# 1.0.2 will be LTS release
-# Version 1.0.2 will be supported until 2019-12-31.
+# Version 1.1.1 is LTS, supported until 2023-09-11.
 # https://www.openssl.org/about/releasestrat.html
-Version:       1.0.2p
+Version:       1.1.1
 Release:       1
 License:       Apache-like
 Group:         Libraries
-%if %{without snap}
 Source0:       https://www.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: ac5eb30bf5798aa14b1ae6d0e7da58df
-%else
-Source1:       https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
-# Source1-md5: 6b846f8a4f55f5ddfa1e0d335241840a
-%endif
+# Source0-md5: 7079eb017429e0ffb9efb42bf80ccb21
 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
+
+Patch11:       engines-dir.patch
 URL:           http://www.openssl.org/
-BuildRequires: bc
-BuildRequires: perl-devel >= 1:5.6.1
+BuildRequires: perl-devel >= 1:5.10.0
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.213
@@ -264,49 +251,44 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %prep
 %if %{with snap}
 %setup -qcT -a1
-mv %{name}-OpenSSL_1_0_2-stable/* .
+%{__mv} %{name}-OpenSSL_1_1_0-stable/* .
 %else
-%setup -q
+%setup -q %{?subver:-n %{name}-%{version}-%{subver}}
 %endif
-%patch0 -p1
+
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
-%patch4 -p1
+
 %patch5 -p1
-%patch6 -p1
+
 %patch7 -p1
 %patch8 -p1
-%ifarch x32
-%patch10 -p1
-%endif
 
-sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
+%patch11 -p1
 
 %build
 touch Makefile.*
 
-%{__perl} util/perlpath.pl %{__perl}
-
-OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \
 PERL="%{__perl}" \
 %{__perl} ./Configure \
+       --prefix=%{_prefix} \
        --openssldir=%{_sysconfdir}/%{name} \
        --libdir=%{_lib} \
+       -Wa,--noexecstack \
        shared \
        threads \
        %{?with_sslv2:enable-ssl2}%{!?with_sslv2:no-ssl2} \
        %{?with_sslv3:enable-ssl3}%{!?with_sslv3:no-ssl3} \
        %{!?with_zlib:no-}zlib \
-       enable-camelia \
        enable-cms \
        enable-idea \
        enable-md2 \
        enable-mdc2 \
        enable-rc5 \
        enable-rfc3779 \
+       enable-sctp \
        enable-seed \
-       enable-tlsext \
 %ifarch %{x8664}
        enable-ec_nistp_64_gcc_128 \
 %endif
@@ -319,7 +301,7 @@ PERL="%{__perl}" \
 %endif
 %endif
 %ifarch alpha
-       linux-alpha+bwx-gcc
+       linux-alpha-gcc
 %endif
 %ifarch %{x8664}
        linux-x86_64
@@ -345,44 +327,41 @@ 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}%{?with_snap:-dev}
+test "$v" = %{version}%{?subver:-%{subver}}%{?with_snap:-dev}
 
-%{__make} -j1 all rehash %{?with_tests:tests} \
+%{__make} -j1 all %{?with_tests:tests} \
        CC="%{__cc}" \
-       ASFLAG='$(CFLAG) -Wa,--noexecstack' \
+       OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
        INSTALLTOP=%{_prefix}
 
 # Rename POD sources of man pages. "openssl-" prefix is added to each
-# manpage to avoid potential conflicts with other packages.
+# manpage to avoid potential conflicts with other packages. 
+# openssl-man-namespace.patch mostly marks these pages with "openssl-" prefix.
 
-for dir in doc/{apps,ssl,crypto}; do
-       cd $dir || exit 1;
-       %{__perl} -pi -e 's/(\W)((?<!openssl-)\w+)(\(\d\))/$1openssl-$2$3/g; s/openssl-openssl/openssl/g;' *.pod;
-
-       for pod in !(openssl*).pod; do
-               %{__mv} $pod openssl-$pod;
-       done
-       cd ../..
+for podfile in $(grep -rl '^openssl-' doc/man*); do
+       dir=$(dirname "$podfile")
+       base=$(basename "$podfile")
+       %{__mv} "$podfile" "$dir/openssl-$base"
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
        $RPM_BUILD_ROOT{%{_mandir}/{pl/man1,man{1,3,5,7}},%{_datadir}/ssl} \
-       $RPM_BUILD_ROOT/%{_lib}/engines \
        $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} -j1 install \
-       INSTALLTOP=%{_prefix} \
-       INSTALL_PREFIX=$RPM_BUILD_ROOT \
-       MANDIR=%{_mandir}
+       CC="%{__cc}" \
+       DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/engines/* $RPM_BUILD_ROOT/%{_lib}/engines
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcrypto.*.*) $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libssl.*.*) $RPM_BUILD_ROOT%{_libdir}/libssl.so
@@ -390,8 +369,8 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libssl.*.*) $RPM_BUILD_ROOT%{
 %{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc/* $RPM_BUILD_ROOT%{_libdir}/%{name}
 %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/misc
 
-# not installed as individual utilities (see openssl dgst instead)
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{dss1,md2,md4,md5,mdc2,ripemd160,sha,sha1,sha224,sha256,sha384,sha512}.1
+# html version of man pages - not packaged
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/html/man[1357]
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
@@ -428,9 +407,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
-%attr(755,root,root) /%{_lib}/libcrypto.so.*.*.*
-%attr(755,root,root) /%{_lib}/libssl.so.*.*.*
+%doc CHANGES LICENSE NEWS README doc/*.txt
+%attr(755,root,root) /%{_lib}/libcrypto.so.*.*
+%attr(755,root,root) /%{_lib}/libssl.so.*.*
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/certs
 %dir %attr(700,root,root) %{_sysconfdir}/%{name}/private
@@ -438,23 +417,16 @@ fi
 
 %files engines
 %defattr(644,root,root,755)
-%dir /%{_lib}/engines
-%attr(755,root,root) /%{_lib}/engines/*.so
+%dir /%{_lib}/engines-1.1
+%attr(755,root,root) /%{_lib}/engines-1.1/*.so
 
 %files tools
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/ct_log_list.cnf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/openssl.cnf
 %attr(755,root,root) %{_bindir}/c_rehash.sh
 %attr(755,root,root) %{_bindir}/openssl
 %attr(754,root,root) %{_bindir}/ssl-certificate
-
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/CA.sh
-%attr(755,root,root) %{_libdir}/%{name}/c_hash
-%attr(755,root,root) %{_libdir}/%{name}/c_info
-%attr(755,root,root) %{_libdir}/%{name}/c_issuer
-%attr(755,root,root) %{_libdir}/%{name}/c_name
-
 %{_mandir}/man1/openssl.1*
 %{_mandir}/man1/openssl-asn1parse.1*
 %{_mandir}/man1/openssl-ca.1*
@@ -469,10 +441,12 @@ fi
 %{_mandir}/man1/openssl-ec.1*
 %{_mandir}/man1/openssl-ecparam.1*
 %{_mandir}/man1/openssl-enc.1*
+%{_mandir}/man1/openssl-engine.1*
 %{_mandir}/man1/openssl-errstr.1*
 %{_mandir}/man1/openssl-gendsa.1*
 %{_mandir}/man1/openssl-genpkey.1*
 %{_mandir}/man1/openssl-genrsa.1*
+%{_mandir}/man1/openssl-list.1*
 %{_mandir}/man1/openssl-nseq.1*
 %{_mandir}/man1/openssl-ocsp.1*
 %{_mandir}/man1/openssl-passwd.1*
@@ -482,7 +456,9 @@ fi
 %{_mandir}/man1/openssl-pkey.1*
 %{_mandir}/man1/openssl-pkeyparam.1*
 %{_mandir}/man1/openssl-pkeyutl.1*
+%{_mandir}/man1/openssl-prime.1*
 %{_mandir}/man1/openssl-rand.1*
+%{_mandir}/man1/openssl-rehash.1*
 %{_mandir}/man1/openssl-req.1*
 %{_mandir}/man1/openssl-rsa.1*
 %{_mandir}/man1/openssl-rsautl.1*
@@ -493,6 +469,8 @@ fi
 %{_mandir}/man1/openssl-smime.1*
 %{_mandir}/man1/openssl-speed.1*
 %{_mandir}/man1/openssl-spkac.1*
+%{_mandir}/man1/openssl-srp.1*
+%{_mandir}/man1/openssl-storeutl.1*
 %{_mandir}/man1/openssl-ts.1*
 %{_mandir}/man1/openssl-tsget.1*
 %{_mandir}/man1/openssl-verify.1*
@@ -505,10 +483,12 @@ fi
 %files tools-perl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/c_rehash
+%dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/CA.pl
 %attr(755,root,root) %{_libdir}/%{name}/tsget
-%{_mandir}/man1/openssl-CA.pl.1*
-%{_mandir}/man1/openssl-c_rehash.1*
+%attr(755,root,root) %{_libdir}/%{name}/tsget.pl
+%{_mandir}/man1/CA.pl.1*
+%{_mandir}/man1/c_rehash.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -518,8 +498,141 @@ fi
 %{_pkgconfigdir}/libcrypto.pc
 %{_pkgconfigdir}/libssl.pc
 %{_pkgconfigdir}/openssl.pc
-%{_mandir}/man3/openssl-*.3*
+%{_mandir}/man3/ACCESS_DESCRIPTION_*.3*
+%{_mandir}/man3/ADMISSION*.3*
+%{_mandir}/man3/ASId*.3*
+%{_mandir}/man3/ASRange_*.3*
+%{_mandir}/man3/ASN1_*.3*
+%{_mandir}/man3/ASYNC_*.3*
+%{_mandir}/man3/AUTHORITY_*.3*
+%{_mandir}/man3/BASIC_CONSTRAINTS_*.3*
+%{_mandir}/man3/BF_*.3*
+%{_mandir}/man3/BIO_*.3*
+%{_mandir}/man3/BN_*.3*
+%{_mandir}/man3/BUF_*.3*
+%{_mandir}/man3/CERTIFICATEPOLICIES_*.3*
+%{_mandir}/man3/CMS_*.3*
+%{_mandir}/man3/CONF_*.3*
+%{_mandir}/man3/CRL_DIST_POINTS_*.3*
+%{_mandir}/man3/CRYPTO_*.3*
+%{_mandir}/man3/CTLOG_*.3*
+%{_mandir}/man3/CT_POLICY_*.3*
+%{_mandir}/man3/DECLARE_*.3*
+%{_mandir}/man3/DEFINE_*.3*
+%{_mandir}/man3/DES_*.3*
+%{_mandir}/man3/DH_*.3*
+%{_mandir}/man3/DHparams_*.3*
+%{_mandir}/man3/DIRECTORYSTRING_*.3*
+%{_mandir}/man3/DISPLAYTEXT_*.3*
+%{_mandir}/man3/DIST_POINT_*.3*
+%{_mandir}/man3/DSA_*.3*
+%{_mandir}/man3/DSAparams_*.3*
+%{_mandir}/man3/DTLS_*.3*
+%{_mandir}/man3/DTLSv1_*.3*
+%{_mandir}/man3/ECDH_*.3*
+%{_mandir}/man3/ECDSA_*.3*
+%{_mandir}/man3/ECPARAMETERS_*.3*
+%{_mandir}/man3/ECPKPARAMETERS_*.3*
+%{_mandir}/man3/ECPKParameters_*.3*
+%{_mandir}/man3/EC_*.3*
+%{_mandir}/man3/EDIPARTYNAME_*.3*
+%{_mandir}/man3/ENGINE_*.3*
+%{_mandir}/man3/ERR_*.3*
+%{_mandir}/man3/ESS_*.3*
+%{_mandir}/man3/EVP_*.3*
+%{_mandir}/man3/EXTENDED_KEY_USAGE_*.3*
+%{_mandir}/man3/GENERAL_*.3*
+%{_mandir}/man3/GEN_SESSION_CB.3*
+%{_mandir}/man3/HMAC*.3*
+%{_mandir}/man3/IMPLEMENT_*.3*
+%{_mandir}/man3/IPAddress*.3*
+%{_mandir}/man3/ISSUING_DIST_POINT_*.3*
+%{_mandir}/man3/LHASH*.3*
+%{_mandir}/man3/MD2*.3*
+%{_mandir}/man3/MD4*.3*
+%{_mandir}/man3/MD5*.3*
+%{_mandir}/man3/MDC2*.3*
+%{_mandir}/man3/NAME_CONSTRAINTS_*.3*
+%{_mandir}/man3/NAMING_AUTHORITY*.3*
+%{_mandir}/man3/NETSCAPE_*.3*
+%{_mandir}/man3/NOTICEREF_*.3*
+%{_mandir}/man3/OBJ_*.3*
+%{_mandir}/man3/OCSP_*.3*
+%{_mandir}/man3/OPENSSL_*.3*
+%{_mandir}/man3/OSSL*.3*
+%{_mandir}/man3/OTHERNAME_*.3*
+%{_mandir}/man3/OpenSSL_*.3*
+%{_mandir}/man3/PBE2PARAM_*.3*
+%{_mandir}/man3/PBEPARAM_*.3*
+%{_mandir}/man3/PBKDF2PARAM_*.3*
+%{_mandir}/man3/PEM_*.3*
+%{_mandir}/man3/PKCS12_*.3*
+%{_mandir}/man3/PKCS5_*.3*
+%{_mandir}/man3/PKCS7_*.3*
+%{_mandir}/man3/PKCS8_*.3*
+%{_mandir}/man3/PKEY_*.3*
+%{_mandir}/man3/POLICYINFO_*.3*
+%{_mandir}/man3/POLICYQUALINFO_*.3*
+%{_mandir}/man3/POLICY_*.3*
+%{_mandir}/man3/PROFESSION_INFO*.3*
+%{_mandir}/man3/PROXY_*.3*
+%{_mandir}/man3/RAND_*.3*
+%{_mandir}/man3/RC4*.3*
+%{_mandir}/man3/RIPEMD160*.3*
+%{_mandir}/man3/RSAPrivateKey_*.3*
+%{_mandir}/man3/RSAPublicKey_*.3*
+%{_mandir}/man3/RSA_*.3*
+%{_mandir}/man3/SCRYPT_PARAMS*.3*
+%{_mandir}/man3/SCT_*.3*
+%{_mandir}/man3/SHA1*.3*
+%{_mandir}/man3/SHA224*.3*
+%{_mandir}/man3/SHA256*.3*
+%{_mandir}/man3/SHA384*.3*
+%{_mandir}/man3/SHA512*.3*
+%{_mandir}/man3/SMIME_*.3*
+%{_mandir}/man3/SSL_*.3*
+%{_mandir}/man3/SSLv23_*.3*
+%{_mandir}/man3/SSLv3_*.3*
+%{_mandir}/man3/SXNET_*.3*
+%{_mandir}/man3/SXNETID_*.3*
+%{_mandir}/man3/TLS_*.3*
+%{_mandir}/man3/TLSv1_*.3*
+%{_mandir}/man3/TS_*.3*
+%{_mandir}/man3/UI*.3*
+%{_mandir}/man3/USERNOTICE_*.3*
+%{_mandir}/man3/X509_*.3*
+%{_mandir}/man3/X509V3_*.3*
+%{_mandir}/man3/X509v3_*.3*
+%{_mandir}/man3/custom_ext_*.3*
+%{_mandir}/man3/d2i_*.3*
+%{_mandir}/man3/i2d_*.3*
+%{_mandir}/man3/i2o_*.3*
+%{_mandir}/man3/i2t_*.3*
+%{_mandir}/man3/lh_TYPE_*.3*
+%{_mandir}/man3/o2i_*.3*
+%{_mandir}/man3/pem_password_cb.3*
+%{_mandir}/man3/sk_TYPE_*.3*
+%{_mandir}/man3/ssl_ct_validation_cb.3*
+%{_mandir}/man7/openssl.7*
+%{_mandir}/man7/openssl-bio.7*
+%{_mandir}/man7/openssl-crypto.7*
+%{_mandir}/man7/openssl-ct.7*
 %{_mandir}/man7/openssl-des_modes.7*
+%{_mandir}/man7/openssl-Ed25519.7*
+%{_mandir}/man7/openssl-Ed448.7*
+%{_mandir}/man7/openssl-evp.7*
+%{_mandir}/man7/openssl-passphrase-encoding.7*
+%{_mandir}/man7/openssl-RAND.7*
+%{_mandir}/man7/openssl-RAND_DRBG.7*
+%{_mandir}/man7/openssl-scrypt.7*
+%{_mandir}/man7/openssl-SM2.7*
+%{_mandir}/man7/openssl-ssl.7*
+%{_mandir}/man7/openssl-X25519.7*
+%{_mandir}/man7/openssl-X448.7*
+%{_mandir}/man7/openssl-x509.7*
+%{_mandir}/man7/ossl_store.7*
+%{_mandir}/man7/ossl_store-file.7*
+%{_mandir}/man7/RSA-PSS.7.gz
 
 %files static
 %defattr(644,root,root,755)
diff --git a/openssl_fix_for_x32.patch b/openssl_fix_for_x32.patch
deleted file mode 100644 (file)
index 5ae0b9b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-
-obsolete now that this is applied?
-https://rt.openssl.org/Ticket/Display.html?id=3885
-https://github.com/openssl/openssl/commit/10c639a8a56c90bec9e332c7ca76ef552b3952ac
-
---- openssl-1.0.2g/crypto/perlasm/x86_64-xlate.pl~     2016-02-24 19:39:13.000000000 +0200
-+++ openssl-1.0.2g/crypto/perlasm/x86_64-xlate.pl      2016-02-25 21:01:20.464795948 +0200
-@@ -198,11 +198,15 @@
-       if ($gas) {
-           # Solaris /usr/ccs/bin/as can't handle multiplications
-           # in $self->{value}
-+          if ($self->{value} =~ /0xA040608020C0E000/) {
-+                  $self->{value} = "11547335547999543296";
-+          } else {
-           my $value = $self->{value};
-           $value =~ s/(?<![\w\$\.])(0x?[0-9a-f]+)/oct($1)/egi;
-           if ($value =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg) {
-               $self->{value} = $value;
-           }
-+          }
-           sprintf "\$%s",$self->{value};
-       } else {
-           $self->{value} =~ s/(0b[0-1]+)/oct($1)/eig;
This page took 0.189001 seconds and 4 git commands to generate.