gentoo auto-resync : 15:12:2022 - 03:31:56

3 files changed, 50 insertions, 1 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 942d6e6d8ddb..c7367e0f5f58 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,4 @@
+AUX mariadb-10.6.11-gssapi.patch 1824 BLAKE2B 5d0fefad9ff2d35d06dc4df3bcdd08a737a6f5ab7492673102c031c0e88fdd3fd7eeef977fb4128be170b9c948850e6a69a6d11f972d234cf49f2ea742838478 SHA512 0acee9c539782f11480b8e274576bb3b06cc7b2a914fee2d8f85fb692700b014da1f47e08f5f36d5ed264c9b5f820a123791de5b010fdc25f194dc215e890162
 AUX mariadb-10.6.8-openssl3.patch 16434 BLAKE2B a7e1a1224cfafc4963104e688fd83053c0384234f3bb866d2c3ba8f2fea12f101d1d9a2da78bcb88a4214bd031ba4d63aa2c3666e070e96480e58de2e65c7011 SHA512 811e71b7143ff71b1aeb8dfe1c979cca22678e97a646b5e0283179a75351fff2322de16d2ef2ec88a1f9856c5a8f7977b194976d2297495aaf27234feff83f81
 AUX my.cnf-10.2 140 BLAKE2B 3a56b7e38c3dc00215cae4bdc3270e30e85299d3290c0c995a611e4b8b15e66f40d6ac40ab18369e7863742ab6eda94259be5a7f363a26020c6fce28a7582e94 SHA512 85c650670e364f5f71842d9ab07b59c5de6e26e774e7192102562e56f94ed5f8fbc487cef31c134209c22b72fde38f7f53b7279cead97a8af608436d1ecc8857
 AUX my.cnf.distro-client 643 BLAKE2B 5ffd286907ee28c92c85bbcc9a6266555733f1115f2d6b8009183dba6939b978ae8d1b8e0a53e672b8e1a1f621650399231723603fc5f96ef7218db84236e176 SHA512 801f6ab8be3110bb4dc38eaa4367715b8d342b69cadfe13dff987ef6c3aedb67d19449f8f2483e63df5d8b444ca30701b0d96f85e211de6b1e3db923b029acbc
@@ -21,5 +22,5 @@ EBUILD mariadb-10.4.27.ebuild 42075 BLAKE2B 4d6ba6cdac2b181f74ead953480814349f36
 EBUILD mariadb-10.5.17.ebuild 42033 BLAKE2B 4b3e529d207bc9750f609931e8f2029da0b55175461025adf08a067c857e2a9ba01940b88bd6f3fb5208f50936dc70513170daebf567abe28677981b063a0728 SHA512 a533a3c6cfd1ee389e65bbe64bfb80d9e65d7fc87bd676b77aac4e6137923c5fa2daa592bdfa1bf0e3c4a82e764f6cfe08100a518c339c707a2307faea9a9ee0
 EBUILD mariadb-10.5.18.ebuild 42034 BLAKE2B 62e474feaf051321f0856137cf020df8697598df87cbe383a63f291a51623b201ce08f643488b25a59cf5f93510532566d68f7a5f168b273a1e5a711384b0a1b SHA512 22b43c389ad4f5daab972bb1774a7f31bfd345a0e65a19a2d72b229b310f508ac2241e138175d3d0f563f1709161e9ed0e7ae804145fcd7d7cac172069035c41
 EBUILD mariadb-10.6.10.ebuild 42408 BLAKE2B d48615c7a9ee92eb9c5196ab95a6629b01d0eb33ffc7406f4ca6a05a366dc6372f70e52b58e48e520c2fcaf2e20f0294c68aac176e737b742cc0ad3047f83283 SHA512 7ffad01ed90afadbf2b08f6c862d526347599b0f1f2567701439d85a46eb15a582aa280669fd7fc88babf0508f55fd5dc5474e1b1e11ad97f2e5e6024b6560c7
