Updated pkgbase mysql56 5.6.51-1

4 files changed, 24 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32b705fb880f..e619e406f144 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,29 @@
 pkgbase = mysql56
 	pkgdesc = Fast SQL database server, community edition v5.6
-	pkgver = 5.6.50
+	pkgver = 5.6.51
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = zlib
 	makedepends = cmake
 	makedepends = systemd-tools
+	makedepends = systemd-libs
 	makedepends = libaio
 	makedepends = jemalloc
 	options = !libtool
-	source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.50.tar.gz
+	source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.51.tar.gz
 	source = mysqld-post.sh
 	source = mysqld-tmpfile.conf
 	source = mysqld.service
 	source = mysql-srv_buf_size.patch
-	sha256sums = efc48d8160a66b50fc498bb42ea730c3b6f30f036b709a7070d356edd645923e
+	source = systemd-sysusers.conf
+	sha256sums = 262ccaf2930fca1f33787505dd125a7a04844f40d3421289a51974b5935d9abc
 	sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
 	sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
 	sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
 	sha256sums = bfa3ba5546d470e1c1d32246f687f0faa8c225913a648262fbcae6b2296cb57f
+	sha256sums = 1375640da77573d74c302285da6fcab931671c847d4dd4955dcf80a395173ae4
 
 pkgname = mysql56
 	pkgdesc = Fast SQL database server, community edition v5.6
@@ -29,8 +31,8 @@ pkgname = mysql56
 	depends = mysql-clients56
 	depends = libaio
 	depends = perl
-	provides = mariadb=5.6.50
-	provides = mysql=5.6.50
+	provides = mariadb=5.6.51
+	provides = mysql=5.6.51
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -40,8 +42,8 @@ pkgname = libmysqlclient56
 	depends = openssl
 	depends = zlib
 	depends = bash
-	provides = libmariadbclient=5.6.50
-	provides = libmysqlclient=5.6.50
+	provides = libmariadbclient=5.6.51
+	provides = libmysqlclient=5.6.51
 	conflicts = libmariadbclient
 
 pkgname = mysql-clients56
@@ -49,7 +51,7 @@ pkgname = mysql-clients56
 	depends = libmysqlclient56
 	depends = jemalloc
 	depends = ncurses
-	provides = mariadb-clients=5.6.50
-	provides = mysql-clients=5.6.50
+	provides = mariadb-clients=5.6.51
+	provides = mysql-clients=5.6.51
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index 1639b919e41b..78f39604cf42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,11 @@
 pkgname=('mysql56' 'libmysqlclient56' 'mysql-clients56')
 _pkgname=mysql
 pkgbase=mysql56
-pkgver=5.6.50
+pkgver=5.6.51
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition v5.6"
-arch=('i686' 'x86_64')
-makedepends=('zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc')
+arch=('x86_64')
+makedepends=('zlib' 'cmake' 'systemd-tools' 'systemd-libs' 'libaio' 'jemalloc')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
 options=('!libtool')
@@ -18,12 +18,14 @@ source=("https://dev.mysql.com/get/Downloads/MySQL-5.6/${_pkgname}-${pkgver}.tar
         "mysqld-post.sh"
         "mysqld-tmpfile.conf"
         "mysqld.service"
-        "mysql-srv_buf_size.patch")
-sha256sums=('efc48d8160a66b50fc498bb42ea730c3b6f30f036b709a7070d356edd645923e'
+        "mysql-srv_buf_size.patch"
+        "systemd-sysusers.conf")
+sha256sums=('262ccaf2930fca1f33787505dd125a7a04844f40d3421289a51974b5935d9abc'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
             '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
-            'bfa3ba5546d470e1c1d32246f687f0faa8c225913a648262fbcae6b2296cb57f')
+            'bfa3ba5546d470e1c1d32246f687f0faa8c225913a648262fbcae6b2296cb57f'
+            '1375640da77573d74c302285da6fcab931671c847d4dd4955dcf80a395173ae4')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
@@ -134,6 +136,8 @@ package_mysql56(){
   install -m 644 -D "${srcdir}/mysqld-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf"
   install -m 755 -d "${pkgdir}/usr/lib/systemd/system"
   install -m 644 -D "${srcdir}/mysqld.service" "${pkgdir}/usr/lib/systemd/system/"
+  install -m 755 -d "${pkgdir}/usr/lib/sysusers.d"
+  install -m 644 "${srcdir}/systemd-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 
   # provided by libmysqlclient
   rm "${pkgdir}/usr/bin/mysql_config"
diff --git a/mysql.install b/mysql.install
index 434ce35f180b..f7b8d47a15f9 100644
--- a/mysql.install
+++ b/mysql.install
@@ -1,12 +1,4 @@
 post_install(){
-  groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d "/var/lib/mysql" -s /bin/false mysql &>/dev/null
-
-  if [[ ! -e "/var/lib/mysql" ]]; then
-    install -dm700 "/var/lib/mysql"
-    chown -R mysql:mysql "/var/lib/mysql" &>/dev/null
-  fi
-
   echo ":: You need to initialize the MySQL data directory prior to starting"
   echo "   the service. This can be done with mysql_install_db command, e.g.:"
   echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
@@ -14,11 +6,3 @@ post_install(){
   echo "   mysql_secure_installation command after starting the mysqld service"
 }
 
-post_remove(){
-  if getent passwd mysql >/dev/null 2>&1; then
-    userdel mysql
-  fi
-  if getent group mysql >/dev/null 2>&1; then
-    groupdel mysql
-  fi
-}
diff --git a/systemd-sysusers.conf b/systemd-sysusers.conf
new file mode 100644
index 000000000000..3dc16d41e840
--- /dev/null
+++ b/systemd-sysusers.conf
@@ -0,0 +1,2 @@
+u mysql 89 "MySQL" /var/lib/mysql
+