From 47281886961aebad98a41eada4cc285309b3294a Mon Sep 17 00:00:00 2001
From: Dan Theisen <djt@hxx.in>
Date: Mon, 4 Oct 2021 11:40:01 +0000
Subject: user/mariadb: bump to 10.6.4

---
 user/mariadb/APKBUILD          | 29 +++++++++++++++++++----------
 user/mariadb/crc32-power.patch |  8 --------
 2 files changed, 19 insertions(+), 18 deletions(-)
 delete mode 100644 user/mariadb/crc32-power.patch

(limited to 'user')

diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD
index 5deb6eb83..d166777cf 100644
--- a/user/mariadb/APKBUILD
+++ b/user/mariadb/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Dan Theisen <djt@hxx.in>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=mariadb
-pkgver=10.4.13
+pkgver=10.6.4
 pkgrel=0
 pkgdesc="Open source database server"
 url="https://mariadb.org/"
@@ -18,14 +18,13 @@ depends="$pkgname-common"
 depends_dev="openssl-dev zlib-dev"
 makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev
 	libedit-dev libevent-dev libexecinfo-dev libxml2-dev ncurses-dev
-	linux-pam-dev pcre-dev xz-dev"
+	linux-pam-dev pcre2-dev xz-dev"
 _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket
 	perl-term-readkey"
 subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded
 	$pkgname-common $pkgname-backup mytop::noarch $pkgname-openrc
 	$pkgname-doc $pkgname-dev"
 source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
-	crc32-power.patch
 	gcc_builtins_ppc.h
 	ppchax.patch
 	mariadb.initd
@@ -33,6 +32,22 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
 	"
 
 # secfixes:
+#   10.6.4-r0:
+#     - CVE-2020-13249
+#     - CVE-2020-2814
+#     - CVE-2020-2812
+#     - CVE-2020-2760
+#     - CVE-2020-2752
+#     - CVE-2020-28912
+#     - CVE-2020-14812
+#     - CVE-2020-14789
+#     - CVE-2020-14776
+#     - CVE-2020-14765
+#     - CVE-2021-27928
+#     - CVE-2021-2166
+#     - CVE-2021-2154
+#     - CVE-2021-2389
+#     - CVE-2021-2389
 #   10.4.12-r0:
 #     - CVE-2020-7221
 
@@ -251,11 +266,6 @@ dev() {
 	provides="mysql-dev=$pkgver-r$pkgrel"
 	depends="$pkgname-libs"
 	_install_component Development
-
-	# move symlinks for static libs from libs subpackage to dev
-	LIB_PATH=${pkgdir}-libs/usr/lib
-	mv $LIB_PATH/libmysqlclient.a ${subpkgdir}/usr/lib/
-	mv $LIB_PATH/libmysqlclient_r.a ${subpkgdir}/usr/lib/
 }
 
 doc() {
@@ -265,8 +275,7 @@ doc() {
 	default_doc
 }
 
-sha512sums="68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566  mariadb-10.4.13.tar.gz
-03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0  crc32-power.patch
+sha512sums="c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071  mariadb-10.6.4.tar.gz
 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3  gcc_builtins_ppc.h
 0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d  ppchax.patch
 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654  mariadb.initd
diff --git a/user/mariadb/crc32-power.patch b/user/mariadb/crc32-power.patch
deleted file mode 100644
index aa269a599..000000000
--- a/user/mariadb/crc32-power.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- mariadb-10.4.6/cmake/crc32.cmake.old	2019-06-17 22:00:31.000000000 +0000
-+++ mariadb-10.4.6/cmake/crc32.cmake	2019-07-06 22:02:39.704198796 +0000
-@@ -1,4 +1,4 @@
--IF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
-+IF(FALSE)
-     SET(HAVE_CRC32_VPMSUM 1)
-     SET(CRC32_LIBRARY crc32-vpmsum)
-     ADD_SUBDIRECTORY(extra/crc32-vpmsum)
-- 
cgit v1.2.3-60-g2f50