Merge branch 'c10s' into a10s

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: 12%{?dist}.alma.1
+Release: 13%{?dist}.alma.1
 Epoch: 1
 Source: openssl-%{version}.tar.gz
 Source2: Makefile.certificate
@@ -472,6 +472,8 @@ install -m644 %{SOURCE9} \
 	$RPM_BUILD_ROOT/%{_prefix}/include/openssl/configuration.h
 %endif
 ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/fips_local.cnf
+rm -f $RPM_BUILD_ROOT/%{_prefix}/include/openssl/engine*.h
+touch $RPM_BUILD_ROOT/%{_prefix}/include/openssl/engine.h
 
 %files
 %{!?_licensedir:%global license %%doc}
@@ -508,7 +510,6 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
 %files devel
 %doc CHANGES.md doc/dir-locals.example.el doc/openssl-c-indent.el
 %{_prefix}/include/openssl
-%exclude %{_prefix}/include/openssl/engine*.h
 %{_libdir}/*.so
 %{_mandir}/man3/*
 %exclude %{_mandir}/man3/ENGINE*
@@ -529,9 +530,13 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
 %ldconfig_scriptlets libs
 
 %changelog
-* Mon Sep 09 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:3.2.2-12.alma.1
+* Mon Oct 21 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:3.2.2-13.alma.1
 - Redefine sslarch for x86_64_v2 arch
 
+* Thu Oct 17 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-13
+- Ship dummy(empty) openssl/engine.h
+  Resolves: RHEL-58178
+
 * Wed Sep 04 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-12
 - Fix CVE-2024-6119: Possible denial of service in X.509 name checks
   Resolves: RHEL-55303