From fee72d3d0899c77252c04ac0770945ebd8530dbc Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 6 May 2022 16:12:12 +0800 Subject: [PATCH] Modify the directory lib to lib64 --- openssl.spec | 55 +++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/openssl.spec b/openssl.spec index e7c00aa..5520871 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,9 +1,8 @@ %define soversion 1.1 -%global usr_lib /usr/lib Name: openssl Epoch: 1 Version: 1.1.1m -Release: 3 +Release: 4 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -11,7 +10,6 @@ Source0: https://www.openssl.org/source/%{name}-%{version}.tar.gz Source1: Makefile.certificate Patch1: openssl-1.1.1-build.patch Patch2: openssl-1.1.1-fips.patch -# https://github.com/openssl/openssl/pull/17712 Patch3: fix-add-loongarch64-target.patch BuildRequires: gcc perl make lksctp-tools-devel coreutils util-linux zlib-devel @@ -67,6 +65,9 @@ sslarch=%{_os}-%{_target_cpu} %ifarch x86_64 aarch64 sslflags=enable-ec_nistp_64_gcc_128 %endif +%ifarch loongarch64 +sslflags="--libdir=%{_libdir}" +%endif RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS" ./Configure \ @@ -84,10 +85,10 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS" %{?__debug_package:%{__debug_install_post}} \ %{__arch_install_post} \ %{__os_install_post} \ - crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{usr_lib}/libcrypto.so.%{version} >$RPM_BUILD_ROOT%{usr_lib}/.libcrypto.so.%{version}.hmac \ - ln -sf .libcrypto.so.%{version}.hmac $RPM_BUILD_ROOT%{usr_lib}/.libcrypto.so.%{soversion}.hmac \ - crypto/fips/fips_standalone_hmac $RPM_BUILD_ROOT%{usr_lib}/libssl.so.%{version} >$RPM_BUILD_ROOT%{usr_lib}/.libssl.so.%{version}.hmac \ - ln -sf .libssl.so.%{version}.hmac $RPM_BUILD_ROOT%{usr_lib}/.libssl.so.%{soversion}.hmac \ + 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} %install @@ -95,11 +96,11 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS" %make_install # rename so name with actual version -rename so.%{soversion} so.%{version} $RPM_BUILD_ROOT%{usr_lib}/*.so.%{soversion} +rename so.%{soversion} so.%{version} $RPM_BUILD_ROOT%{_libdir}/*.so.%{soversion} # create symbolic link -for lib in $RPM_BUILD_ROOT%{usr_lib}/*.so.%{version} ; do - ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{usr_lib}/`basename ${lib} .%{version}` - ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{usr_lib}/`basename ${lib} .%{version}`.%{soversion} +for lib in $RPM_BUILD_ROOT%{_libdir}/*.so.%{version} ; do + ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}` + ln -s -f `basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/`basename ${lib} .%{version}`.%{soversion} done mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs @@ -172,21 +173,21 @@ make test || : %dir %{_sysconfdir}/pki/tls/private %config(noreplace) %{_sysconfdir}/pki/tls/openssl.cnf %config(noreplace) %{_sysconfdir}/pki/tls/ct_log_list.cnf -%{usr_lib}/libcrypto.so.%{version} -%{usr_lib}/libcrypto.so.%{soversion} -%{usr_lib}/libssl.so.%{version} -%{usr_lib}/libssl.so.%{soversion} -%{usr_lib}/engines-%{soversion} -%attr(0644,root,root) %{usr_lib}/.libcrypto.so.*.hmac -%attr(0644,root,root) %{usr_lib}/.libssl.so.*.hmac +%{_libdir}/libcrypto.so.%{version} +%{_libdir}/libcrypto.so.%{soversion} +%{_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) %doc doc/dir-locals.example.el doc/openssl-c-indent.el %{_prefix}/include/openssl -%{usr_lib}/pkgconfig/*.pc -%{usr_lib}/*.so -%{usr_lib}/*.a +%{_libdir}/pkgconfig/*.pc +%{_libdir}/*.so +%{_libdir}/*.a %files help %defattr(-,root,root) @@ -209,14 +210,20 @@ make test || : %ldconfig_scriptlets libs %changelog -* Wed Apr 13 2022 wulei +* Thu May 05 2022 Wenlong Zhang - 1:1.1.1m-4 +- Modify the directory lib to lib64 + +* Wed Apr 13 2022 wulei - 1:1.1.1m-3 - Add loongarch64 target * Thu Feb 17 2022 fushanqing - 1:1.1.1m-2 - add subpackage openssl-perl -* Tue Dec 28 2021 Buildteam - 1:1.1.1m-1 -- update openssl-1.1.1l to openssl-1.1.1m + +* Thu Mar 24 2022 duyiwei - 1:1.1.1m-1 +- update openssl-1.1.1f to openssl-1.1.1m +- add subpackage openssl-perl +- fix the cve-2022-0778 * Wed Dec 8 2021 lujie42 - 1:1.1.1l-1 - update openssl-1.1.1f to openssl-1.1.1l -- Gitee