!309 1.1.1wa 版本编号修改
From: @hzero1996 Reviewed-by: @zcfsite Signed-off-by: @zcfsite
This commit is contained in:
commit
442189f09c
25
backport-Fix-OPENSSL_VERSION_NUMBER-number-problem.patch
Normal file
25
backport-Fix-OPENSSL_VERSION_NUMBER-number-problem.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 03f077d6deb749def0bc8d679bed6ffa79aea84f Mon Sep 17 00:00:00 2001
|
||||||
|
From: hzero1996 <wangcheng156@huawei.com>
|
||||||
|
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
|
||||||
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
Name: openssl
|
Name: openssl
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.1.1wa
|
Version: 1.1.1wa
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Cryptography and SSL/TLS Toolkit
|
Summary: Cryptography and SSL/TLS Toolkit
|
||||||
License: OpenSSL and SSLeay
|
License: OpenSSL and SSLeay
|
||||||
URL: https://gitee.com/openeuler/openssl
|
URL: https://gitee.com/openeuler/openssl
|
||||||
@ -12,6 +12,7 @@ Patch1: openssl-1.1.1-build.patch
|
|||||||
Patch2: openssl-1.1.1-fips.patch
|
Patch2: openssl-1.1.1-fips.patch
|
||||||
Patch3: Fix-FIPS-getenv-build-failure.patch
|
Patch3: Fix-FIPS-getenv-build-failure.patch
|
||||||
Patch4: skip-some-test-cases.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
|
BuildRequires: gcc perl make lksctp-tools-devel coreutils util-linux zlib-devel
|
||||||
Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
@ -218,6 +219,9 @@ make test || :
|
|||||||
%ldconfig_scriptlets libs
|
%ldconfig_scriptlets libs
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 22 2023 wangcheng <wangcheng156@huawei.com> - 1:1.1.1wa-2
|
||||||
|
- Fix OPENSSL_VERSION_NUMBER number problem
|
||||||
|
|
||||||
* Wed Nov 15 2023 wangcheng <wangcheng156@huawei.com> - 1:1.1.1wa-1
|
* Wed Nov 15 2023 wangcheng <wangcheng156@huawei.com> - 1:1.1.1wa-1
|
||||||
- upgrade to 1.1.1wa
|
- upgrade to 1.1.1wa
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user