diff --git a/Fix-build-error-for-ppc64le.patch b/Fix-build-error-for-ppc64le.patch new file mode 100644 index 0000000000000000000000000000000000000000..a6b1b12fc6603dd64768b4f962892ef877e87ed6 --- /dev/null +++ b/Fix-build-error-for-ppc64le.patch @@ -0,0 +1,31 @@ +From 4d2ed81fcc1f21aa651fb5cc4555ea21cfd3d232 Mon Sep 17 00:00:00 2001 +From: peng_zou +Date: Tue, 25 Jun 2024 10:33:28 +0800 +Subject: [PATCH] Fix build error for ppc64le + +--- + Configurations/10-main.conf | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index 915e7dd..27433ce 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -734,6 +734,14 @@ my %targets = ( + asm_arch => 'ppc64', + perlasm_scheme => "linux64le", + }, ++ "linux64-ppc64le" => { ++ inherit_from => [ "linux-generic64" ], ++ cflags => add("-m64"), ++ cxxflags => add("-m64"), ++ lib_cppflags => add("-DL_ENDIAN"), ++ asm_arch => 'ppc64', ++ perlasm_scheme => "linux64le", ++ }, + + "linux-armv4" => { + ################################################################ +-- +2.43.0 + diff --git a/openssl.spec b/openssl.spec index 36b67ebbd6036cb6a27a784cd6c537d7d94d345f..f3d1a2701c1b7424b95ffa963649443b55199ccb 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,11 +2,11 @@ Name: openssl Epoch: 1 Version: 3.0.12 -Release: 8 -Summary: Cryptography and SSL/TLS Toolkit -License: OpenSSL and SSLeay -URL: https://www.openssl.org/ -Source0: https://www.openssl.org/source/%{name}-%{version}.tar.gz +Release: 10 +Summary: Utilities from the general purpose cryptography library with TLS implementation +License: ASL 2.0 +URL: https://openssl-library.org/ +Source0: https://github.com/openssl/openssl/releases/download/openssl-%{version}/%{name}-%{version}.tar.gz Source1: Makefile.certificate Patch1: openssl-3.0-build.patch @@ -46,15 +46,18 @@ Patch34: Backport-CVE-2024-4741-Extend-the-SSL_free_buffers-testing.patch Patch35: Backport-CVE-2024-4741-Move-the-ability-to-load-the-dasync-engine-into-sslt.patch Patch36: Backport-CVE-2024-4741-Further-extend-the-SSL_free_buffers-testing.patch Patch37: Backport-bn-Properly-error-out-if-aliasing-return-value-with-.patch -Patch38: Backport-CVE-2024-5535-Fix-SSL_select_next_proto.patch -Patch39: Backport-CVE-2024-5535-Add-a-test-for-ALPN-and-NPN.patch +Patch38: Fix-build-error-for-ppc64le.patch +Patch39: Backport-CVE-2024-5535-Fix-SSL_select_next_proto.patch +Patch40: Backport-CVE-2024-5535-Add-a-test-for-ALPN-and-NPN.patch BuildRequires: gcc gcc-c++ perl make lksctp-tools-devel coreutils util-linux zlib-devel Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} %description -OpenSSL is a robust, commercial-grade, and full-featured toolkit for the -Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. +The OpenSSL toolkit provides support for secure communications between +machines. OpenSSL includes a certificate management tool and shared +libraries which provide various cryptographic algorithms and +protocols. %package libs Summary: A general purpose cryptography library with TLS implementation @@ -81,7 +84,6 @@ from other formats to the formats used by the OpenSSL toolkit. %package devel Summary: Development files for openssl Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: pkgconfig %description devel %{summary}. @@ -103,7 +105,7 @@ sslarch=%{_os}-%{_target_cpu} %ifarch i686 sslarch=linux-elf %endif -%ifarch riscv64 loongarch64 +%ifarch riscv64 loongarch64 ppc64le sslarch=%{_os}64-%{_target_cpu} sslflags="--libdir=%{_libdir}" %endif @@ -112,7 +114,8 @@ sslflags="--libdir=%{_libdir}" sslflags=enable-ec_nistp_64_gcc_128 %endif -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -Wa,--generate-missing-build-notes=yes -DPURIFY $RPM_LD_FLAGS" +export CFLAGS="%{build_cflags} -Wa,--noexecstack -Wa,--generate-missing-build-notes=yes -DPURIFY" +%set_build_flags ./Configure \ --prefix=%{_prefix} --openssldir=%{_sysconfdir}/pki/tls ${sslflags} \ zlib enable-camellia enable-seed enable-rfc3779 \ @@ -125,7 +128,6 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack -Wa,--generate-missing-build-not %make_build all %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT # Install OpenSSL. install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_mandir},%{_libdir}/openssl,%{_pkgdocdir}} @@ -190,10 +192,6 @@ OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file export OPENSSL_SYSTEM_CIPHERS_OVERRIDE make test || : -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - %files %license LICENSE.txt %doc NEWS.md README.md @@ -226,7 +224,6 @@ make test || : %files help -%defattr(-,root,root) %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man7/* @@ -245,12 +242,17 @@ make test || : %dir %{_sysconfdir}/pki/CA/crl %dir %{_sysconfdir}/pki/CA/newcerts -%ldconfig_scriptlets libs - %changelog -* Fri Jun 28 2024 yinyongkang - 1:3.0.12-8 +* Sat Aug 10 2024 Funda Wang - 1:3.0.12-10 +- cleanup spec +- adjust license + +* Fri Jun 28 2024 yinyongkang - 1:3.0.12-9 - fix CVE-2024-5535 +* Tue Jun 25 2024 peng.zou - 1:3.0.12-8 +- Fix build error for ppc64le + * Mon Jun 24 2024 steven - 1:3.0.12-7 - backport patch