From 174310c69ff8267015e6917a5a45d18f48272942 Mon Sep 17 00:00:00 2001 From: Jasen Chao Date: Thu, 16 May 2024 07:29:31 -0400 Subject: [PATCH] Add --libdir=%{_lib} for riscv64 Content-type: text/plain [kchamart] Cherry-pick from Fedora notes: - Fix conflicts under "./Configure" section and elsewhere - Fedora commit itself was based on this commit from David Abdurachmanov http://fedora.riscv.rocks:3000/rpms/openssl1.1/commit/4a76722b Resolves: RHEL-86865 (cherry picked from commit 48ec32a3c7d7ce0c2353a2b67d03a748066bca85) Signed-off-by: Kashyap Chamarthy --- openssl.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/openssl.spec b/openssl.spec index 1af9f9e823950b60103122477b6594850ded7ec3..cffa91079f1124a34b7791fce315ea8887bc4bae 100644 --- a/openssl.spec +++ b/openssl.spec @@ -29,7 +29,7 @@ print(string.sub(hash, 0, 16)) Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 3.2.2 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Source: openssl-%{version}.tar.gz Source2: Makefile.certificate @@ -306,7 +306,7 @@ sslarch="linux64-mips64 -mips64r2" sslflags=enable-ec_nistp_64_gcc_128 %endif %ifarch riscv64 -sslarch=linux-generic64 +sslarch=linux64-riscv64 %endif #temporarily disable ktls to unblock c10s builds ktlsopt=enable-ktls @@ -330,6 +330,9 @@ export HASHBANGPERL=/usr/bin/perl ./Configure \ --prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \ --system-ciphers-file=%{_sysconfdir}/crypto-policies/back-ends/opensslcnf.config \ +%ifarch riscv64 + --libdir=%{_lib} \ +%endif zlib enable-camellia enable-seed enable-rfc3779 enable-sctp \ enable-cms enable-md2 enable-rc5 ${ktlsopt} enable-fips -D_GNU_SOURCE\ no-mdc2 no-ec2m no-sm2 no-sm4 no-atexit enable-buildtest-c++\ @@ -543,6 +546,9 @@ touch $RPM_BUILD_ROOT/%{_prefix}/include/openssl/engine.h %ldconfig_scriptlets libs %changelog +* Tue Mar 18 2025 David Abdurachmanov - 1:3.2.2-17 +- Add --libdir=%{_lib} for riscv64 (uses linux-generic64) + * Wed Jan 29 2025 Dmitry Belyavskiy - 1:3.2.2-16 - Fix timing side-channel in ECDSA signature computation (CVE-2024-13176) Resolves: RHEL-70879 -- 2.49.0