From 098f88f0082b782fa8e714eda67921849a7e1afb Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 31 Mar 2021 15:25:23 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/openssl.git#0f5f931f9a64a3fe3221c75ed799914cfd90b0db --- .gitignore | 1 + openssl-1.1.1-version-override.patch | 6 +++--- openssl.spec | 5 ++++- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e3a11e6..6209f99 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ openssl-1.0.0a-usa.tar.bz2 /openssl-1.1.1h-hobbled.tar.xz /openssl-1.1.1i-hobbled.tar.xz /openssl-1.1.1j-hobbled.tar.xz +/openssl-1.1.1k-hobbled.tar.xz diff --git a/openssl-1.1.1-version-override.patch b/openssl-1.1.1-version-override.patch index 939bcb3..b89ebc6 100644 --- a/openssl-1.1.1-version-override.patch +++ b/openssl-1.1.1-version-override.patch @@ -4,9 +4,9 @@ diff -up openssl-1.1.1i/include/openssl/opensslv.h.version-override openssl-1.1. @@ -40,7 +40,7 @@ extern "C" { * major minor fix final patch/beta) */ - # define OPENSSL_VERSION_NUMBER 0x101010afL --# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1j 16 Feb 2021" -+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1j FIPS 16 Feb 2021" + # define OPENSSL_VERSION_NUMBER 0x101010bfL +-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k 25 Mar 2021" ++# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k FIPS 25 Mar 2021" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/openssl.spec b/openssl.spec index 2a6f725..03638aa 100644 --- a/openssl.spec +++ b/openssl.spec @@ -21,7 +21,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl -Version: 1.1.1j +Version: 1.1.1k Release: 1%{?dist} Epoch: 1 # We have to remove certain patented algorithms from the openssl source @@ -471,6 +471,9 @@ export LD_LIBRARY_PATH %ldconfig_scriptlets libs %changelog +* Fri Mar 26 2021 Sahana Prasad - 1:1.1.1k-1 +- Upgrade to version 1.1.1.k + * Tue Feb 23 2021 Sahana Prasad - 1:1.1.1j-1 - Upgrade to version 1.1.1.j diff --git a/sources b/sources index 07f21a5..cc9f962 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openssl-1.1.1j-hobbled.tar.xz) = ad7387f11043b46873f5cb484a83822a1e11aae3fd09cab699192034be7f6e7a8fcaa1960df8bf96871e6268b63cf7046ebb75c4df72de67bb4b3d2aa94f77e7 +SHA512 (openssl-1.1.1k-hobbled.tar.xz) = b5282e40af8f28f7a859dfddeb269f3a4b0f4fb535de330dfd3ad14a123b57fe66e3880c6c9aacf49865175b1f7f6c88cae31451a99d4ac2b2cb1c5135d4ada9