From 71ced0d3e9af48f06f666463573c7b4b9cfa19f6 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 16 Nov 2023 14:13:35 +0000
Subject: [PATCH] extra/mariadb to 11.1.3-1

---
 extra/mariadb/.SRCINFO | 97 ++++++++++++++++++++++++++++++++++++++++++
 extra/mariadb/PKGBUILD |  8 +++-
 2 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 extra/mariadb/.SRCINFO

diff --git a/extra/mariadb/.SRCINFO b/extra/mariadb/.SRCINFO
new file mode 100644
index 000000000..664251d2e
--- /dev/null
+++ b/extra/mariadb/.SRCINFO
@@ -0,0 +1,97 @@
+pkgbase = mariadb
+	pkgdesc = Fast SQL database server, derived from MySQL
+	pkgver = 11.1.3
+	pkgrel = 1
+	url = https://mariadb.org/
+	arch = x86_64
+	license = GPL
+	makedepends = boost
+	makedepends = bzip2
+	makedepends = cmake
+	makedepends = cracklib
+	makedepends = curl
+	makedepends = jemalloc
+	makedepends = judy
+	makedepends = krb5
+	makedepends = liburing
+	makedepends = libxcrypt
+	makedepends = libxml2
+	makedepends = lz4
+	makedepends = openssl
+	makedepends = pcre2
+	makedepends = systemd
+	makedepends = zlib
+	makedepends = zstd
+	makedepends = xz
+	source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.1.3/source/mariadb-11.1.3.tar.gz
+	source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.1.3/source/mariadb-11.1.3.tar.gz.asc
+	source = 0001-arch-specific.patch
+	validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8
+	sha256sums = ad3aa6ae478179275ecb28e3ed8a578f2004f084e14409727c0bf04975ace36c
+	sha256sums = SKIP
+	sha256sums = 3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460
+
+pkgname = mariadb-libs
+	pkgdesc = MariaDB libraries
+	depends = liburing
+	depends = libxcrypt
+	depends = libcrypt.so
+	depends = openssl
+	depends = pcre2
+	depends = zlib
+	depends = zstd
+	optdepends = krb5: for gssapi authentication
+	provides = libmariadbclient
+	provides = mariadb-connector-c
+	provides = libmariadb.so
+	provides = libmariadbd.so
+	conflicts = libmysqlclient
+	conflicts = libmariadbclient
+	conflicts = mariadb-connector-c
+	replaces = libmariadbclient
+
+pkgname = mariadb-clients
+	pkgdesc = MariaDB client tools
+	depends = mariadb-libs=11.1.3
+	depends = jemalloc
+	depends = ncurses
+	provides = mysql-clients=11.1.3
+	conflicts = mysql-clients
+
+pkgname = mariadb
+	pkgdesc = Fast SQL database server, derived from MySQL
+	install = mariadb.install
+	depends = mariadb-clients=11.1.3
+	depends = bzip2
+	depends = libxml2
+	depends = lz4
+	depends = systemd-libs
+	depends = libxml2
+	depends = zstd
+	optdepends = cracklib: for cracklib plugin
+	optdepends = curl: for ha_s3 plugin
+	optdepends = galera: for MariaDB cluster with Galera WSREP
+	optdepends = judy: for Open Query GRAPH (OQGraph) computation engine
+	optdepends = perl-dbd-mariadb: for mariadb-hotcopy, mariadb-convert-table-format and mariadb-setpermission
+	optdepends = python-mysqlclient: for myrocks_hotbackup
+	optdepends = xz: lzma provider
+	provides = mysql=11.1.3
+	conflicts = mysql
+	options = emptydirs
+	backup = etc/my.cnf
+	backup = etc/my.cnf.d/client.cnf
+	backup = etc/my.cnf.d/enable_encryption.preset
+	backup = etc/my.cnf.d/mysql-clients.cnf
+	backup = etc/my.cnf.d/provider_bzip2.cnf
+	backup = etc/my.cnf.d/provider_lz4.cnf
+	backup = etc/my.cnf.d/provider_lzma.cnf
+	backup = etc/my.cnf.d/s3.cnf
+	backup = etc/my.cnf.d/server.cnf
+	backup = etc/my.cnf.d/spider.cnf
+	backup = etc/security/user_map.conf
+
+pkgname = mytop
+	pkgdesc = Top clone for MariaDB
+	depends = perl
+	depends = perl-dbd-mariadb
+	depends = perl-term-readkey
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index fa1356880..81250f88b 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
-pkgver=11.1.2
+pkgver=11.1.3
 pkgrel=1
 arch=('x86_64')
 license=('GPL')
@@ -22,7 +22,7 @@ validpgpkeys=('177F4010FE56CA3336300305F1656F24C74CD1D8') # MariaDB Signing Key
 # https://mariadb.com/kb/en/library/mirror-sites-for-mariadb/
 source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc}
         '0001-arch-specific.patch')
-sha256sums=('19a9e980e57fa332931f643b48ad7390528c889ff6ea8b0e16fd306aa3088238'
+sha256sums=('ad3aa6ae478179275ecb28e3ed8a578f2004f084e14409727c0bf04975ace36c'
             'SKIP'
             '3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460')
 
@@ -94,6 +94,10 @@ build() {
     -DWITH_ZLIB=system
   )
 
+  # this uses malloc_usable_size, which is incompatible with fortification level 3
+  export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+  export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+
   mkdir build
   cd build