Merge remote-tracking branch 'up/f33' into f33-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2021-10-07 09:49:55 +03:00
commit 02b3b28c04
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
4 changed files with 25 additions and 7 deletions

1
.gitignore vendored
View File

@ -52,3 +52,4 @@ openssl-1.0.0a-usa.tar.bz2
/openssl-1.1.1i-hobbled.tar.xz
/openssl-1.1.1j-hobbled.tar.xz
/openssl-1.1.1k-hobbled.tar.xz
/openssl-1.1.1l-hobbled.tar.xz

View File

@ -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 0x101010bfL
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k 25 Mar 2021"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1k FIPS 25 Mar 2021"
# define OPENSSL_VERSION_NUMBER 0x101010cfL
-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l 24 Aug 2021"
+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1l FIPS 24 Aug 2021"
/*-
* The macros below are to be used for shared library (.so, .dll, ...)

View File

@ -21,8 +21,8 @@
Summary: Utilities from the general purpose cryptography library with TLS implementation
Name: openssl
Version: 1.1.1k
Release: 1.0.riscv64%{?dist}
Version: 1.1.1l
Release: 2.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.
@ -90,6 +90,9 @@ BuildRequires: perl(Time::HiRes)
BuildRequires: perl(FindBin), perl(lib), perl(File::Compare), perl(File::Copy)
Requires: coreutils
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Provides: openssl1.1 = %{epoch}:%{version}-%{release}
Provides: openssl1.1%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: openssl1.1 < 1.1.1l-2
%description
The OpenSSL toolkit provides support for secure communications between
@ -103,6 +106,8 @@ Requires: ca-certificates >= 2008-5
Requires: crypto-policies >= 20180730
Recommends: openssl-pkcs11%{?_isa}
Provides: openssl-fips = %{epoch}:%{version}-%{release}
Provides: openssl1.1-libs = %{epoch}:%{version}-%{release}
Provides: openssl1.1-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description libs
OpenSSL is a toolkit for supporting cryptography. The openssl-libs
@ -113,6 +118,9 @@ support cryptographic algorithms and protocols.
Summary: Files for development of applications which will use OpenSSL
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Provides: openssl1.1-devel = %{epoch}:%{version}-%{release}
Provides: openssl1.1-devel%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: openssl1.1-devel < 1.1.1l-2
%description devel
OpenSSL is a toolkit for supporting cryptography. The openssl-devel
@ -474,9 +482,18 @@ export LD_LIBRARY_PATH
%ldconfig_scriptlets libs
%changelog
* Thu May 06 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:1.1.1k-1.0.riscv64
* Thu Oct 07 2021 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:1.1.1l-2.0.riscv64
- Add --libdir=%{_lib} for riscv64 (uses linux-generic64)
* Wed Sep 15 2021 Miro Hrončok <mhroncok@redhat.com> - 1:1.1.1l-2
- Provide and obsolete openssl1.1 to allow using openssl1.1-devel on Fedora < 36
* Wed Aug 25 2021 Sahana Prasad <sahana@redhat.com> - 1:1.1.1l-1
- Upgrade to version 1.1.1.l
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.1k-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Mar 26 2021 Sahana Prasad <sahana@redhat.com> - 1:1.1.1k-1
- Upgrade to version 1.1.1.k

View File

@ -1 +1 @@
SHA512 (openssl-1.1.1k-hobbled.tar.xz) = b5282e40af8f28f7a859dfddeb269f3a4b0f4fb535de330dfd3ad14a123b57fe66e3880c6c9aacf49865175b1f7f6c88cae31451a99d4ac2b2cb1c5135d4ada9
SHA512 (openssl-1.1.1l-hobbled.tar.xz) = f0dfe3d3f4d1165173a0aeb50949792fef37069fc2b29de4845851fe0dbae8254f1d892b0ab8b23b75efc994742f3a57c30c78efa0702f6408d3a80442053d6f