[Fix for Fedora Change] - remove usage of OpenSSL Engine
https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine https://fedoraproject.org/wiki/Changes/OpensslNoEngine
This commit is contained in:
parent
6f1be6b0e2
commit
a8fe19a4b8
15
mysql-openssl-engine.patch
Normal file
15
mysql-openssl-engine.patch
Normal file
@ -0,0 +1,15 @@
|
||||
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"
|
@ -146,6 +146,7 @@ Patch51: %{pkgnamepatch}-sharedir.patch
|
||||
Patch52: %{pkgnamepatch}-rpath.patch
|
||||
Patch53: %{pkgnamepatch}-mtr.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
|
||||
@ -486,6 +487,7 @@ 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 . _)
|
||||
@ -544,6 +546,10 @@ 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 \
|
||||
|
Loading…
Reference in New Issue
Block a user