diff --git a/.abf.yml b/.abf.yml index f0dd00d..8602182 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - openssl-1.0.1m.tar.gz: 4ccaf6e505529652f9fdafa01d1d8300bd9f3179 + openssl-1.0.1n.tar.gz: 2f6ea1e0f2724aca1805392e4387df8361442ace diff --git a/openssl-1.0.1m.tar.gz.asc b/openssl-1.0.1m.tar.gz.asc deleted file mode 100644 index 8c2158b..0000000 --- a/openssl-1.0.1m.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJVCtFhAAoJENnE0m0OYESRVQ8H/i1ekyl8CZnRGCkEURigWNKy -Qei904l7QMvqc6IC5ThAEP2T79A2yY7ih+tzKQ8pWxintnL5ss5obuEWcg6h7T50 -Fb9SBYCpTgVSsTX/CSsuDbKuZdabhdilctNBRyOBeKhuChQmGsQRrpxbihoZCIYm -bAdO0jl8D4jfhhBkcorsVOMRcjk5b2nTS9Dym45kD8+NLkuuw388nURdFWeYE2Om -HjyIAcJ+jHbkyDPrXLieioc9iumPe3lyy5mLyqWK8QOVIvcf91AX67kIVP6y9Vod -o4EAEAPZ0ht7oIfnoXHJD3bYoVZYON47zpNHD3aEKsya19Q7GE8vX8nV6tfY0VU= -=qimZ ------END PGP SIGNATURE----- diff --git a/openssl-1.0.1m-optflags.diff b/openssl-1.0.1n-optflags.diff similarity index 95% rename from openssl-1.0.1m-optflags.diff rename to openssl-1.0.1n-optflags.diff index c8a3939..f791d93 100644 --- a/openssl-1.0.1m-optflags.diff +++ b/openssl-1.0.1n-optflags.diff @@ -1,6 +1,6 @@ -diff -urN openssl-1.0.1m/Configure openssl-1.0.1m-patched/Configure ---- openssl-1.0.1m/Configure 2015-03-19 23:37:10.000000000 +1000 -+++ openssl-1.0.1m-patched/Configure 2015-04-05 22:30:54.604106138 +1000 +diff -urN openssl-1.0.1n/Configure openssl-1.0.1n-patched/Configure +--- openssl-1.0.1n/Configure 2015-06-12 00:01:49.000000000 +1000 ++++ openssl-1.0.1n-patched/Configure 2015-06-12 14:18:16.544065313 +1000 @@ -171,10 +171,10 @@ "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)::::", @@ -69,23 +69,23 @@ diff -urN openssl-1.0.1m/Configure openssl-1.0.1m-patched/Configure #### SPARC Solaris with GNU C setups -"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"solaris-sparcv8-gcc","gcc:-mcpu=v8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv7-gcc","gcc:\$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"solaris-sparcv8-gcc","gcc:-mv8 \$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"solaris-sparcv8-gcc","gcc:-mcpu=v8 \$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc -"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", +"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc \$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc \$(RPM_OPT_FLAGS) -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", #### - "debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=v8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -252,19 +252,19 @@ #### SunOS configs, assuming sparc for the gcc one. #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::", --"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::", -+"sunos-gcc","gcc:\$(RPM_OPT_FLAGS) -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::", +-"sunos-gcc","gcc:-O3 -mcpu=v8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::", ++"sunos-gcc","gcc:\$(RPM_OPT_FLAGS) -mcpu=v8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::", #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. @@ -192,8 +192,8 @@ diff -urN openssl-1.0.1m/Configure openssl-1.0.1m-patched/Configure #### SPARC Linux setups # Ray Miller has patiently # assisted with debugging of following two configs. --"linux-sparcv8","gcc:-mv8 -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:-mv8 -DB_ENDIAN \$(RPM_OPT_FLAGS) -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 -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 \$(RPM_OPT_FLAGS) -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)", # 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)", @@ -228,12 +228,12 @@ diff -urN openssl-1.0.1m/Configure openssl-1.0.1m-patched/Configure -"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mcpu=v8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"BSD-generic32","gcc:\$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"BSD-x86", "gcc:-DL_ENDIAN \$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"BSD-x86-elf", "gcc:-DL_ENDIAN \$(RPM_OPT_FLAGS) -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-BSD-x86-elf", "gcc:-DL_ENDIAN \$(RPM_OPT_FLAGS) -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"BSD-sparcv8", "gcc:-DB_ENDIAN \$(RPM_OPT_FLAGS) -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"BSD-sparcv8", "gcc:-DB_ENDIAN \$(RPM_OPT_FLAGS) -mcpu=v8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"BSD-generic64","gcc:\$(RPM_OPT_FLAGS) -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/openssl-1.0.1n.tar.gz.asc b/openssl-1.0.1n.tar.gz.asc new file mode 100644 index 0000000..fedcd73 --- /dev/null +++ b/openssl-1.0.1n.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJVeZWaAAoJENnE0m0OYESRhl4H/0dnMZGeqGcRhCUIMJMqOvHG +qAtSpb5Tit7K5rozYX+jE3ZNnN+CJReYHy82pX7cepDxTh9Lw2tjrrul7XIDZ9DJ +8uOae1cYu5fOTzXoACFFz9+FGRllEN1RjsZYz1DyzV8Y+Akw6siQUcGTA3EbZT+c +OYSBMT2nNiF4t3F78HDfVeuTtvwHYuV+9Yz7VAz+XJmKtESbkqwQwIxdclJs5gLK +doe3+ntJqqwzzWRwsIBNCxyvKPNwsDVHQNAZKs8W496u4jThcl5eyvcDF82kt6Yy +Turtk9IUvpofGpDCmlaJL7yP3fSIneRGIpRVdF6MNIoX0atFuSDv6uQuEZ8dkbw= +=ku/F +-----END PGP SIGNATURE----- diff --git a/openssl-1.0.2a-malloc_typo.patch b/openssl-1.0.2a-malloc_typo.patch deleted file mode 100644 index d2f8970..0000000 --- a/openssl-1.0.2a-malloc_typo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- openssl-1.0.2a/crypto/bio/bss_dgram.c.orig 2015-03-21 09:18:10.961845296 +0000 -+++ openssl-1.0.2a/crypto/bio/bss_dgram.c 2015-03-21 09:18:24.481845528 +0000 -@@ -1352,7 +1352,7 @@ - (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t)); - authchunks = OPENSSL_malloc(optlen); - if (!authchunks) { -- BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR); -+ BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE); - return -1; - } - memset(authchunks, 0, sizeof(optlen)); -@@ -1424,7 +1424,7 @@ - char *tmp; - data->saved_message.bio = b; - if(!(tmp = OPENSSL_malloc(inl))) { -- BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR); -+ BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE); - return -1; - } - if (data->saved_message.data) diff --git a/openssl.spec b/openssl.spec index 7ea7b45..0908b13 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,6 +1,7 @@ -%define maj 1.0.0 -%define engines_name %mklibname openssl-engines %{maj} -%define libname %mklibname openssl %{maj} +%define major 1.0.0 +%define engines_name %mklibname openssl-engines %{major} +%define libcrypto %mklibname crypto %{major} +%define libssl %mklibname ssl %{major} %define devname %mklibname openssl -d %define staticname %mklibname openssl -s -d @@ -13,7 +14,7 @@ Summary: Secure Sockets Layer communications libs & utils Name: openssl -Version: 1.0.1m +Version: 1.0.1n Release: 1 License: BSD-like Group: System/Libraries @@ -23,9 +24,8 @@ Source1: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz.asc Source2: Makefile.certificate Source3: make-dummy-cert Source4: openssl-thread-test.c -Patch0: openssl-1.0.2a-malloc_typo.patch # Handle RPM_OPT_FLAGS in Configure -Patch2: openssl-1.0.1m-optflags.diff +Patch2: openssl-1.0.1n-optflags.diff Patch3: openssl-1.0.1c-fix-perlpath.pl # (oe) support Brazilian Government OTHERNAME X509v3 field (#14158) # http://www.iti.gov.br/resolucoes/RESOLU__O_13_DE_26_04_2002.PDF @@ -53,36 +53,98 @@ The openssl certificate management tool and the shared libraries that provide various encryption and decription algorithms and protocols, including DES, RC4, RSA and SSL. -%package -n %{engines_name} +%files +%doc FAQ INSTALL LICENSE NEWS PROBLEMS main-doc-info/README* +%doc README README.ASN1 README.ENGINE +%dir %{_sysconfdir}/pki +%dir %{_sysconfdir}/pki/CA +%dir %{_sysconfdir}/pki/CA/private +%dir %{_sysconfdir}/pki/tls +%dir %{_sysconfdir}/pki/tls/certs +%dir %{_sysconfdir}/pki/tls/misc +%dir %{_sysconfdir}/pki/tls/private +%dir %{_sysconfdir}/pki/tls/rootcerts +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf +%attr(0755,root,root) %{_sysconfdir}/pki/tls/certs/make-dummy-cert +%attr(0644,root,root) %{_sysconfdir}/pki/tls/certs/Makefile +%attr(0755,root,root) %{_sysconfdir}/pki/tls/misc/* +%attr(0755,root,root) %{_bindir}/* +%attr(0644,root,root) %{_mandir}/man[157]/* + +#---------------------------------------------------------------------------- + +%package -n %{engines_name} Summary: Engines for openssl Group: System/Libraries Provides: openssl-engines = %{EVRD} -%description -n %{engines_name} +%description -n %{engines_name} This package provides engines for openssl. -%package -n %{libname} +%files -n %{engines_name} +%attr(0755,root,root) %dir %{_libdir}/openssl-%{version}/engines +%attr(0755,root,root) %{_libdir}/openssl-%{version}/engines/*.so + +#---------------------------------------------------------------------------- + +%package -n %{libcrypto} Summary: Secure Sockets Layer communications libs Group: System/Libraries +Conflicts: libopenssl1.0.0 < 1.0.1n -%description -n %{libname} +%description -n %{libcrypto} The libraries files are needed for various cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. -%package -n %{devname} +%files -n %{libcrypto} +%doc FAQ INSTALL LICENSE NEWS PROBLEMS README* +%{_libdir}/libcrypto.so.%{major}* + +#---------------------------------------------------------------------------- + +%package -n %{libssl} +Summary: Secure Sockets Layer communications libs +Group: System/Libraries +Conflicts: libopenssl1.0.0 < 1.0.1n +Obsoletes: libopenssl1.0.0 < 1.0.1n + +%description -n %{libssl} +The libraries files are needed for various cryptographic algorithms +and protocols, including DES, RC4, RSA and SSL. + +%files -n %{libssl} +%doc FAQ INSTALL LICENSE NEWS PROBLEMS README* +%{_libdir}/libssl.so.%{major}* + +#---------------------------------------------------------------------------- + +%package -n %{devname} Summary: Secure Sockets Layer communications libs & headers & utils Group: Development/Other -Requires: %{libname} = %{EVRD} +Requires: %{libssl} = %{EVRD} +Requires: %{libcrypto} = %{EVRD} Provides: libopenssl-devel Provides: openssl-devel = %{EVRD} Provides: %{name}-devel = %{EVRD} -%description -n %{devname} +%description -n %{devname} The libraries and include files needed to compile apps with support for various cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. -%package -n %{staticname} +%files -n %{devname} +%doc CHANGES doc/* devel-doc-info/README* +%dir %{_includedir}/openssl +%{multiarch_includedir}/openssl/opensslconf.h +%{_includedir}/openssl/* +%{_libdir}/libcrypto.so +%{_libdir}/libssl.so +%{_mandir}/man3/* +%{_libdir}/pkgconfig/* + +#---------------------------------------------------------------------------- + +%package -n %{staticname} Summary: Secure Sockets Layer communications static libs Group: Development/Other Requires: %{devname} = %{EVRD} @@ -90,13 +152,17 @@ Provides: libopenssl-static-devel Provides: openssl-static-devel = %{EVRD} Provides: %{name}-static-devel = %{EVRD} -%description -n %{staticname} +%description -n %{staticname} The static libraries needed to compile apps with support for various cryptographic algorithms and protocols, including DES, RC4, RSA and SSL. +%files -n %{staticname} +%attr(0644,root,root) %{_libdir}/lib*.a + +#---------------------------------------------------------------------------- + %prep %setup -q -%patch0 -p1 %patch2 -p1 -b .optflags %patch3 -p1 -b .perl %patch6 -p1 -b .icpbrasil @@ -255,41 +321,3 @@ perl -pi -e "s|^CATOP=.*|CATOP=%{_sysconfdir}/pki/tls|g" %{buildroot}%{_sysconfd perl -pi -e "s|^\\\$CATOP\=\".*|\\\$CATOP\=\"%{_sysconfdir}/pki/tls\";|g" %{buildroot}%{_sysconfdir}/pki/tls/misc/CA.pl perl -pi -e "s|\./demoCA|%{_sysconfdir}/pki/tls|g" %{buildroot}%{_sysconfdir}/pki/tls/openssl.cnf -%files -%doc FAQ INSTALL LICENSE NEWS PROBLEMS main-doc-info/README* -%doc README README.ASN1 README.ENGINE -%dir %{_sysconfdir}/pki -%dir %{_sysconfdir}/pki/CA -%dir %{_sysconfdir}/pki/CA/private -%dir %{_sysconfdir}/pki/tls -%dir %{_sysconfdir}/pki/tls/certs -%dir %{_sysconfdir}/pki/tls/misc -%dir %{_sysconfdir}/pki/tls/private -%dir %{_sysconfdir}/pki/tls/rootcerts -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf -%attr(0755,root,root) %{_sysconfdir}/pki/tls/certs/make-dummy-cert -%attr(0644,root,root) %{_sysconfdir}/pki/tls/certs/Makefile -%attr(0755,root,root) %{_sysconfdir}/pki/tls/misc/* -%attr(0755,root,root) %{_bindir}/* -%attr(0644,root,root) %{_mandir}/man[157]/* - -%files -n %{libname} -%doc FAQ INSTALL LICENSE NEWS PROBLEMS README* -%attr(0755,root,root) %{_libdir}/lib*.so.* - -%files -n %{engines_name} -%attr(0755,root,root) %dir %{_libdir}/openssl-%{version}/engines -%attr(0755,root,root) %{_libdir}/openssl-%{version}/engines/*.so - -%files -n %{devname} -%doc CHANGES doc/* devel-doc-info/README* -%attr(0755,root,root) %dir %{_includedir}/openssl -%{multiarch_includedir}/openssl/opensslconf.h -%attr(0644,root,root) %{_includedir}/openssl/* -%attr(0755,root,root) %{_libdir}/lib*.so -%attr(0644,root,root) %{_mandir}/man3/* -%attr(0644,root,root) %{_libdir}/pkgconfig/* - -%files -n %{staticname} -%attr(0644,root,root) %{_libdir}/lib*.a -