main/mariadb: security upgrade to 10.3.20

CVE-2019-2938, CVE-2019-2974

ref #10973

main/mariadb/APKBUILD

@@ -6,7 +6,7 @@
 # Contributor: Marcel Haazen <marcel@haazen.xyz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb
-pkgver=10.3.17
+pkgver=10.3.20
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="https://www.mariadb.org/"
@@ -19,7 +19,7 @@ checkdepends="perl"
 _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey"
 depends_dev="openssl-dev zlib-dev mariadb-connector-c-dev"
 makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libevent-dev
-	libxml2-dev ncurses-dev pcre-dev readline-dev xz-dev linux-headers
+	libxml2-dev ncurses-dev pcre-dev readline-dev xz-dev linux-headers linux-pam-dev
 	$_mytopdeps"
 install="$pkgname.pre-install $pkgname-common.post-upgrade"
 subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedded_dev
@@ -27,7 +27,7 @@ subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedde
 	$pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-mytop
 	$pkgname-server-utils:_server_utils
 	mysql mysql-client:_compat_client mysql-bench:_compat_bench"
-options="!checkroot"
+options="!checkroot suid"
 
 _enable_rocksdb=YES
 case "$CARCH" in
@@ -49,6 +49,9 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
 builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
+#   10.3.20-r0:
+#     - CVE-2019-2938
+#     - CVE-2019-2974
 #   10.3.17-r0:
 #     - CVE-2019-2805
 #     - CVE-2019-2740
@@ -148,7 +151,6 @@ build() {
 		-DPLUGIN_ROCKSDB=$_enable_rocksdb \
 		-DPLUGIN_SPHINX=NO \
 		-DPLUGIN_TOKUDB=NO \
-		-DPLUGIN_AUTH_PAM=NO \
 		-DPLUGIN_AUTH_GSSAPI=NO \
 		-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \
 		-DPLUGIN_CRACKLIB_PASSWORD_CHECK=NO \
@@ -431,7 +433,7 @@ _plugin_rocksdb() {
 		 "$subpkgdir"/usr/lib/mariadb/plugin/ha_rocksdb.so
 }
 
-sha512sums="6fba995d8c284a12f19ee5635f5d69d8fa89fc314f512cd1764b2c4593933baf71a472ddce630463debd3bfbafa1cf5afee3f40d3c4062242f58cea16259561e  mariadb-10.3.17.tar.gz
+sha512sums="8080cb6db85c587f39f128e98b00c3e6428bf3e828271a227bb2c61c97683c965802baa6e5f825317f7e2963683c0f81699642853deeca6977faa2b6932044a3  mariadb-10.3.20.tar.gz
 c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c  mariadb.initd
 ecfea6503edd301bb628e2a44f36315079efa70e7615ff06b27714397332034f02e68ef40d4d5c761942e024ed1993621127c9df80b7e2327c68b1d839a7a322  fix-c11-atomics-check.patch
 e9ae4613f1d8c5f0a59b39a3548c46e50674ae78e7457d0e64c49f7e1573125c13634bbce7e29179bb8865a423171f852f43b96f7ef95619a95f02edcfc71efd  ppc-remove-glibc-dep.patch