From 1833493113ade31ce727d8712be26c9b725d12e3 Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Tue, 7 Feb 2023 12:44:26 +0000
Subject: [PATCH] main/mariadb: upgrade to 10.6.12
also fixes pam module dir
closes #12746
---
main/mariadb/APKBUILD | 62 +++++++++++++++++++++++++++++++++++--------
1 file changed, 51 insertions(+), 11 deletions(-)
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index de3bcfab10ed..1bb6fc6fb857 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -7,7 +7,7 @@
# Contributor: Jake Buchholz <tomalok@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
-pkgver=10.6.11
+pkgver=10.6.12
pkgrel=0
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org/"
@@ -16,17 +16,56 @@ pkggroups="mysql"
arch="all"
license="GPL-2.0-or-later"
depends="$pkgname-common"
-_mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey"
-depends_dev="openssl-dev>3 zlib-dev mariadb-connector-c-dev"
-makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libevent-dev
- libxml2-dev ncurses-dev pcre2-dev readline-dev xz-dev linux-headers linux-pam-dev
- samurai $_mytopdeps"
+_mytopdeps="
+ perl
+ perl-dbd-mysql
+ perl-dbi
+ perl-getopt-long
+ perl-socket
+ perl-term-readkey
+ "
+depends_dev="
+ mariadb-connector-c-dev
+ openssl-dev
+ zlib-dev
+ "
+makedepends="
+ $_mytopdeps
+ $depends_dev
+ bison
+ cmake
+ curl-dev
+ libaio-dev
+ libarchive-dev
+ libevent-dev
+ libxml2-dev
+ linux-headers
+ linux-pam-dev
+ ncurses-dev
+ pcre2-dev
+ readline-dev
+ samurai
+ xz-dev
+ "
install="$pkgname.pre-install $pkgname-common.post-upgrade"
-subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedded_dev
- $pkgname-doc $pkgname-dev $pkgname-common $pkgname-openrc
- $pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-mytop
+subpackages="
+ $pkgname-static
+ $pkgname-test:mytest
+ $pkgname-embedded-dev:_embedded_dev
+ $pkgname-doc
+ $pkgname-dev
+ $pkgname-common
+ $pkgname-openrc
+ $pkgname-client
+ $pkgname-bench
+ $pkgname-backup
+ $pkgname-embedded
+ $pkgname-mytop
$pkgname-server-utils:_server_utils
- mysql mysql-client:_compat_client mysql-bench:_compat_bench"
+ mysql
+ mysql-client:_compat_client
+ mysql-bench:_compat_bench
+ "
options="suid"
case "$CARCH" in
@@ -203,6 +242,7 @@ build() {
-DENABLED_LOCAL_INFILE=ON \
-DINSTALL_INFODIR=share/info \
-DINSTALL_MANDIR=share/man \
+ -DINSTALL_PAMDIR=/lib/security \
-DINSTALL_PLUGINDIR=lib/$pkgname/plugin \
-DINSTALL_SCRIPTDIR=bin \
-DINSTALL_INCLUDEDIR=include/mysql \
@@ -516,7 +556,7 @@ _plugin_rocksdb() {
}
sha512sums="
-4b9e8e16651329f53eb19670dcc7f5dbb11ba84c28cca35bc7d216c5504b6db698ab65ce42c30a34ab967c1b14e6637c511ac4b49f2613b01f6dd615288cba98 mariadb-10.6.11.tar.gz
+f6d5178ce2a4d755367bb805f23e849824ee4c982a01a114c35a13d250a9b3b2a93ac9b745fb3685fd9e6b44deff0b5c936b43e5441d3af8a300881109db0549 mariadb-10.6.12.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
20331e52e3dc419b4833e3c16bbb9828b9591f8aa3b6fce93c592161f3cae403c4a5d073369b2383d7d2325a2c9394d178866ac3e069fd8b6c50be00155ba942 ppc-remove-glibc-dep.patch
598490b4bb45c9f7be46086d25c2b6c601d417c45f11aa519c2290065e7d6e98a7519f9860b823e67a8fd3e6ce3b4728af73ec3a2c66eec32b42fd4ad7cc07f7 disable-failing-test.patch
--
GitLab