main/mariadb: security upgrade to 10.1.21 - fixes #6717

CVE-2016-6664
CVE-2017-3238
CVE-2017-3243
CVE-2017-3244
CVE-2017-3257
CVE-2017-3258
CVE-2017-3265
CVE-2017-3291
CVE-2017-3312
CVE-2017-3317
CVE-2017-3318

main/mariadb/APKBUILD

+# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mariadb
-pkgver=10.1.20
+pkgver=10.1.21
 pkgrel=0
 pkgdesc="A fast SQL database server"
 url="http://www.mariadb.org"
@@ -22,15 +23,29 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad
 	fix-ucontext-check.patch
 	"
 
+# secfixes:
+#   10.1.21-r0:
+#     - CVE-2016-6664
+#     - CVE-2017-3238
+#     - CVE-2017-3243
+#     - CVE-2017-3244
+#     - CVE-2017-3257
+#     - CVE-2017-3258
+#     - CVE-2017-3265
+#     - CVE-2017-3291
+#     - CVE-2017-3312
+#     - CVE-2017-3317
+#     - CVE-2017-3318
+
 subpackages="$pkgname-doc $pkgname-dev $pkgname-common
 	$pkgname-client-libs:_client_libs $pkgname-libs
 	$pkgname-client $pkgname-bench $pkgname-test:mytest
 	mysql mysql-client:_compat_client mysql-bench:_compat_bench"
 
-_builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	for i in $source; do
 		case $i in
 			*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
@@ -39,7 +54,7 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	cmake . -DBUILD_CONFIG=mysql_release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc/mysql \
@@ -78,7 +93,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir/" install || return 1
 
 	install -Dm 755 "$startdir"/$pkgname.initd \
@@ -185,15 +200,15 @@ mysql() { _compat mysql mariadb; }
 _compat_client() { _compat mysql-client mariadb-client; }
 _compat_bench() { _compat mysql-bench mariadb-client; }
 
-md5sums="623226918fd711e414ad240287284b5b  mariadb-10.1.20.tar.gz
+md5sums="ff8b96edeeb22425117309a249055310  mariadb-10.1.21.tar.gz
 195f8bf24dfdbc5aa7ccd969a1b1283f  mariadb.initd
 b233fb7015a9659f5b825cd8010d2b52  fix-mysql-install-db-path.patch
 96b7247f919bf4e1de13a9d0ce7ef515  fix-ucontext-check.patch"
-sha256sums="c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9  mariadb-10.1.20.tar.gz
+sha256sums="5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490  mariadb-10.1.21.tar.gz
 c37aa7c150c07a3ac478a6fd1b478b425c17ac412f9ba4f49b8a635edb6ed542  mariadb.initd
 0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904  fix-mysql-install-db-path.patch
 3d9a12bf04fcf215567b6a395fe83fb6528602baf4283d42181bd73f93b5f538  fix-ucontext-check.patch"
-sha512sums="926067a30e54354f6482e28152694e747f4deb8b4ba6d054e089955b45f98f628ea8cca4cfbc12f6220fa6b8b6f2ba9fef7c23c09cb82b23f370acdd32a9e892  mariadb-10.1.20.tar.gz
+sha512sums="241467ce7c04603261509e45b3c476632a11754f15dead67434bb8a0fbad6ebcf44c63ffeb7075574e54d14039b22702d48732c1fd8a498948d8b6fc54d54714  mariadb-10.1.21.tar.gz
 06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f  mariadb.initd
 f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1  fix-mysql-install-db-path.patch
 82fa93411483f5d1b57d978087a891bcab6a011e45c2d79b08d28718f5717994b423fc81d2170dad2fe65303153ac29655a81ce5039e73e37cebb159392a86cf  fix-ucontext-check.patch"