Updated to 10.3.11.

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00bd027e5e06..2b103f97ed86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = mariadb-10.3
-	pkgver = 10.3.10
+	pkgver = 10.3.11
 	pkgrel = 1
 	url = http://mariadb.org/
 	arch = x86_64
@@ -15,11 +15,11 @@ pkgbase = mariadb-10.3
 	makedepends = openssl
 	makedepends = systemd
 	makedepends = zlib
-	source = https://mirrors.ukfast.co.uk/sites/mariadb/mariadb-10.3.10/source/mariadb-10.3.10.tar.gz
-	source = https://mirrors.ukfast.co.uk/sites/mariadb/mariadb-10.3.10/source/mariadb-10.3.10.tar.gz.asc
+	source = https://mirrors.ukfast.co.uk/sites/mariadb/mariadb-10.3.11/source/mariadb-10.3.11.tar.gz
+	source = https://mirrors.ukfast.co.uk/sites/mariadb/mariadb-10.3.11/source/mariadb-10.3.11.tar.gz.asc
 	source = fix_libmariadb_ignored_host.patch
 	validpgpkeys = 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB
-	sha256sums = 57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda
+	sha256sums = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2
 	sha256sums = SKIP
 	sha256sums = fd186c795c393b6898f28d731390bb14ea8444230c8340a5f4cfbccb16ea10e9
 
@@ -32,16 +32,16 @@ pkgname = libmariadbclient-10.3
 	depends = openssl
 	depends = xz
 	depends = zlib
-	provides = libmariadbclient=10.3.10
+	provides = libmariadbclient=10.3.11
 	conflicts = libmysqlclient
 	conflicts = libmariadbclient
 
 pkgname = mariadb-clients-10.3
 	pkgdesc = MariaDB client tools
-	depends = libmariadbclient-10.3=10.3.10
+	depends = libmariadbclient-10.3=10.3.11
 	depends = jemalloc
-	provides = mysql-clients=10.3.10
-	provides = mariadb-clients=10.3.10
+	provides = mysql-clients=10.3.11
+	provides = mariadb-clients=10.3.11
 	conflicts = mysql-clients
 	conflicts = mariadb-clients
 
@@ -50,20 +50,20 @@ pkgname = mytop-10.3
 	depends = perl
 	depends = perl-dbd-mysql
 	depends = perl-term-readkey
-	provides = mytop=10.3.10
+	provides = mytop=10.3.11
 	conflicts = mytop
 
 pkgname = mariadb-10.3
 	pkgdesc = Fast SQL database server, drop-in replacement for MySQL
 	install = mariadb.install
-	depends = mariadb-clients-10.3=10.3.10
+	depends = mariadb-clients-10.3=10.3.11
 	depends = inetutils
 	depends = libsystemd
 	depends = libxml2
 	optdepends = galera: for MariaDB cluster with Galera WSREP
 	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission
-	provides = mysql=10.3.10
-	provides = mariadb=10.3.10
+	provides = mysql=10.3.11
+	provides = mariadb=10.3.11
 	conflicts = mysql
 	conflicts = mariadb
 	options = emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index f8d065b40977..d32c8304fc00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase=mariadb-10.3
 pkgname=('libmariadbclient-10.3' 'mariadb-clients-10.3' 'mytop-10.3' 'mariadb-10.3')
-pkgver=10.3.10
+pkgver=10.3.11
 pkgrel=1
 arch=('x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@ validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Sign
 
 source=("https://mirrors.ukfast.co.uk/sites/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
         fix_libmariadb_ignored_host.patch)
-sha256sums=('57767c048982811c7ab21d8527f6f36aa897386e8c7235f11b5505a924d68eda'
+sha256sums=('211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2'
             'SKIP'
             'fd186c795c393b6898f28d731390bb14ea8444230c8340a5f4cfbccb16ea10e9')
 
@@ -160,6 +160,9 @@ package_mariadb-10.3() {
 
   mkdir etc/my.cnf.d
 
+  # Arch Linux uses systemd
+  rm -r etc/mysql/init.d/
+
   mv usr/lib/sysusers.d/{sysusers,mariadb}.conf
   mv usr/lib/tmpfiles.d/{tmpfiles,mariadb}.conf
 
@@ -182,7 +185,8 @@ package_mariadb-10.3() {
   rm usr/lib/mysql/plugin/{auth_gssapi_client.so,dialog.so,mysql_clear_password.so,sha256_password.so}
   rm usr/share/man/man1/mysql_config.1
   rm -r usr/include/
-  rm -r usr/share/mysql/{aclocal,pkgconfig}
+  rm -r usr/share/mysql/aclocal
+  rm -r usr/lib/pkgconfig
 
   # provided by mariadb-clients
   rm usr/bin/{mysql,mysql_plugin,mysql_upgrade,mysqladmin,mysqlbinlog,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap,mysqltest}