Updated pkgbase mysql 8.0.24-1

5 files changed, 39 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index caee0c6f48f4..20ec8c51b388 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mysql
 	pkgdesc = Fast SQL database server, community edition
-	pkgver = 8.0.23
+	pkgver = 8.0.24
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = mysql
 	makedepends = zlib
 	makedepends = cmake
 	makedepends = systemd-tools
+	makedepends = systemd-libs
 	makedepends = libaio
 	makedepends = jemalloc
 	makedepends = rpcsvc-proto
@@ -18,18 +19,20 @@ pkgbase = mysql
 	makedepends = libevent
 	makedepends = re2
 	makedepends = rapidjson
-	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.23.tar.gz
+	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.24.tar.gz
 	source = my-default.cnf
 	source = mysql-ld.so.conf
 	source = mysql.sysconfig
 	source = mysqld_service.patch
-	source = systemd-sysusers-tmpfiles.patch
-	sha256sums = 1c7a424303c134758e59607a0b3172e43a21a27ff08e8c88c2439ffd4fc724a5
+	source = systemd-tmpfiles.patch
+	source = systemd-sysusers.conf
+	sha256sums = 4bc9c54b38e9e2a3f5cc77f21791dc52372f15c5473f7d427793f6ec44bf5900
 	sha256sums = 6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328
 	sha256sums = e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f
 	sha256sums = 203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae
 	sha256sums = 8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af
 	sha256sums = e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77
+	sha256sums = 200a992eb41c95efa99845d017439ddd4018a3e51f57ffca8cb802b0d25123f1
 
 pkgname = mysql
 	pkgdesc = Fast SQL database server, community edition
@@ -44,9 +47,11 @@ pkgname = mysql
 	depends = lz4
 	depends = libevent
 	depends = systemd-libs
-	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission
-	provides = mariadb=8.0.23
-	provides = mysql=8.0.23
+	depends = zstd
+	depends = bash
+	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format, mysql_setpermission, mysqldumpslow
+	provides = mariadb=8.0.24
+	provides = mysql=8.0.24
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -58,9 +63,9 @@ pkgname = libmysqlclient
 	depends = libsasl
 	depends = zlib
 	depends = zstd
-	provides = libmariadbclient=8.0.23
-	provides = libmysqlclient=8.0.23
-	provides = mariadb-libs=8.0.23
+	provides = libmariadbclient=8.0.24
+	provides = libmysqlclient=8.0.24
+	provides = mariadb-libs=8.0.24
 	conflicts = libmariadbclient
 	conflicts = mariadb-libs
 
@@ -72,7 +77,9 @@ pkgname = mysql-clients
 	depends = jemalloc
 	depends = libedit
 	depends = lz4
-	provides = mariadb-clients=8.0.23
-	provides = mysql-clients=8.0.23
+	depends = zstd
+	depends = bash
+	provides = mariadb-clients=8.0.24
+	provides = mysql-clients=8.0.24
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index 1af61b1b0542..de7aed76caea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,13 @@
 
 pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
 pkgbase=mysql
-pkgver=8.0.23
+pkgver=8.0.24
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition"
 arch=('x86_64')
-makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc'
-             'rpcsvc-proto' 'libtirpc' 'icu' 'libedit' 'libevent' 're2'
-             'rapidjson')
+makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'systemd-libs' 'libaio'
+             'jemalloc' 'rpcsvc-proto' 'libtirpc' 'icu' 'libedit' 'libevent'
+             're2' 'rapidjson')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
 source=("https://cdn.mysql.com/Downloads/MySQL-8.0/${pkgbase}-boost-${pkgver}.tar.gz"
@@ -20,13 +20,15 @@ source=("https://cdn.mysql.com/Downloads/MySQL-8.0/${pkgbase}-boost-${pkgver}.ta
         "mysql-ld.so.conf"
         "mysql.sysconfig"
         "mysqld_service.patch"
-        "systemd-sysusers-tmpfiles.patch")
-sha256sums=('1c7a424303c134758e59607a0b3172e43a21a27ff08e8c88c2439ffd4fc724a5'
+        "systemd-tmpfiles.patch"
+        "systemd-sysusers.conf")
+sha256sums=('4bc9c54b38e9e2a3f5cc77f21791dc52372f15c5473f7d427793f6ec44bf5900'
             '6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328'
             'e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f'
             '203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae'
             '8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af'
-            'e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77')
+            'e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77'
+            '200a992eb41c95efa99845d017439ddd4018a3e51f57ffca8cb802b0d25123f1')
 
 build() {
   rm -rf build
@@ -107,7 +109,7 @@ package_libmysqlclient(){
 
 package_mysql-clients(){
   pkgdesc="MySQL client tools"
-  depends=('libmysqlclient' 'zlib' 'openssl' 'jemalloc' 'libedit' 'lz4')
+  depends=('libmysqlclient' 'zlib' 'openssl' 'jemalloc' 'libedit' 'lz4' 'zstd' 'bash')
   conflicts=('mariadb-clients')
   provides=("mariadb-clients=${pkgver}" "mysql-clients=${pkgver}")
 
@@ -131,6 +133,7 @@ package_mysql-clients(){
   # provided by mysql
   rm "${pkgdir}/usr/bin/mysql_upgrade"
   rm "${pkgdir}/usr/bin/mysqlbinlog"
+  rm "${pkgdir}/usr/bin/mysql_migrate_keyring"
   rm "${pkgdir}/usr/bin/mysqlpump"
   rm "${pkgdir}/usr/bin/mysql_secure_installation"
   rm "${pkgdir}/usr/bin/mysql_ssl_rsa_setup"
@@ -144,10 +147,10 @@ package_mysql(){
           "etc/conf.d/${pkgname}.conf")
   install="${pkgbase}.install"
   depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc' 'icu'
-           'lz4' 'libevent' 'systemd-libs')
+           'lz4' 'libevent' 'systemd-libs' 'zstd' 'bash')
   conflicts=('mariadb')
   provides=("mariadb=${pkgver}" "mysql=${pkgver}")
-  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission')
+  optdepends=('perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format, mysql_setpermission, mysqldumpslow')
   options=('emptydirs')
 
   cd build
@@ -163,7 +166,7 @@ package_mysql(){
   rm "${pkgdir}/usr/lib/libmysqlclient.a"
   rm "${pkgdir}/usr/lib/libmysqlclient.so"
   rm "${pkgdir}/usr/lib/libmysqlclient.so.21"
-  rm "${pkgdir}/usr/lib/libmysqlclient.so.21.1.23"
+  rm "${pkgdir}/usr/lib/libmysqlclient.so.21.1.24"
   rm "${pkgdir}/usr/lib/libmysqlservices.a"
   rm "${pkgdir}/usr/lib/pkgconfig/mysqlclient.pc"
   rmdir "${pkgdir}/usr/lib/pkgconfig"
@@ -208,6 +211,8 @@ package_mysql(){
   # Move systemd files
   mv "${pkgdir}/usr/usr/lib/systemd" "${pkgdir}/usr/lib"
   mv "${pkgdir}/usr/usr/lib/tmpfiles.d" "${pkgdir}/usr/lib"
+  install -m 755 -d "${pkgdir}/usr/lib/sysusers.d"
+  install -m 644 "${srcdir}/systemd-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 
   # Move logrotate files
   install -d -m 755 "${pkgdir}/etc/logrotate.d/"
@@ -235,6 +240,6 @@ package_mysql(){
   #  * fix path to our config
   cd "${pkgdir}"
   patch -Np1 -i "${srcdir}/mysqld_service.patch"
-  patch -Np1 -i "${srcdir}/systemd-sysusers-tmpfiles.patch"
+  patch -Np1 -i "${srcdir}/systemd-tmpfiles.patch"
 }
 
diff --git a/mysql.install b/mysql.install
index 1037590b61ef..7c30ee5c4536 100644
--- a/mysql.install
+++ b/mysql.install
@@ -1,20 +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
-
-  groupadd -g 88 mysqlrouter &>/dev/null
-  useradd -u 88 -g mysqlrouter -d "/var/lib/mysqlrouter" -s /bin/false mysqlrouter &>/dev/null
-
-  if [[ ! -e "/var/lib/mysqlrouter" ]]; then
-    install -dm700 "/var/lib/mysqlrouter"
-    chown -R mysqlrouter:mysqlrouter "/var/lib/mysqlrouter" &>/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"
@@ -22,18 +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
-
-  if getent passwd mysqlrouter >/dev/null 2>&1; then
-    userdel mysqlrouter
-  fi
-  if getent group mysqlrouter >/dev/null 2>&1; then
-    groupdel mysqlrouter
-  fi
-}
diff --git a/systemd-sysusers.conf b/systemd-sysusers.conf
new file mode 100644
index 000000000000..71d6c26bda1c
--- /dev/null
+++ b/systemd-sysusers.conf
@@ -0,0 +1,3 @@
+u mysqlrouter 88 "MySQL" /var/lib/mysqlrouter
+u mysql 89 "MySQL" /var/lib/mysql
+
diff --git a/systemd-sysusers-tmpfiles.patch b/systemd-tmpfiles.patch
index 4116f3e43d18..4116f3e43d18 100644
--- a/systemd-sysusers-tmpfiles.patch
+++ b/systemd-tmpfiles.patch