diff --git a/fix-add-loongarch64-target.patch b/fix-add-loongarch64-target.patch new file mode 100644 index 0000000000000000000000000000000000000000..527e7daa52f0080ddb3b28f909178f5e677d7d44 --- /dev/null +++ b/fix-add-loongarch64-target.patch @@ -0,0 +1,30 @@ +From 5fd4cc31c0eba0813a005d3559afc1b42df8ee32 Mon Sep 17 00:00:00 2001 +From: Shi Pujin +Date: Wed, 16 Feb 2022 10:53:56 +0800 +Subject: [PATCH] Add loongarch64 target + +--- + Configurations/10-main.conf | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index 61c6689..7102c95 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -761,6 +761,13 @@ my %targets = ( + perlasm_scheme => "linux64", + }, + ++ # loongarch64 below refers to contemporary LOONGARCH Architecture ++ # specifications, ++ "linux-loongarch64" => { ++ inherit_from => [ "linux-generic64"], ++ perlasm_scheme => "linux64", ++ }, ++ + #### IA-32 targets... + #### These two targets are a bit aged and are to be used on older Linux + #### machines where gcc doesn't understand -m32 and -m64 +-- +2.27.0 + diff --git a/openssl.spec b/openssl.spec index 8bee560d9fba7c3d3b8ca1fe071264dc1c65491c..e7c00aacd3839e72a6adee388704c3ef58736cbf 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,8 +1,9 @@ %define soversion 1.1 +%global usr_lib /usr/lib Name: openssl Epoch: 1 Version: 1.1.1m -Release: 2 +Release: 3 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -10,6 +11,8 @@ 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 Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -81,10 +84,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%{_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 \ + 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 \ %{nil} %install @@ -92,11 +95,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%{_libdir}/*.so.%{soversion} +rename so.%{soversion} so.%{version} $RPM_BUILD_ROOT%{usr_lib}/*.so.%{soversion} # create symbolic link -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} +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} done mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs @@ -169,21 +172,21 @@ make test || : %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} -%{_libdir}/libssl.so.%{soversion} -%{_libdir}/engines-%{soversion} -%attr(0644,root,root) %{_libdir}/.libcrypto.so.*.hmac -%attr(0644,root,root) %{_libdir}/.libssl.so.*.hmac +%{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 %files devel %defattr(-,root,root) %doc doc/dir-locals.example.el doc/openssl-c-indent.el %{_prefix}/include/openssl -%{_libdir}/pkgconfig/*.pc -%{_libdir}/*.so -%{_libdir}/*.a +%{usr_lib}/pkgconfig/*.pc +%{usr_lib}/*.so +%{usr_lib}/*.a %files help %defattr(-,root,root) @@ -206,6 +209,9 @@ make test || : %ldconfig_scriptlets libs %changelog +* Wed Apr 13 2022 wulei +- Add loongarch64 target + * Thu Feb 17 2022 fushanqing - 1:1.1.1m-2 - add subpackage openssl-perl