From d425a3ed5f9fb8f618fbe3a93b0d81e208b475e4 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 10 Jun 2024 20:45:54 +0200 Subject: [PATCH] Added support for various authentications algorithms The AWS plugin returns: -- Can't build aws_key_management - AWS SDK not available (AWS SDK has Apache 2.0 License which is not compatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need it) I'm not sure what is meant by that, both are free licenses. But even with 'BuildRequires: aws-devel' the build wasn't possible --- mariadb10.11.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mariadb10.11.spec b/mariadb10.11.spec index 1ea37a9..4ecbfce 100644 --- a/mariadb10.11.spec +++ b/mariadb10.11.spec @@ -63,11 +63,16 @@ # For deep debugging we need to build binaries with extra debug info %bcond_with debug +# Authentication plugins %bcond_without gssapi -# PAM authentication plugin %if !0%{?flatpak} %bcond_without pam %endif +%if 0%{?fedora} +%bcond_without hashicorp +%else +%bcond_with hashicorp +%endif # The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing # hierarchies and more complex graph structures to be handled in a relational fashion @@ -935,10 +940,10 @@ fi -DPLUGIN_COLUMNSTORE=NO \ -DPLUGIN_CLIENT_ED25519=OFF \ -DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \ - -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ + -DPLUGIN_AWS_KEY_MANAGEMENT=OFF \ -DCONNECT_WITH_MONGO=OFF \ -DCONNECT_WITH_JDBC=OFF \ - -DPLUGIN_HASHICORP_KEY_MANAGEMENT=NO \ + -DPLUGIN_HASHICORP_KEY_MANAGEMENT=%{?with_hashicorp:DYNAMIC}%{!?with_hashicorp:NO} \ %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON} # The -DSECURITY_HARDENED is used to force a set of compilation flags for hardening @@ -1517,7 +1522,7 @@ fi %{?with_lzo:%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzo.cnf} %{?with_snappy:%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_snappy.cnf} -#%%config(noreplace) %%{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf +%{?with_hashicorp:%config(noreplace) %{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf} %{_sbindir}/mysqld %{_sbindir}/mariadbd