[rpms/openssl] rebase_40beta: Define OPENSSL_NO_ENGINE if openssl-devel-engine is not installed

[rpms/openssl] rebase_40beta: Define OPENSSL_NO_ENGINE if openssl-devel-engine is not installed

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/openssl
            Branch : rebase_40beta
            Commit : 13b583a535e62d12521cfeb5088a68e5811eb6e6
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-09-02T20:56:33-04:00
            Stats  : +9/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/openssl/c/13b583a535e62d12521cfeb5088a68e5811eb6e6?branch=rebase_40beta

            Log:
            Define OPENSSL_NO_ENGINE if openssl-devel-engine is not installed

Some openssl consumers already have their ENGINE-dependent includes and
code conditional on the absence of OPENSSL_NO_ENGINE.  This should allow
such packages to build without openssl-devel-engine and without the need
for them to each define OPENSSL_NO_ENGINE themselves.

The previous header manipulation is defunct because those defines have
moved from opensslconf.h to configuration.h, and the current version
already handles OPENSSL_NO_SSL3.

---
diff --git a/openssl.spec b/openssl.spec
index b28a3c6..d77d3e6 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -29,7 +29,7 @@ print(string.sub(hash, 0, 16))
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 3.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
@@ -444,12 +444,11 @@ basearch=sparc
 basearch=sparc64
 %endif
 
-# Next step of gradual disablement of SSL3.
-# Make SSL3 disappear to newly built dependencies.
-sed -i '/^\#ifndef OPENSSL_NO_SSL_TRACE/i\
-#ifndef OPENSSL_NO_SSL3\
-# define OPENSSL_NO_SSL3\
-#endif' $RPM_BUILD_ROOT/%{_prefix}/include/openssl/opensslconf.h
+# Next step of gradual disablement of ENGINE.
+sed -i '/^\# ifndef OPENSSL_NO_STATIC_ENGINE/i\
+# if !__has_include(<openssl/engine.h>) && !defined(OPENSSL_NO_ENGINE)\
+#  define OPENSSL_NO_ENGINE\
+# endif' $RPM_BUILD_ROOT/%{_prefix}/include/openssl/configuration.h
 
 %ifarch %{multilib_arches}
 # Do an configuration.h switcheroo to avoid file conflicts on systems where you
@@ -524,6 +523,9 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
 %ldconfig_scriptlets libs
 
 %changelog
+* Tue Sep 03 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1:3.2.2-6
+- Define OPENSSL_NO_ENGINE if openssl-devel-engine is not installed
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild