diff --git a/backport-Fix-OPENSSL_VERSION_NUMBER-number-problem.patch b/backport-Fix-OPENSSL_VERSION_NUMBER-number-problem.patch new file mode 100644 index 0000000000000000000000000000000000000000..58a31debc1c4c4e906a6a7894c31472ef4abb6c3 --- /dev/null +++ b/backport-Fix-OPENSSL_VERSION_NUMBER-number-problem.patch @@ -0,0 +1,25 @@ +From 03f077d6deb749def0bc8d679bed6ffa79aea84f Mon Sep 17 00:00:00 2001 +From: hzero1996 +Date: Fri, 22 Dec 2023 14:18:50 +0800 +Subject: [PATCH] Fix OPENSSL_VERSION_NUMBER number problem + +--- + include/openssl/opensslv.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h +index a0cac30..9a5855f 100644 +--- a/include/openssl/opensslv.h ++++ b/include/openssl/opensslv.h +@@ -39,7 +39,7 @@ extern "C" { + * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for + * major minor fix final patch/beta) + */ +-# define OPENSSL_VERSION_NUMBER 0x10101810L ++# define OPENSSL_VERSION_NUMBER 0x1010180fL + # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1wa 16 Nov 2023" + + /*- +-- +2.33.0 + diff --git a/openssl.spec b/openssl.spec index 2d6590d6b213071ed661758a1679062eb571d5ce..2e48e806181bb227b86e6ccfc7acf6fb84ee0f1b 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 1.1.1wa -Release: 1 +Release: 2 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://gitee.com/openeuler/openssl @@ -12,6 +12,7 @@ Patch1: openssl-1.1.1-build.patch Patch2: openssl-1.1.1-fips.patch Patch3: Fix-FIPS-getenv-build-failure.patch Patch4: skip-some-test-cases.patch +Patch5: backport-Fix-OPENSSL_VERSION_NUMBER-number-problem.patch BuildRequires: gcc perl make lksctp-tools-devel coreutils util-linux zlib-devel Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -218,6 +219,9 @@ make test || : %ldconfig_scriptlets libs %changelog +* Fri Dec 22 2023 wangcheng - 1:1.1.1wa-2 +- Fix OPENSSL_VERSION_NUMBER number problem + * Wed Nov 15 2023 wangcheng - 1:1.1.1wa-1 - upgrade to 1.1.1wa