gentoo auto-resync : 28:03:2023 - 09:49:10

3 files changed, 26 insertions, 1 deletions

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5358df559233..646b22da3397 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,3 +1,4 @@
+AUX mariadb-10.5.17-gcc-13.patch 739 BLAKE2B 9cf3443c3ee69ac057b99928e66e3e1e465bedd450291d346202f786a640e1fd9d8190cad5d0d67a3c4dfaf392ac5f2c7b9ea843ee5d756817a57eb0d3a2b3a5 SHA512 161f8760511a6b480ad9e6d58acc14f4349a70a43443881e066147788367a83265d038150be209d30263043f65ba15dc16dc0560c303e59d3449d0b09378f7fc
 AUX mariadb-10.6.11-gcc-13.patch 2093 BLAKE2B a61c373848b63123af5760e07c03f919c0dabe2cf2225ef5a1e6de38fc814b597ac8db35dd9cfeaa0425cd2d3fb43b79ba11839e852cb074fe12612868afec1e SHA512 257fdaa306e2fc52174dcf36472383482116e2957f834f9228ad250837e86e8b57fd892153cf0c94b1fb0fd42d6ef6da69402089cf9795835d8a82fffa9b5496
 AUX mariadb-10.6.11-gssapi.patch 1824 BLAKE2B 5d0fefad9ff2d35d06dc4df3bcdd08a737a6f5ab7492673102c031c0e88fdd3fd7eeef977fb4128be170b9c948850e6a69a6d11f972d234cf49f2ea742838478 SHA512 0acee9c539782f11480b8e274576bb3b06cc7b2a914fee2d8f85fb692700b014da1f47e08f5f36d5ed264c9b5f820a123791de5b010fdc25f194dc215e890162
 AUX mariadb-10.6.11-include.patch 2044 BLAKE2B 050729672c228818658f45b02ef5a70a8153eb43b7729569edcd7b0c9420a5b16a57359f153862232c634a817a21d0d6a20028104ef5cfdc53f3de25e7e63425 SHA512 cb8150274538fd2e3c26f9fde8fdbf0e8c31c2c26efe9e99ca97d984ae17fe967aabf315c7aee4d2659c3c477eaac604afc948f44de7475ee248cd502dac0fa5
@@ -22,7 +23,7 @@ EBUILD mariadb-10.11.2.ebuild 42478 BLAKE2B 9f841e3b2cd8e70fbb95ff8752e93c77f83d
 EBUILD mariadb-10.4.27-r1.ebuild 42114 BLAKE2B e66ce90c7829a25e7b12bfce1428567866898cf214377a169aa723649338299eb098b4cb6df439b27c5350fd312a1147cd676f25122bb45a5f3d934cf084b86d SHA512 bd30a7ecd49884d3cc79513137d337301f455613a6e7d34372a54e0f77bd0ba3562e021d83bedf95f277a2945e6c738687789a894a576f802b56bb98fadcd22d
 EBUILD mariadb-10.4.28-r1.ebuild 42266 BLAKE2B 4346f66a0b0c51975fa8853b82ff9429ca4146f303802a9770ceb3641d2e8adf15a4d4ed5d3e7cc401453903d75a75c6d32e52d7d32bf40d76666aa96e494b43 SHA512 d40890947e818b8e782b3686fa1ee4adc2167e255ca328f5e95e88fe10dc5055030556eca40eadf469ff79ae256e109b4c4476f05d522c98e07d6a2130b1ffef
 EBUILD mariadb-10.5.18-r1.ebuild 42073 BLAKE2B 92380cfaeadfb278d307a9bd05ea405ab93bf500827cfaad531fcef803aa77f0b07ff69add72e51985f18c30df302279a339eb166580ac4c9e19a39251d69e0c SHA512 3c0d0c8d7befd3d1a8511dca82e285b8e9ba6dcb7acea5bc6bbc8c48092545a9d9da05040ae5d78aab250a2d5159272fda28b81a29d3b298894cd5762739990a
