Roll back to openssl 0.10.33 rust crate

Related: Bug 1953509 - 389-ds-base: Port to OpenSSL 3.0
This commit is contained in:
Simon Pichugin 2021-06-28 15:40:28 +02:00
parent 76cd9a9e94
commit a09fde99c7
3 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,22 @@
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 56097be..fd177d4 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -346,7 +346,7 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
[[package]]
name = "openssl"
-version = "0.10.35"
+version = "0.10.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
dependencies = [
@@ -360,7 +360,7 @@ dependencies = [
[[package]]
name = "openssl-sys"
-version = "0.9.65"
+version = "0.9.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
dependencies = [

View File

@ -47,7 +47,7 @@ ExcludeArch: i686
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 2.0.6
Release: %{?relprefix}1%{?prerel}%{?dist}
Release: %{?relprefix}2%{?prerel}%{?dist}
License: GPLv3+ and ASL 2.0 and MPLv2.0 and Boost
URL: https://www.port389.org
Conflicts: selinux-policy-base < 3.9.8
@ -255,10 +255,12 @@ Source3: https://github.com/jemalloc/%{jemalloc_name}/releases/download
%endif
# Initial support for OpenSSL 3.0.0-alpha16 - requires create openssl 0.10.33
# This temporary solution should be removed once OpenSSL 3.0.0 Beta is available
# https://github.com/sfackler/rust-openssl/pull/1264
%global rust_openssl_commit 770ba32702abd2b4cab80727958c27ac3043c3ec
%global rust_openssl rust-openssl-%{rust_openssl_commit}
Source4: https://github.com/sfackler/rust-openssl/archive/%{rust_openssl_commit}/%{rust_openssl}.tar.gz
Patch0: 389-ds-base-rust-openssl-300.patch
%description
389 Directory Server is an LDAPv3 compliant server. The base package includes
@ -368,6 +370,7 @@ cp %{SOURCE2} README.devel
rm -rf vendor/openssl{,-sys}/*
tar -xf %{SOURCE4} -C vendor/ --strip-components=1 %{rust_openssl}/openssl{,-sys}/
%patch0 -p1
# The configure macro will modify some autoconf-related files, which upsets
# cargo when it tries to verify checksums in those files. If we just truncate
@ -712,6 +715,9 @@ exit 0
%endif
%changelog
* Mon Jun 28 2021 Simon Pichugin <spichugi@redhat.com> - 2.0.6-2
- Roll back to openssl 0.10.33 rust crate as it's required for OpenSSL 3.0.0-alpha16
* Thu Jun 24 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.6-1
- Bump version to 2.0.6
- Resolves: Bug 1970559 - Crash in dynamic_plugins_test.py::test_acceptance

View File

@ -1,2 +1,3 @@
SHA512 (389-ds-base-2.0.6.tar.bz2) = 3a988207d1883e06c447d61906aa6a39eba229f77d7c6d6e0767fdc81b3c53256d829817d18b06e58460a0ea5ec1bf4e915a2b6aded3bdea23831ff767e31cf8
SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
SHA512 (rust-openssl-770ba32702abd2b4cab80727958c27ac3043c3ec.tar.gz) = 82888c18beafae8cd8122fe91d00fd32c60ab1ed47db4da691ca762b5102eee4cbfcd6f333fcb1769ba1b65b655f726050b1deccdfdf7ec7b21728c51cd2c750