Compare commits

...

5 Commits

Author SHA1 Message Date
David Abdurachmanov 4a76722bee
Add --libdir=%{_lib} for riscv64 (uses linux-generic64)
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-01-09 12:22:33 +02:00
David Abdurachmanov f159b4d218
Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-01-09 12:20:52 +02:00
Fedora Release Engineering 3d38d55ead Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 18:13:26 +00:00
Florian Weimer b63ce9b803 Backport upstream patch to fix C99 compatibility issue
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2023-02-06 14:50:16 +01:00
Fedora Release Engineering ad803e91b7 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 22:59:10 +00:00
2 changed files with 42 additions and 4 deletions

27
openssl1.1-c99.patch Normal file
View File

@ -0,0 +1,27 @@
commit 60f011f584d80447e86cae1d1bd3ae24bc13235b
Author: Gregor Jasny <gjasny@googlemail.com>
Date: Tue Jul 5 12:57:06 2022 +0200
Add missing header for memcmp
CLA: trivial
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18719)
(cherry picked from commit f9e578e720bb35228948564192adbe3bc503d5fb)
diff -ur openssl-1.1.1q.orig/test/v3ext.c openssl-1.1.1q/test/v3ext.c
--- openssl-1.1.1q.orig/test/v3ext.c 2022-07-05 11:08:33.000000000 +0200
+++ openssl-1.1.1q/test/v3ext.c 2023-02-06 14:23:39.180200398 +0100
@@ -8,6 +8,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/pem.h>

View File

@ -26,7 +26,7 @@
Summary: Compatibility version of the OpenSSL library
Name: openssl1.1
Version: 1.1.1q
Release: 2.0.riscv64%{?dist}
Release: 5.0.riscv64%{?dist}
Epoch: 1
# We have to remove certain patented algorithms from the openssl source
# tarball with the hobble-openssl script which is included below.
@ -74,6 +74,7 @@ Patch52: openssl-1.1.1-s390x-update.patch
Patch53: openssl-1.1.1-fips-crng-test.patch
Patch55: openssl-1.1.1-arm-update.patch
Patch56: openssl-1.1.1-s390x-ecc.patch
Patch57: openssl1.1-c99.patch
License: OpenSSL and ASL 2.0
URL: http://www.openssl.org/
@ -151,6 +152,7 @@ cp %{SOURCE13} test/
%patch53 -p1 -b .crng-test
%patch55 -p1 -b .arm-update
%patch56 -p1 -b .s390x-ecc
%patch57 -p1
%patch60 -p1 -b .krb5-kdf
%patch61 -p1 -b .edk2-build
%patch62 -p1 -b .fips-curves
@ -235,9 +237,9 @@ export HASHBANGPERL=/usr/bin/perl
# RPM_OPT_FLAGS, so we can skip specifiying them here.
./Configure \
--prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \
%ifarch riscv64
%ifarch riscv64
--libdir=%{_lib} \
%endif
%endif
--system-ciphers-file=%{_sysconfdir}/crypto-policies/back-ends/openssl.config \
zlib enable-camellia enable-seed enable-rfc3779 enable-sctp \
enable-cms enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method \
@ -378,9 +380,18 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%ldconfig_scriptlets
%changelog
* Fri Sep 09 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1:1.1.1q-2.0.riscv64
* Tue Jan 09 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:1.1.1q-5.0.riscv64
- Add --libdir=%{_lib} for riscv64 (uses linux-generic64)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1q-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 06 2023 Florian Weimer <fweimer@redhat.com> - 1:1.1.1q-4
- Backport upstream patch to fix C99 compatibility issue
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1q-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:1.1.1q-2
- Deprecate this package
Resolves: rhbz#2108694