From 6f668c197ac71f812e61eac43b4c60d1270afb38 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 22 Jul 2024 12:52:49 +0200 Subject: [PATCH] Remove usage of OpenSSL Engine After discussion with change owner, I've prepared the correct solution. There is a difference between Fedora and CentOS Stream 10 / RHEL 10: - in CentOS Stream 10 / RHEL 10, the change is self-contained by the 'openssl-devel' package itself, which now defines OPENSSL_NO_ENGINE in the headers so new application builds don't use engine at all - in Fedora, the headers containing the OPENSSL_NO_ENGINE definition are put into a separate sub-package 'openssl-devel-engine', instead of being put into the 'openssl-devel' --- mysql8.4.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mysql8.4.spec b/mysql8.4.spec index 1304e8a..8a7a7b2 100644 --- a/mysql8.4.spec +++ b/mysql8.4.spec @@ -177,6 +177,11 @@ BuildRequires: libquadmath-devel %endif BuildRequires: openssl BuildRequires: openssl-devel +%if 0%{?fedora} >= 41 +# Complement of mysql-openssl-engine.patch +BuildRequires: openssl-devel-engine +%endif + BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: rpcgen @@ -546,10 +551,6 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ fi %endif -# Complement of mysql-openssl-engine.patch -CFLAGS="$CFLAGS -DOPENSSL_NO_ENGINE"; export CFLAGS -CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_ENGINE"; export CPPFLAGS - # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX # so we can't use %%{_datadir} and so forth here. %cmake \