diff --git a/openssl.spec b/openssl.spec index c39406511225c64472acbed5157da71b3dd6ec44..5aa8268f0738b7fe7cf42cb74951fde48d167f25 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1d -Release: 5 +Release: 6 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -10,24 +10,36 @@ Source0: https://www.openssl.org/source/old/1.1.1/%{name}-%{version}.tar.gz Source1: Makefile.certificate Patch1: openssl-1.1.1-build.patch Patch2: openssl-1.1.1-fips.patch -Patch6000: CVE-2019-1551.patch +Patch3: CVE-2019-1551.patch BuildRequires: gcc make lksctp-tools-devel coreutils util-linux zlib-devel -Requires: coreutils perl ca-certificates crypto-policies -Recommends: openssl-pkcs11%{?_isa} -Obsoletes: openssl-libs < %{epoch}:%{version}-%{release} +Requires: coreutils perl %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: openssl-perl < %{epoch}:%{version}-%{release} -Provides: openssl-libs = %{epoch}:%{version}-%{release} openssl-perl = %{epoch}:%{version}-%{release} -Provides: openssl-libs%{?_isa} = %{epoch}:%{version}-%{release} openssl-perl%{_isa} = %{epoch}:%{version}-%{release} +Provides: openssl-perl%{_isa} = %{epoch}:%{version}-%{release} %description OpenSSL is a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. +%package libs +Summary: A general purpose cryptography library with TLS implementation +Group: System Environment/Libraries +Requires: ca-certificates >= 2008-5 +Requires: crypto-policies >= 20180730 +Recommends: openssl-pkcs11%{?_isa} +Obsoletes: openssl < 1:1.0.1-0.3.beta3 +Obsoletes: openssl-fips < 1:1.0.1e-28 +Provides: openssl-fips = %{epoch}:%{version}-%{release} + +%description libs +The openssl-libs package contains the libraries that are used +by various applications which support cryptographic algorithms +and protocols. + %package devel Summary: Development files for openssl -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: krb5-devel zlib-devel pkgconfig Obsoletes: openssl-static < %{epoch}:%{version}-%{release} Provides: openssl-static = %{epoch}:%{version}-%{release} openssl-static%{?_isa} = %{epoch}:%{version}-%{release} @@ -104,27 +116,31 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/*.dist %check make test || : -%post -p /sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %defattr(-,root,root) %license LICENSE %doc AUTHORS CHANGES FAQ NEWS README %{_pkgdocdir}/Makefile.certificate -%dir %{_sysconfdir}/pki/tls -%dir %{_sysconfdir}/pki/tls/certs -%dir %{_sysconfdir}/pki/tls/misc -%dir %{_sysconfdir}/pki/tls/private -%config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf -%config(noreplace) %{_sysconfdir}/pki/tls/ct_log_list.cnf %dir %{_sysconfdir}/pki/CA %dir %{_sysconfdir}/pki/CA/private %dir %{_sysconfdir}/pki/CA/certs %dir %{_sysconfdir}/pki/CA/crl %dir %{_sysconfdir}/pki/CA/newcerts %{_bindir}/* + +%files libs +%defattr(-,root,root) +%license LICENSE +%dir %{_sysconfdir}/pki/tls +%dir %{_sysconfdir}/pki/tls/certs +%dir %{_sysconfdir}/pki/tls/misc +%dir %{_sysconfdir}/pki/tls/private +%config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf +%config(noreplace) %{_sysconfdir}/pki/tls/ct_log_list.cnf %{_libdir}/libcrypto.so.%{version} %{_libdir}/libcrypto.so.%{soversion} %{_libdir}/libssl.so.%{version} @@ -147,8 +163,10 @@ make test || : %{_mandir}/man7/* %{_pkgdocdir}/html/ - %changelog +* Mon Feb 17 2020 openEuler Buildteam - 1:1.1.1d-6 +- add openssl-libs containing dynamic library for openssl + * Sun Jan 19 2020 openEuler Buildteam - 1:1.1.1d-5 - add obsoletes