Updated package mysql57 5.7.34-1

4 files changed, 24 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a44755183f4..10e6615c860a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mysql57
 	pkgdesc = Fast SQL database server, community edition, v5.7
-	pkgver = 5.7.32
+	pkgver = 5.7.34
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
@@ -9,23 +9,26 @@ pkgbase = mysql57
 	makedepends = zlib
 	makedepends = cmake
 	makedepends = systemd-tools
+	makedepends = systemd-libs
 	makedepends = libaio
 	makedepends = jemalloc
 	makedepends = rpcsvc-proto
 	makedepends = libtirpc
 	options = !libtool
-	source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.32.tar.gz
+	source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.34.tar.gz
 	source = http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz
 	source = mysqld-post.sh
 	source = mysqld-tmpfile.conf
 	source = mysqld.service
 	source = my-default.cnf
-	sha256sums = 1f4b59b43f82de4ccf4ba9cfce087318a192012a752aee8f66ca16f73bb082c9
+	source = systemd-sysusers.conf
+	sha256sums = 78d2aeb1320226590755a5734383c2f61284c337dad7f947bdff345f790686a6
 	sha256sums = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 	sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
 	sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
 	sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
 	sha256sums = 3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d
+	sha256sums = 1375640da77573d74c302285da6fcab931671c847d4dd4955dcf80a395173ae4
 
 pkgname = mysql57
 	pkgdesc = Fast SQL database server, community edition, v5.7
@@ -36,8 +39,8 @@ pkgname = mysql57
 	depends = jemalloc
 	depends = libaio
 	depends = libtirpc
-	provides = mariadb=5.7.32
-	provides = mysql=5.7.32
+	provides = mariadb=5.7.34
+	provides = mysql=5.7.34
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -46,8 +49,8 @@ pkgname = libmysqlclient57
 	pkgdesc = MySQL client libraries, v5.7
 	depends = libsasl
 	depends = zlib
-	provides = libmariadbclient=5.7.32
-	provides = libmysqlclient=5.7.32
+	provides = libmariadbclient=5.7.34
+	provides = libmysqlclient=5.7.34
 	conflicts = libmariadbclient
 
 pkgname = mysql-clients57
@@ -56,7 +59,7 @@ pkgname = mysql-clients57
 	depends = zlib
 	depends = openssl
 	depends = jemalloc
-	provides = mariadb-clients=5.7.32
-	provides = mysql-clients=5.7.32
+	provides = mariadb-clients=5.7.34
+	provides = mysql-clients=5.7.34
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index c9f8f7502336..5781cb7554c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,12 @@
 pkgname=('mysql57' 'libmysqlclient57' 'mysql-clients57')
 _pkgname=mysql
 pkgbase=mysql57
-pkgver=5.7.32
+pkgver=5.7.34
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition, v5.7"
 arch=('x86_64')
-makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc'
-             'rpcsvc-proto' 'libtirpc')
+makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'systemd-libs' 'libaio'
+             'jemalloc' 'rpcsvc-proto' 'libtirpc')
 _boost_ver=1.59.0
 license=('GPL')
 url="https://www.mysql.com/products/community/"
@@ -21,13 +21,15 @@ source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${_pkgname}-${pkgver}.tar
         "mysqld-post.sh"
         "mysqld-tmpfile.conf"
         "mysqld.service"
-        "my-default.cnf")
-sha256sums=('1f4b59b43f82de4ccf4ba9cfce087318a192012a752aee8f66ca16f73bb082c9'
+        "my-default.cnf"
+        "systemd-sysusers.conf")
+sha256sums=('78d2aeb1320226590755a5734383c2f61284c337dad7f947bdff345f790686a6'
             '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
             '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
-            '3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d')
+            '3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d'
+            '1375640da77573d74c302285da6fcab931671c847d4dd4955dcf80a395173ae4')
 
 build() {
   rm -rf build
@@ -140,6 +142,8 @@ package_mysql57(){
   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 90583a1e83c4..7c30ee5c4536 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 mysqld --initialize command, e.g.:"
   echo "   mysqld --initialize --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
+