diff --git a/mysql-openssl-engine.patch b/mysql-openssl-engine.patch deleted file mode 100644 index 28ced66..0000000 --- a/mysql-openssl-engine.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine -https://fedoraproject.org/wiki/Changes/OpensslNoEngine - ---- mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc 2024-04-10 08:26:28.000000000 +0200 -+++ mysql-8.4.0/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/network/xcom_network_provider_ssl_native_lib.cc_patched 2024-07-18 18:33:26.237771364 +0200 -@@ -50,7 +50,9 @@ - #include "my_compiler.h" - #endif - -+#if !defined(OPENSSL_NO_ENGINE) - #include "openssl/engine.h" -+#endif - - #include "xcom/retry.h" - #include "xcom/task_debug.h" diff --git a/mysql8.4.spec b/mysql8.4.spec index 1949c22..62e81f9 100644 --- a/mysql8.4.spec +++ b/mysql8.4.spec @@ -145,7 +145,6 @@ Patch5: %{pkgnamepatch}-paths.patch Patch51: %{pkgnamepatch}-sharedir.patch Patch52: %{pkgnamepatch}-rpath.patch Patch56: %{pkgnamepatch}-flush-logrotate.patch -Patch57: %{pkgnamepatch}-openssl-engine.patch # Patches taken from boost 1.59 Patch112: boost-1.57.0-mpl-print.patch @@ -176,10 +175,6 @@ 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 @@ -509,7 +504,6 @@ regression test suite distributed with the MySQL sources. %patch -P51 -p1 %patch -P52 -p1 %patch -P56 -p1 -%patch -P57 -p1 # Patch Boost pushd extra/boost/boost_$(echo %{boost_bundled_version}| tr . _)