From d7c58e4310a3cab3d3d8c82044c26b442196bdbf Mon Sep 17 00:00:00 2001 From: whoisxxx Date: Thu, 13 Aug 2020 20:05:14 +0800 Subject: [PATCH 1/3] Adapt for RISC-V --- openssl.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openssl.spec b/openssl.spec index c5cdbf7..6885d61 100644 --- a/openssl.spec +++ b/openssl.spec @@ -59,9 +59,17 @@ sslarch=%{_os}-%{_target_cpu} sslflags=enable-ec_nistp_64_gcc_128 %endif +%ifarch riscv64 +sslarch=linux-generic64 +%endif + + RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS" ./Configure \ --prefix=%{_prefix} \ +%ifarch riscv64 + --libdir=%{_lib} \ +%endif --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \ zlib enable-camellia enable-seed enable-rfc3779 enable-sctp \ enable-cms enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method \ -- Gitee From 7ec2775a1d785a789ff70792c8daeb6920bfb2f1 Mon Sep 17 00:00:00 2001 From: whoisxxx Date: Thu, 13 Aug 2020 20:07:00 +0800 Subject: [PATCH 2/3] update changelog --- openssl.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openssl.spec b/openssl.spec index 6885d61..6e5b67b 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1f -Release: 1 +Release: 2 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -63,7 +63,6 @@ sslflags=enable-ec_nistp_64_gcc_128 sslarch=linux-generic64 %endif - RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -DPURIFY $RPM_LD_FLAGS" ./Configure \ --prefix=%{_prefix} \ @@ -194,6 +193,10 @@ make test || : %{_pkgdocdir}/html/ %changelog +* Thu Aug 13 2020 whoisxxx - 1:1.1.1f-2 +- update openssl-1.1.1d to openssl-1.1.1f and fix CVE-2020-1967 + + * Tue May 12 2020 openEuler Buildteam - 1:1.1.1f-1 - update openssl-1.1.1d to openssl-1.1.1f and fix CVE-2020-1967 -- Gitee From 5e7f95b37acccb35d3a49e1947c64033b68876af Mon Sep 17 00:00:00 2001 From: whoisxxx Date: Fri, 14 Aug 2020 09:41:29 +0800 Subject: [PATCH 3/3] Update changelog --- openssl.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openssl.spec b/openssl.spec index 6e5b67b..ce5c667 100644 --- a/openssl.spec +++ b/openssl.spec @@ -194,8 +194,7 @@ make test || : %changelog * Thu Aug 13 2020 whoisxxx - 1:1.1.1f-2 -- update openssl-1.1.1d to openssl-1.1.1f and fix CVE-2020-1967 - +- Add support for RISC-V * Tue May 12 2020 openEuler Buildteam - 1:1.1.1f-1 - update openssl-1.1.1d to openssl-1.1.1f and fix CVE-2020-1967 -- Gitee