[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2023-11-27 Thread Andreas Sturmlechner 
commit: e97e8893647510407491cb80bafcb9cad3b5a45e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 15 19:09:32 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 15:42:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e97e8893

dev-db/mariadb: drop 10.6.11

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mariadb/Manifest   |2 -
 dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch |   71 --
 dev-db/mariadb/mariadb-10.6.11.ebuild | 1324 -
 3 files changed, 1397 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c617f15e2019..d3fd1a3256a1 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,5 @@
 DIST mariadb-10.11.3-patches-01.tar.xz 4984 BLAKE2B 
abc78c83505c745ab7320b99dcda8c667fed8332dede466142027b24957fa9ff3d03f8402679ce6cffdc89bc9f0559f8c717b7ec9df52a2c5db39195f096d731
 SHA512 
127386c9dc8ce242d9d309e31b9357a928ba816d24d94d60cbc8723fb3bd0fb136c7d049bfb37aac057f9ebcc73c155ac20b8bcf2542f89401140728c2dcf29a
 DIST mariadb-10.11.5.tar.gz 99709948 BLAKE2B 
97429df4f0a10eb72c74dd0e951954b7c096a6b42fdaa97c682d1409e2a21716171a2b66aae6ec8ab3f4371bed57aff1f054554d398242e413d5c8e7ad988da4
 SHA512 
851e6508c1e495afa608a8bcd5c62faa5800e69cc1ba81b9366bf250e07ce8a9801a4ee07ecbaec4b57180c9b3bf2ed8acb7f5f03dd37a87a53928bfd4dfe559
-DIST mariadb-10.6.10-patches-01.tar.xz 5240 BLAKE2B 
4c41bbb5a81ecca3e9ccbdfb0861189575e5b3edfb1019465c8dbceee641a8bbeb3e54f061ff3ec44fb5ff3bca960419893429897db4a919177c390b44ef7e49
 SHA512 
aee039f5e771c840e2a5bb6f6f5fcbec06c0bbd7fd5ce155f0e6f3694595d5d2a0e38f25972c328fc9f69dd68354434e40c5e9a7b2d509d7ea795e097a57864d
-DIST mariadb-10.6.11.tar.gz 94742041 BLAKE2B 
cb5ff7a9b44814cb56f715c92f9d136070872889c0fe2d27987f62f75b1c787ef4ece81ae8bad9a944cbb4c4416fc23587fdab366ad1181b319eb3a0bf40f91a
 SHA512 
4b9e8e16651329f53eb19670dcc7f5dbb11ba84c28cca35bc7d216c5504b6db698ab65ce42c30a34ab967c1b14e6637c511ac4b49f2613b01f6dd615288cba98
 DIST mariadb-10.6.13-patches-01.tar.xz 4984 BLAKE2B 
625d04310b02aad4fec4b633e9fab06636364f3c5ed3cb88e89acd4224786c3c9ed478b636ac699e77a888b73dab12cb279df41d6095e93e9c4ae3a159570286
 SHA512 
1e6ac167bfd77570e8ff5955aaa9a101d9387ac4857d856f1fb8c9a489c4c2a154481b9385584435e8dc95baef0dd3ef6831c7de2d6f004401cc338edcaa9d12
 DIST mariadb-10.6.14.tar.gz 95286643 BLAKE2B 
4a186f3f52b63ab7321aa7556776ff8a986bd602d78dc6a143cc3bfdfd8cc09b0a22688cba02b8907f4b3f0d1e7c640f5caad768c1e89486d6af24e6cf3168a8
 SHA512 
11b88480ac61303172e98ed3271c8172e840cded5175caba1469d6ec063df647b536ee6e95f110abd8d95d95c9b8d7edf1cb63be225d5e8eeb2041f86438
 DIST mariadb-10.6.15.tar.gz 98204031 BLAKE2B 
4534b82f1c1e16ce2c7c21879714e24b20fada36ef10a8a0dbe770c1d99055822fcaf146646b19b459cfd948bff0662d23f1f661a843919f90a354838bda7ee6
 SHA512 
61b5af8c2f8bd2f641aaa708941563d5f6ecc118acc9a154c009c3ae1d50e7360ae59241f87e5c2111775a3ffeb42a64f4853e9c7096b58d68a3695b5d0ef97c

diff --git a/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch 
b/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch
deleted file mode 100644
index 322e5003a1dc..
--- a/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/MariaDB/server/pull/2460
-https://github.com/facebook/rocksdb/pull/8
-https://github.com/facebook/rocksdb/commit/bda8d93ba95f34aa91ae8578fe7d3454f3324f6a
-
-From e534c26cb5ce4f62d8f413c91d67ef9e214fd30e Mon Sep 17 00:00:00 2001
-From: Heiko Becker 
-Date: Tue, 24 Jan 2023 14:07:18 +0100
-Subject: [PATCH] Add include for std::runtime_error
-
 a/tpool/aio_liburing.cc
-+++ b/tpool/aio_liburing.cc
-@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02111 - 1301 USA*/
- #include 
- #include 
- #include 
-+#include 
- 
- namespace
- {
-
-From 7e32e24397cf651412113017f9abd133a9d2a600 Mon Sep 17 00:00:00 2001
-From: Heiko Becker 
-Date: Tue, 24 Jan 2023 16:23:03 +0100
-Subject: [PATCH] Fix build with gcc 13 by including 
-
-Like other versions before, gcc 13 moved some includes around and as a
-result  is no longer transitively included [1]. Explicitly include
-it for uint{32,64}_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
 a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-@@ -5,6 +5,8 @@
- 
- #pragma once
- 
-+#include 
-+
- #include "rocksdb/rocksdb_namespace.h"
- 
- struct CompactionIterationStats {
 a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-@@ -8,6 +8,7 @@
- #pragma once
- #ifndef ROCKSDB_LITE
- 
-+#include 
- #include 
- #include 
- #include "rocksdb/status.h"
 a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
-@@

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2023-03-27 Thread Sam James 
commit: fae8773de0a78fd9b311c09d38ee0bea2a854630
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 27 13:50:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 27 13:51:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae8773d

dev-db/mariadb: fix build w/ gcc-13

Closes: https://bugs.gentoo.org/895698
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb/files/mariadb-10.5.17-gcc-13.patch | 23 +++
 dev-db/mariadb/mariadb-10.5.19-r1.ebuild  |  1 +
 2 files changed, 24 insertions(+)

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 ..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 
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] Add missing include 
+
+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 
+--- 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 
+ # include 
++# include 
+ # include 
+ # include 
+ 

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

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2023-02-14 Thread Sam James 
commit: 5528982de0cebdd749453169b798c48efe015820
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Feb  8 20:30:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 15 05:50:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5528982d

dev-db/mariadb: add 10.4.28, 10.5.19, 10.6.12

Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb/Manifest   |5 +
 dev-db/mariadb/files/mariadb-10.6.12-gcc-13.patch |   44 +
 dev-db/mariadb/mariadb-10.4.28.ebuild | 1309 
 dev-db/mariadb/mariadb-10.5.19.ebuild | 1316 
 dev-db/mariadb/mariadb-10.6.12.ebuild | 1319 +
 5 files changed, 3993 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5dff1190d874..595204070e2b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,9 +4,14 @@ DIST mariadb-10.3.37.tar.gz 74314608 BLAKE2B 
cef3218cb48aeba788289888bcd642ddc3c
 DIST mariadb-10.4.26-patches-01.tar.xz 4528 BLAKE2B 
0e1683ca254fa4beb06239c377f241e6db2306b386d125491ea39dddbe82c9471f1dc7c26001f2c5ba105913f1ec707ce43482e9581b807723a8690c26fc6e6e
 SHA512 
7b54419ea7a974bc275c72770e63d37e116a2724ed5ce404a04acb622a95ae652f9a81c2ece0dd3d1ea41401dd5428627af19f7689fd01eb68471309ef4400f7
 DIST mariadb-10.4.26.tar.gz 96095606 BLAKE2B 
313e3e9561bf2805327141bf1d1e0834e6e3997bb1cd523452555b23ecfc1dddcb91e53478113dff56486bb77d172211c16c9e375d7e451f6af2346de338d3db
 SHA512 
4dadd786f902eb4fec702a863b790215b284eb5d6ecce2cb550e97e055ec4d21ef383f08938020ebbdf3a9150e1d4412817c2fa24f36e907deb0fe5b4ce96cb0
 DIST mariadb-10.4.27.tar.gz 94348724 BLAKE2B 
3e34b66f645798fbb48def30177f95afaff985c7a4f0063e58131f08f7599053a65c9cd9da9940d986ace1e5b78abd8e4885d990b9705e4c10093040df510239
 SHA512 
22865451b0e3caaa6c886f68292af95c02eb18c37d545998eccda952f125c0983ecb358f4deebaebb9a5ed30cfd947e8a1457760f0d985e7b738c03437ed26a2
+DIST mariadb-10.4.28.tar.gz 94731133 BLAKE2B 
d0419368f3eb73af3e49adf72bfb21f8f763b6a6aef3035b3eceeb0557dfff72df662f80a8147ce2c80c5a776f7aad8bb15a146739cc16b64878b5b2f153336e
 SHA512 
2d66380dd65aa85bf8a142fee18faecef10562c5c31e17f429afad9dba5a2b373b5b400da2bd42e5d78b7f01f3393ea0a46e0ed17ec1e0820f42f7b838f56f0d
 DIST mariadb-10.5.17-patches-01.tar.xz 5124 BLAKE2B 
74976beee48142294d1dcab73e9cdad40392619115184ab5da5553d28b9a10e415711fac84c4290affe301abe0047c99c5a31ce9dfd58c923cfa15346b9c5acc
 SHA512 
b3ffc4a227fcb4a85575fd093b399810c433686a97518cb0d2b47d61c623bbb760b40c5c9d7752fdbb24e3e41740e8a85c3096f6269c80f6ecc2ffc73d5ee94b
 DIST mariadb-10.5.17.tar.gz 113314849 BLAKE2B 
6b2efabc620f38d3b0d35930aa4c9b2e63f01d106de57056b5e4b8d629c5669ac1e64d120ce9cd77d3ddd8579630af3dcb52fe6db9c7f7413248b748d4ef
 SHA512 
5a68126aac7072bed549404c89f7215bc47dede8f72559076988469372b96523a800fd6bbf11ff3003a277ee30788ca99a21507b7d7e2b7e98437ca70b5ca0fc
 DIST mariadb-10.5.18.tar.gz 111568643 BLAKE2B 
39067475c00c456d0cb5e79eef063665db81ec98216b0c1969428edd7d5651d44186eb01d301aa4a7322845e401e3667f54128bd8aced2a88783c8a397ae19c1
 SHA512 
1fe13db1c0b66d2bc0c4d80e2c278f6e64027aaeebebfa5a179bd8ca92ae135ae53b72ed26c9b6d35b35fd2ad2a3cb390fd5ee0715b22d4bfafe773f950d804c
+DIST mariadb-10.5.19-patches-01.tar.xz 5156 BLAKE2B 
9e764f11dc5ed1babb2b34122f70e90e3ca8765a6f5860fb70e71bbca69311656645b7178332df7d8c2cbd57264d3418a2707558fc2ec332b031e600b545af01
 SHA512 
ccbb3d64eedce9abb76a40b7658b19487a669f585c95138590e47e1e47fe84e761a20d733ce1c8a413099d23bc52f032e8ac20644d9508e31982d418058c963b
+DIST mariadb-10.5.19.tar.gz 111958233 BLAKE2B 
0dd89fe0a838710d7307e3bc293f31232ad3c2c36d48c2899fb46b4fab87234f401224a07ff3da921370fdace3f3c972782c419be3479ab686fa46d31f8ca8b4
 SHA512 
4a72ca4dfee0d3fa5432495f62c7eb03addc067e2f023b1ebe32bd1d3a0687c2c61c3316c0c4f690db4f74559bce668c6accbe137d906a52116db2bb2f454699
 DIST mariadb-10.6.10-patches-01.tar.xz 5240 BLAKE2B 
4c41bbb5a81ecca3e9ccbdfb0861189575e5b3edfb1019465c8dbceee641a8bbeb3e54f061ff3ec44fb5ff3bca960419893429897db4a919177c390b44ef7e49
 SHA512 
aee039f5e771c840e2a5bb6f6f5fcbec06c0bbd7fd5ce155f0e6f3694595d5d2a0e38f25972c328fc9f69dd68354434e40c5e9a7b2d509d7ea795e097a57864d
 DIST mariadb-10.6.10.tar.gz 96453293 BLAKE2B 
889d141ab9e0e9a0cd3fc9b191a15192170029a5fddcff8ebfe482cc3cfdfec6307c014fe09719c7c254a3941034f53ee7ff6187f3d502e3f3edb4d586dff8f3
 SHA512 
912219878e2201280f5927ee8a34dafe83ac2c3ce8c6fa3d90731d10fd693c369872aff840edc8329b82c53e9908fbdb1ba731ba140e2b99048edb5eb21f22c4
 DIST mariadb-10.6.11.tar.gz 94742041 BLAKE2B 
cb5ff7a9b44814cb56f715c92f9d136070872889c0fe2d27987f62f75b1c787ef4ece81ae8bad9a944cbb4c4416fc23587fdab366ad1181b319eb3a0bf40f91a
 SHA512 
4b9e8e16651329f53eb19670dcc7f5dbb11ba84c28cca35bc7d216c5504b6db698ab65ce42c30a34ab967c1b14e6637c511ac4b49f2613b01f6dd615288cba98
+DIST mariadb-10.6.12-patches-01.tar.xz 5120 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2023-01-26 Thread Sam James 
commit: eea40d6eca14d060225debe3206edc057b7ff975
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 27 05:20:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 27 05:23:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea40d6e

dev-db/mariadb: fix build w/ gcc 13

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch | 71 +++
 dev-db/mariadb/mariadb-10.6.11.ebuild |  3 +-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch 
b/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch
new file mode 100644
index ..322e5003a1dc
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-gcc-13.patch
@@ -0,0 +1,71 @@
+https://github.com/MariaDB/server/pull/2460
+https://github.com/facebook/rocksdb/pull/8
+https://github.com/facebook/rocksdb/commit/bda8d93ba95f34aa91ae8578fe7d3454f3324f6a
+
+From e534c26cb5ce4f62d8f413c91d67ef9e214fd30e Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Tue, 24 Jan 2023 14:07:18 +0100
+Subject: [PATCH] Add include for std::runtime_error
+
+--- a/tpool/aio_liburing.cc
 b/tpool/aio_liburing.cc
+@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02111 - 1301 USA*/
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ namespace
+ {
+
+From 7e32e24397cf651412113017f9abd133a9d2a600 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Tue, 24 Jan 2023 16:23:03 +0100
+Subject: [PATCH] Fix build with gcc 13 by including 
+
+Like other versions before, gcc 13 moved some includes around and as a
+result  is no longer transitively included [1]. Explicitly include
+it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
 b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+@@ -5,6 +5,8 @@
+ 
+ #pragma once
+ 
++#include 
++
+ #include "rocksdb/rocksdb_namespace.h"
+ 
+ struct CompactionIterationStats {
+--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+ 
++#include 
+ #include 
+ #include 
+ #include "rocksdb/status.h"
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
 b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include 
+ #include 
+ #include 
+ 
+--- a/storage/rocksdb/rocksdb/util/string_util.h
 b/storage/rocksdb/rocksdb/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild 
b/dev-db/mariadb/mariadb-10.6.11.ebuild
index 55d260617012..52e66368df00 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -208,7 +208,8 @@ src_unpack() {
 src_prepare() {
eapply "${WORKDIR}"/mariadb-patches
eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
-   eapply "${FILESDIR}"/mariadb-10.6.11-include.patch
+   eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
+   eapply "${FILESDIR}"/${PN}-10.6.11-gcc-13.patch
 
eapply_user

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2023-01-16 Thread Sam James 
commit: 61cd8db06de869a6f52a4ab93c6e2b5a282e29a9
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 17 01:25:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 17 01:25:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61cd8db0

dev-db/mariadb: fix columnstore build

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb/files/mariadb-10.6.11-include.patch | 66 ++
 dev-db/mariadb/mariadb-10.6.11.ebuild  |  1 +
 2 files changed, 67 insertions(+)

diff --git a/dev-db/mariadb/files/mariadb-10.6.11-include.patch 
b/dev-db/mariadb/files/mariadb-10.6.11-include.patch
new file mode 100644
index ..600f440b85f0
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.6.11-include.patch
@@ -0,0 +1,66 @@
+https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/2698
+
+From 20b5dbb6171604b151ec2dd8c56bef26cc27d201 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Tue, 17 Jan 2023 01:18:41 +
+Subject: [PATCH] Add missing includes
+
+These seem to have all fallen out of a recent Boost update to 1.81 which
+dropped some internal includes. All of these uses within columnstore
+relied on these transitive includes, so explicitly include what we need
+to fix build.
+
+Signed-off-by: Sam James 
+
+--- a/storage/columnstore/columnstore/tools/passwd/secrets.cpp
 b/storage/columnstore/columnstore/tools/passwd/secrets.cpp
+@@ -12,6 +12,8 @@
+  */
+ #include "secrets.h"
+ 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/storage/columnstore/columnstore/storage-manager/src/S3Storage.h
 b/storage/columnstore/columnstore/storage-manager/src/S3Storage.h
+@@ -18,6 +18,7 @@
+ #ifndef S3STORAGE_H_
+ #define S3STORAGE_H_
+ 
++#include 
+ #include 
+ #include 
+ #include "CloudStorage.h"
+--- a/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp
 b/storage/columnstore/columnstore/storage-manager/src/MetadataFile.cpp
+@@ -19,6 +19,7 @@
+  * MetadataFile.cpp
+  */
+ #include "MetadataFile.h"
++#include 
+ #include 
+ #define BOOST_SPIRIT_THREADSAFE
+ #include 
+--- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h
 b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h
+@@ -19,6 +19,7 @@
+ 
+ #ifndef HA_MCS_IMPL_IF_H__
+ #define HA_MCS_IMPL_IF_H__
++#include 
+ #include 
+ #include 
+ #ifdef _MSC_VER
+--- a/storage/columnstore/columnstore/utils/cloudio/SocketPool.h
 b/storage/columnstore/columnstore/utils/cloudio/SocketPool.h
+@@ -18,6 +18,8 @@
+ #ifndef _SOCKETPOOL_H_
+ #define _SOCKETPOOL_H_
+ 
++#include 
++
+ #include 
+ #include 
+ #include 

diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild 
b/dev-db/mariadb/mariadb-10.6.11.ebuild
index 31285154561e..095305883bb9 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -208,6 +208,7 @@ src_unpack() {
 src_prepare() {
eapply "${WORKDIR}"/mariadb-patches
eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
+   eapply "${FILESDIR}"/mariadb-10.6.11-include.patch
 
eapply_user

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2022-12-14 Thread Sam James 
commit: 062b546a7512b29650fdd4dec9e3997efd267701
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 02:02:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 02:02:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062b546a

dev-db/mariadb: fix gssapi detection

Closes: https://bugs.gentoo.org/885829
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb/files/mariadb-10.6.11-gssapi.patch | 47 +++
 dev-db/mariadb/mariadb-10.6.11.ebuild |  1 +
 2 files changed, 48 insertions(+)

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 ..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 
+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

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2020-10-07 Thread Thomas Deutschmann 
commit: 90ad011695b84e10ea33b8914f645181735c1376
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Oct  7 21:30:40 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Oct  7 22:30:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ad0116

dev-db/mariadb: 10.4.x rev bump for CVE-2020-15180

Bug: https://bugs.gentoo.org/747166
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/mariadb-10.4-CVE-2020-15180.patch| 62 ++
 ...10.4.13-r2.ebuild => mariadb-10.4.13-r3.ebuild} |  1 +
 2 files changed, 63 insertions(+)

diff --git a/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch 
b/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
new file mode 100644
index 000..9658669c6e6
--- /dev/null
+++ b/dev-db/mariadb/files/mariadb-10.4-CVE-2020-15180.patch
@@ -0,0 +1,62 @@
+https://github.com/MariaDB/server/commit/418850b2df4256da5a722288c2657650dc228842
+
+--- a/sql/wsrep_sst.cc
 b/sql/wsrep_sst.cc
+@@ -1822,6 +1822,35 @@ static int sst_donate_other (const char*method,
+   return arg.err;
+ }
+ 
++/* return true if character can be a part of a filename */
++static bool filename_char(int const c)
++{
++  return isalnum(c) || (c == '-') || (c == '_') || (c == '.');
++}
++
++/* return true if character can be a part of an address string */
++static bool address_char(int const c)
++{
++  return filename_char(c) ||
++ (c == ':') || (c == '[') || (c == ']') || (c == '/');
++}
++
++static bool check_request_str(const char* const str,
++  bool (*check) (int c))
++{
++  for (size_t i(0); str[i] != '\0'; ++i)
++  {
++if (!check(str[i]))
++{
++  WSREP_WARN("Illegal character in state transfer request: %i (%c).",
++ str[i], str[i]);
++  return true;
++}
++  }
++
++  return false;
++}
++
+ int wsrep_sst_donate(const std::string& msg,
+  const wsrep::gtid& current_gtid,
+  const bool bypass)
+@@ -1833,8 +1862,21 @@ int wsrep_sst_donate(const std::string& msg,
+ 
+   const char* method= msg.data();
+   size_t method_len= strlen (method);
++
++  if (check_request_str(method, filename_char))
++  {
++WSREP_ERROR("Bad SST method name. SST canceled.");
++return WSREP_CB_FAILURE;
++  }
++
+   const char* data= method + method_len + 1;
+ 
++  if (check_request_str(data, address_char))
++  {
++WSREP_ERROR("Bad SST address string. SST canceled.");
++return WSREP_CB_FAILURE;
++  }
++
+   wsp::env env(NULL);
+   if (env.error())
+   {

diff --git a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild 
b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.4.13-r2.ebuild
rename to dev-db/mariadb/mariadb-10.4.13-r3.ebuild
index f879d6f9a0e..d87c5a8beba 100644
--- a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
@@ -223,6 +223,7 @@ src_unpack() {
 
 src_prepare() {
eapply "${WORKDIR}"/mariadb-patches
+   eapply "${FILESDIR}"/mariadb-10.4-CVE-2020-15180.patch
 
eapply_user

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/, dev-db/mariadb/files/

2017-07-19 Thread Brian Evans 
commit: bdadb2af24e76b6be7b232b89eb580c41580668f
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jul 19 20:15:02 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Jul 19 20:17:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdadb2af

dev-db/mariadb: Version bump for 10.2.7 - Note the config changes

This version is initially masked for diehard testing
Email the team at mysql-bugs  gentoo.org with feedback

The config now accepts files listed under /etc/mysql/mariadb.d to add your own 
settings

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-db/mariadb/Manifest   |   2 +
 dev-db/mariadb/files/my.cnf-10.2  |   3 +
 dev-db/mariadb/files/my.cnf.distro-client |  21 ++
 dev-db/mariadb/files/my.cnf.distro-server |  28 +++
 dev-db/mariadb/mariadb-10.2.7.ebuild  | 401 ++
 dev-db/mariadb/metadata.xml   |   1 +
 6 files changed, 456 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index c03f90cff44..adfaf8acc65 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,9 +5,11 @@ DIST mariadb-10.1.23.tar.gz 61772244 SHA256 
54d8114e24bfa5e3ebdc7d69e071ad147191
 DIST mariadb-10.1.24.tar.gz 61780687 SHA256 
b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 
0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c37034209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9
 WHIRLPOOL 
91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122
 DIST mariadb-10.1.25.tar.gz 61790542 SHA256 
7205ecaa6f1bc16335ad88faa5c46be52b3ac628a5e795cb942a3f4335b2a0d6 SHA512 
ae88e02a74f4f8c3b41686a0d46d4232210571072168f6645481d83ed5255ce1fec189827507106898e677d2d9749639d22b139f183ef24dab367b5d81002310
 WHIRLPOOL 
3a28463d4048723110a64c60cb72d07ffd1946a0a68c3e7dcdb085bb7ad0cb3c3b32579fa0587b5895f9c8224aa9414fd0bd55e0a8af6f8401e52ac5a37782fd
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 
90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 
3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff
 WHIRLPOOL 
cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
+DIST mariadb-10.2.7.tar.gz 67669554 SHA256 
225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc SHA512 
fa595acc0f5c9c62077db000f1721af79628994c08e82b2eb95d265e3c556e80942c487fc1b91299c382becd71f21a0a117ca93d7428752f436ed83683a4f4cd
 WHIRLPOOL 
d76d584924dac41fd787c1a02f79de90ae5334b217b66deb59756490a8c42b801fddac425542e371d68b04fa462a3f438626896749a1c12be70e9d22d857771e
 DIST mariadb-5.5.57.tar.gz 45783940 SHA256 
5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641 SHA512 
5d6350abd6f0ba98326633a36bb7ec67525e34e08cbe43f79c9b30bf0b872b0a8f9f0bfd5f3a4c2800a52d25b9c6f3a3a4a62e0f41574153bbf4b881f5347c71
 WHIRLPOOL 
c2af12fb71b3fcc9989cd2208a44dc81401fe1387ae2d03981fd5d00277d480a35f23bdb8f1564f91b4c345bdb18a610b46ee91f47772ba5de1baf8f808eaec3
 DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 
c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 
1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715
 WHIRLPOOL 
d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 
45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 
c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
 WHIRLPOOL 
becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927
 DIST mysql-extras-20160818-1822Z.tar.bz2 302657 SHA256 
7e4f42ea0754af120d2ad6b4a3e40dd9bd5a769913ac141453a2c53419bd6c05 SHA512 
19bd509fd1a37c537ae28919516406735cdf3d3fbc66583f765b64b3d296bd041cf2bc2291004b7274604a2fda3cb399141d6c672ae5d6f8aced3d019ac81826
 WHIRLPOOL 
46b4e3c7f415b2de1440aa9d190805dfbc49a8f4a6ed26be5e4bb3e3e9553885cc7e7e13c83c49fadf71a6081bb8fd9d28d5f4d8372540c89a649f2d913fdd9b
 DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 
23f5becec389fc49e7cf0d52c6c914cbc8d7e3fc5851ee38881ee6884ffc5732 SHA512 
2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157
 WHIRLPOOL 
9f459d9e58938597e7919b29fc819d87920a51461d274bf87520fe322a67ad8638ef19212855ba8e37507d3b160d29ecad0099f4632f078cc503e1be0f809fb4
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 SHA256 
ebcb4f03413ccf42877558ad365db01bbb5ef2e12620a9be479ffc2514d9830e SHA512