-EBUILD mariadb-10.5.19-r1.ebuild 42225 BLAKE2B 449521f39b339bcc9654fc04edf2a49a8500b12a54f57f8d92496fb316f768e7b57141bfb557e6c496037967337da1d60931e93e1ff943adcd152c1956b11335 SHA512 95adeb7f1d2a7a2c8ac3ce02c684a5264a39526662e43f60027145535aea2399ed9437e186091bb8703e87f76790eb12415af7ba187be555a8b51da802108c56
+EBUILD mariadb-10.5.19-r1.ebuild 42274 BLAKE2B c87e4084a4be85499ce55ba688dc261b9abcde6903f0234663a1afa3b1151fef0b9a15b2b8f32352c573f8fe329c7dbc1f496260a26b4624f4631044f12c5984 SHA512 623031ec6d047e557f087180d0cc4e27b421e0f0d0f5a807b80c977281c1f2cf24fead92a9a8a29a5da7b2ea6e505bf8b383b95eb140d1c15220152b5371aa99
 EBUILD mariadb-10.6.11-r3.ebuild 42585 BLAKE2B b9f13c8e5ee0fa2288d2e042864d0635c20f00d810ce411fa7b27f21a3b5c72ef3b20d1099c58bff4e3fd9cdd411be6d1a23e151ff7e6f0817e8b443e66ee20b SHA512 36628843d7b7077e3057facbb4b7ee609422b5ff0a2738e1ca065f3c9403285e29d9787235e2db64328282c554fcb356c8a079eed12942737cc9edfad488ff45
 EBUILD mariadb-10.6.11.ebuild 42602 BLAKE2B 7e6a39fea4e3e5cddda02d82c489f2c0e582e8f0f39322da0a872d3d42b9cf2b500832a3fd1d2e15f36abd7e7306aaab9ff1d12025fd6ce0d715b38c7574016e SHA512 6f15c2acf19df3b0cd3db2a1e1add3c3acd4ab7ebb430756e750d11f1f6a422d7ce231e1090ae0a53363aa7140b9ea6e6c7ead063bef3aeadc22fa634504ab80
 EBUILD mariadb-10.6.12-r1.ebuild 42633 BLAKE2B 3cd2df58acf413fed700dc093aae334cb450c923581502802bc5043b3a78a44712419b126802588d639f2b827aca635b4f0fc5f60f6a2f006af3eec7688cdfb0 SHA512 18128a6a0511180870212b87fca00ddae8ef948ba7b55f225160339456362870fcbb99da2772a9ed32b31d231ba918211425fa9279d1c77c5df1bceb4910053c
diff --git a/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch b/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
new file mode 100644
index 000000000000..c474028e7e06
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/895698
+https://github.com/MariaDB/server/commit/75bbf645a66db797be2abd3a348dce32eb753acc
+
+From 75bbf645a66db797be2abd3a348dce32eb753acc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] Add missing include <cstdio>
+
+This is needed with GCC 13 and newer [1]
+
+[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/tpool/aio_linux.cc
++++ b/tpool/aio_linux.cc
+@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
+ #ifdef LINUX_NATIVE_AIO
+ # include <thread>
+ # include <atomic>
++# include <cstdio>
+ # include <libaio.h>
+ # include <sys/syscall.h>
+ 
diff --git a/dev-db/mariadb/mariadb-10.5.19-r1.ebuild b/dev-db/mariadb/mariadb-10.5.19-r1.ebuild
index 23642e369303..16de54792e38 100644
--- a/dev-db/mariadb/mariadb-10.5.19-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.19-r1.ebuild
@@ -213,6 +213,7 @@ src_prepare() {
 	eapply "${WORKDIR}"/mariadb-patches
 	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
 	eapply "${FILESDIR}"/${PN}-10.6.12-gcc-13.patch
+	eapply "${FILESDIR}"/${PN}-10.5.17-gcc-13.patch
 
 	eapply_user