-EBUILD mariadb-10.6.11.ebuild 42415 BLAKE2B 82400173a7b8f1429a9cd59dc6cf03b77b0c790966fe369885a6064efcf703cc585e3a7ddbe225a297d11b5967436f3a55169bdd163944b5b4f6baec339d8df1 SHA512 ce5df43fb755f0b762c8b166fef41ebcb48400e8c2ac3ff209b2fb81900aa8fb02587f7c5366d5ce07e54a60241c2e103a766c6864b967a3a8b3c9a11506270c
+EBUILD mariadb-10.6.11.ebuild 42464 BLAKE2B ec68cb00d44f4d67e3b4b5b4bf45c36e6eb707d9bb692687ebe350c79b00789d1e06c83a0b804b1d19d4f07a1e2bec83f58fdbd0a8a8f639151a5d1ead66d44d SHA512 4932c5f69d17c5f058c1d2c71f69587e547ec484c5848b906117e78b4578ab93241b15ba4563e83c51f9d6cc6739f2fd4793157f417b2224b9823054892b3ac8
 MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be
diff --git a/dev-db/mariadb/files/mariadb-10.6.11-gssapi.patch b/dev-db/mariadb/files/mariadb-10.6.11-gssapi.patch
new file mode 100644
index 000000000000..f1e2347420af
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-gssapi.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/885829
+https://github.com/mariadb-corporation/mariadb-connector-c/pull/210
+
+From 31f78bb28927b7897b282bb1b270e772a0741d72 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 25 Nov 2022 15:05:33 +0100
+Subject: [PATCH] Use find_package(GSSAPI) instead including the module
+
+When including it, CMAKE_DISABLE_FIND_PACKAGE doesn't have the desired
+effect. This can cause a CMake error when building mariadb:
+
+"CMake Error at libmariadb/plugins/auth/CMakeLists.txt:123 (SET_TARGET_PROPERTIES):
+  SET_TARGET_PROPERTIES Can not find target to add properties to:
+  auth_gssapi_client"
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+ INCLUDE(CheckFunctionExists)
++INCLUDE(FeatureSummary)
+ IF(COMMAND CMAKE_POLICY)
+   SET(NEW_POLICIES CMP0003 CMP0022 CMP0023 CMP0057 CMP0077 CMP0069 CMP0075)
+   FOREACH(TYPE OLD NEW)
+@@ -410,7 +411,8 @@ IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "OFF")
+ ENDIF()
+ IF(NOT WIN32)
+   IF(NOT AUTH_GSSAPI_PLUGIN_TYPE MATCHES "OFF")
+-    INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
++    FIND_PACKAGE(GSSAPI)
++    SET_PACKAGE_PROPERTIES(GSSAPI PROPERTIES TYPE OPTIONAL)
+     IF(GSSAPI_FOUND)
+       INCLUDE_DIRECTORIES(${GSSAPI_INCS})
+       IF(AUTH_GSSAPI_PLUGIN_TYPE MATCHES "STATIC")
+--- a/libmariadb/plugins/auth/CMakeLists.txt
++++ b/libmariadb/plugins/auth/CMakeLists.txt
+@@ -96,7 +96,8 @@ ENDIF()
+ 
+ #GSSAPI client authentication plugin
+ IF(NOT WIN32)
+-  INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
++  FIND_PACKAGE(GSSAPI)
++  SET_PACKAGE_PROPERTIES(GSSAPI PROPERTIES TYPE OPTIONAL)
+   IF(GSSAPI_FOUND)
+     SET(GSSAPI_SOURCES ${AUTH_DIR}/auth_gssapi_client.c ${AUTH_DIR}/gssapi_client.c ${AUTH_DIR}/gssapi_errmsg.c)
+     IF (CMAKE_VERSION VERSION_GREATER 3.18)
+
diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild b/dev-db/mariadb/mariadb-10.6.11.ebuild
index c814377e2d7d..d495a241e226 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -207,6 +207,7 @@ src_unpack() {
 
 src_prepare() {
 	eapply "${WORKDIR}"/mariadb-patches
+	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
 
 	eapply_user