Resolves: Bug 1988759 - 389-ds-base: Rebuild does not switch to OpenSSL 3.0 Beta ABI Force to require nss version greater or equal as the version available at the buil d time

389-ds-base.spec

@@ -47,10 +47,14 @@ ExcludeArch: i686
 # Filter argparse-manpage from autogenerated package Requires
 %global __requires_exclude ^python.*argparse-manpage
 
+# Force to require nss version greater or equal as the version available at the build time
+# See bz1986327
+%define dirsrv_requires_ge()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          2.0.7
-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
@@ -97,8 +101,8 @@ Provides:  bundled(crate(lock_api)) = 0.4.3
 Provides:  bundled(crate(log)) = 0.4.14
 Provides:  bundled(crate(memoffset)) = 0.6.3
 Provides:  bundled(crate(once_cell)) = 1.7.2
-Provides:  bundled(crate(openssl)) = 0.10.33
+Provides:  bundled(crate(openssl)) = 0.10.35
-Provides:  bundled(crate(openssl-sys)) = 0.9.61
+Provides:  bundled(crate(openssl-sys)) = 0.9.65
 Provides:  bundled(crate(parking_lot)) = 0.11.1
 Provides:  bundled(crate(parking_lot_core)) = 0.8.3
 Provides:  bundled(crate(paste)) = 0.1.18
@@ -227,6 +231,7 @@ Requires:         python%{python3_pkgversion}-ldap
 # administration server package
 Requires:         nss-tools
 Requires:         nss >= 3.34
+%dirsrv_requires_ge nss
 
 # these are not found by the auto-dependency method
 # they are required to support the mandatory LDAP SASL mechs
@@ -257,14 +262,6 @@ Source2:          %{name}-devel.README
 Source3:          https://github.com/jemalloc/%{jemalloc_name}/releases/download/%{jemalloc_ver}/%{jemalloc_name}-%{jemalloc_ver}.tar.bz2
 %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
 the LDAP server and command line utilities for server administration.
@@ -371,10 +368,6 @@ A cockpit UI Plugin for configuring and administering the 389 Directory Server
 
 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
 # that file list, cargo won't have anything to complain about.
@@ -718,6 +711,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug  5 2021 Simon Pichugin <spichugi@redhat.com> - 2.0.7-2
+- Resolves: Bug 1988759 - 389-ds-base: Rebuild does not switch to OpenSSL 3.0 Beta ABI
+- Force to require nss version greater or equal as the version available at the build time
+
 * Fri Jul 16 2021 Mark Reynolds <mreynolds@redhat.com> - 2.0.7-1
 - Bump version to 2.0.7-1
 - Resolves: Bug 1982789 - 389-ds-base: CRYPT password hash with asterisk allows any bind attempt to succeed