diff --git a/openssl.spec b/openssl.spec index 5aa8268f0738b7fe7cf42cb74951fde48d167f25..db373b0fc0533ddb76ef510ba6e0058bd8de4659 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1d -Release: 6 +Release: 7 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -114,11 +114,29 @@ popd rm -f $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/*.dist %check +LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +export LD_LIBRARY_PATH +crypto/fips/fips_standalone_hmac libcrypto.so.%{soversion} >.libcrypto.so.%{soversion}.hmac +ln -s .libcrypto.so.%{soversion}.hmac .libcrypto.so.hmac +crypto/fips/fips_standalone_hmac libssl.so.%{soversion} >.libssl.so.%{soversion}.hmac +ln -s .libssl.so.%{soversion}.hmac .libssl.so.hmac +OPENSSL_ENABLE_MD5_VERIFY= +export OPENSSL_ENABLE_MD5_VERIFY +OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file +export OPENSSL_SYSTEM_CIPHERS_OVERRIDE make test || : -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%define __spec_install_post \ +%{?__debug_package:%{__debug_install_post}} \ +%{__arch_install_post} \ +%{__os_install_post} \ +crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libcrypto +.so.%{version}.hmac \ +ln -sf .libcrypto.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libcrypto.so.%{soversion}.hmac \ +crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{version} >$RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{ +version}.hmac \ +ln -sf .libssl.so.%{version}.hmac $RPM_BUILD_ROOT%{_libdir}/.libssl.so.%{soversion}.hmac \ +%{nil} %files %defattr(-,root,root) @@ -146,6 +164,8 @@ make test || : %{_libdir}/libssl.so.%{version} %{_libdir}/libssl.so.%{soversion} %{_libdir}/engines-%{soversion} +%attr(0644,root,root) %{_libdir}/.libcrypto.so.*.hmac +%attr(0644,root,root) %{_libdir}/.libssl.so.*.hmac %files devel %defattr(-,root,root) @@ -164,6 +184,9 @@ make test || : %{_pkgdocdir}/html/ %changelog +* Tue Mar 3 2020 openEuler Buildteam - 1:1.1.1d-7 +- Fix problem caused by missing hmac files + * Mon Feb 17 2020 openEuler Buildteam - 1:1.1.1d-6 - add openssl-libs containing dynamic library for openssl