commit: 4302cd8b22b5fee3a073c03a433030911a5871ea
Author: Jaco Kroon <jkroon <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 11 10:18:02 2025 +0000
Commit: Jaco Kroon <jkroon <AT> gentoo <DOT> org>
CommitDate: Tue Nov 11 12:26:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4302cd8b
dev-db/mariadb: Add AWS Key Mangement support (amd64).
This version bumps 11.4.8-r1 because -r1 is stable requested.
The rest of the future versions got ammended in-place.
package.use.masked for non-amd 64 arches, if you want it, please request
keywording of dev-cpp/aws-sdk-cpp (which will result in a cascade of
about 15 other packages to be keyworded).
Signed-off-by: Jaco Kroon <jkroon <AT> gentoo.org>
.../{mariadb-11.4.9.ebuild => mariadb-11.4.8-r2.ebuild} | 14 ++++----------
dev-db/mariadb/mariadb-11.4.9.ebuild | 5 +++--
dev-db/mariadb/mariadb-11.8.2.ebuild | 5 +++--
dev-db/mariadb/mariadb-11.8.3-r1.ebuild | 5 +++--
dev-db/mariadb/mariadb-11.8.4.ebuild | 5 +++--
dev-db/mariadb/mariadb-12.0.2-r1.ebuild | 5 +++--
dev-db/mariadb/metadata.xml | 1 +
profiles/default/linux/amd64/package.use.mask | 4 ++++
profiles/default/linux/package.use.mask | 5 +++++
9 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/dev-db/mariadb/mariadb-11.4.9.ebuild
b/dev-db/mariadb/mariadb-11.4.8-r2.ebuild
similarity index 98%
copy from dev-db/mariadb/mariadb-11.4.9.ebuild
copy to dev-db/mariadb/mariadb-11.4.8-r2.ebuild
index b76764344ccb..4f51a492bfad 100644
--- a/dev-db/mariadb/mariadb-11.4.9.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.8-r2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,6 +45,7 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
+ aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -354,7 +355,7 @@ src_configure() {
-DWITH_UNITTEST=OFF
-DWITHOUT_CLIENTLIBS=YES
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
- -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=$(usex test DYNAMIC OFF)
+ -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
-DCLIENT_PLUGIN_CLIENT_ED25519=$(usex test DYNAMIC OFF)
-DCLIENT_PLUGIN_DIALOG=$(usex test DYNAMIC OFF)
-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
@@ -401,7 +402,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
@@ -591,15 +592,8 @@ src_test() {
"roles.acl_statistics;0;Fails in network-sandbox"
"sysschema.v_privileges_by_table_by_level;MDEV-36030;Fails with
network sandbox"
- # Fails in network-sandbox which contains only "lo" interface
- "main.func_json;MDEV-38057;Fails in network-sandbox"
-
# Some tests are unable to retrieve HW address
"spider.*;MDEV-37098;Fails with network sandbox"
-
- # This issue will be fixed in next release
- # see also https://github.com/MariaDB/server/pull/4429
- "main.func_regexp_pcre;MDEV-38046;Fails with PCRE2 10.47"
)
use latin1 || disabled_tests+=(
diff --git a/dev-db/mariadb/mariadb-11.4.9.ebuild
b/dev-db/mariadb/mariadb-11.4.9.ebuild
index b76764344ccb..be142af9271e 100644
--- a/dev-db/mariadb/mariadb-11.4.9.ebuild
+++ b/dev-db/mariadb/mariadb-11.4.9.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,6 +45,7 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
+ aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -401,7 +402,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
diff --git a/dev-db/mariadb/mariadb-11.8.2.ebuild
b/dev-db/mariadb/mariadb-11.8.2.ebuild
index 1a49831314f1..898a0a7c5423 100644
--- a/dev-db/mariadb/mariadb-11.8.2.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,6 +45,7 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
+ aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -393,7 +394,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
diff --git a/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
b/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
index 06a91892f6ca..55af964cf45d 100644
--- a/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.3-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,6 +45,7 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
+ aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -391,7 +392,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
diff --git a/dev-db/mariadb/mariadb-11.8.4.ebuild
b/dev-db/mariadb/mariadb-11.8.4.ebuild
index 052841ca6fb2..47cc91c90d20 100644
--- a/dev-db/mariadb/mariadb-11.8.4.ebuild
+++ b/dev-db/mariadb/mariadb-11.8.4.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,6 +45,7 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
+ aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -391,7 +392,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
diff --git a/dev-db/mariadb/mariadb-12.0.2-r1.ebuild
b/dev-db/mariadb/mariadb-12.0.2-r1.ebuild
index 06a91892f6ca..55af964cf45d 100644
--- a/dev-db/mariadb/mariadb-12.0.2-r1.ebuild
+++ b/dev-db/mariadb/mariadb-12.0.2-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/mysql"
LICENSE="GPL-2 LGPL-2.1+"
SLOT="$(ver_cut 1-2)/${SUBSLOT:-0}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+IUSE="aws-km +backup bindist columnstore cracklib debug extraengine galera
innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
@@ -45,6 +45,7 @@ COMMON_DEPEND="
sys-libs/ncurses:0=
>=virtual/zlib-1.2.3:=
virtual/libcrypt:=
+ aws-km? ( dev-cpp/aws-sdk-cpp:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -391,7 +392,7 @@ src_configure() {
-DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-DPLUGIN_SPHINX=$(usex sphinx YES NO)
-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_AWS_KEY_MANAGEMENT=NO
+ -DPLUGIN_AWS_KEY_MANAGEMENT=$(usex aws-km DYNAMIC NO)
-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-DPLUGIN_SPIDER=$(usex extraengine YES NO)
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index dec6fe8d137f..c16772398982 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -6,6 +6,7 @@
<name>MySQL</name>
</maintainer>
<use>
+ <flag name="aws-km">Add support for using the AWS Key
Management plugin</flag>
<flag name="backup">Build mariadb-backup which supports SST and
hot backup of InnoDB, Aria and MyISAM including compression and
encryption</flag>
<flag name="columnstore">Build the ColumnStore storage
engine</flag>
<flag name="extraengine">Add support for alternative storage
engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
diff --git a/profiles/default/linux/amd64/package.use.mask
b/profiles/default/linux/amd64/package.use.mask
index e7d32e578aa9..9b6fa48c5ba1 100644
--- a/profiles/default/linux/amd64/package.use.mask
+++ b/profiles/default/linux/amd64/package.use.mask
@@ -12,3 +12,7 @@ dev-util/sccache -dist-server
# Mike Frysinger <[email protected]> (2014-10-21)
# This target supports ASAN/etc... #504200.
sys-devel/gcc -sanitize
+
+# Jaco Kroon <[email protected]> (202-11-11)
+# This target has the dependencies keyworded.
+dev-db/mariadb -aws-km
diff --git a/profiles/default/linux/package.use.mask
b/profiles/default/linux/package.use.mask
index 21678ba90ef4..f28901ed3d05 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -64,3 +64,8 @@ net-dns/pdnsd -urandom
# with FreeBSD and other operating systems that have no better
# interfaces, but people would probably abuse it with Linux as well.
media-sound/pulseaudio-daemon oss
+
+# Jaco Kroon <[email protected]> (2025-11-11)
+# The depended on packages will need to be keyworded for various arches
+# to which I don't have access.
+dev-db/mariadb aws-km
