Updated pkgbase mysql 8.0.29-1

3 files changed, 22 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1a40f454f80..b24d8b4bf8bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mysql
 	pkgdesc = Fast SQL database server, community edition
-	pkgver = 8.0.28
+	pkgver = 8.0.29
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
@@ -20,19 +20,19 @@ pkgbase = mysql
 	makedepends = libfido2
 	makedepends = re2
 	makedepends = rapidjson
-	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.28.tar.gz
+	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.29.tar.gz
 	source = my-default.cnf
 	source = mysql-ld.so.conf
 	source = mysql.sysconfig
 	source = mysqld_service.patch
 	source = systemd-tmpfiles.patch
 	source = systemd-sysusers.conf
-	sha256sums = 6dd0303998e70066d36905bd8fef1c01228ea182dbfbabc6c22ebacdbf8b5941
+	sha256sums = fd34a84c65fc7b15609d55b1f5d128c4d5543a6b95fa638569c3277c5c7bb048
 	sha256sums = 6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328
 	sha256sums = e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f
 	sha256sums = 203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae
 	sha256sums = 8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af
-	sha256sums = 2df5f37482a5ba8bae3701924a3bd7ff558008b968e3ac2c40e407b1405b3d38
+	sha256sums = 270074dc0a01e0f959590ad95e5bbaaac3f821bb44eba32d039a6aee506b9c6a
 	sha256sums = 200a992eb41c95efa99845d017439ddd4018a3e51f57ffca8cb802b0d25123f1
 
 pkgname = mysql
@@ -51,12 +51,13 @@ pkgname = mysql
 	depends = zstd
 	depends = bash
 	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format, mysql_setpermission, mysqldumpslow
-	provides = mariadb=8.0.28
-	provides = mysql=8.0.28
+	provides = mariadb=8.0.29
+	provides = mysql=8.0.29
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
 	backup = etc/mysqlrouter/mysqlrouter.conf
+	backup = etc/logrotate.d/mysqlrouter
 	backup = etc/conf.d/mysql.conf
 
 pkgname = libmysqlclient
@@ -64,9 +65,9 @@ pkgname = libmysqlclient
 	depends = libsasl
 	depends = zlib
 	depends = zstd
-	provides = libmariadbclient=8.0.28
-	provides = libmysqlclient=8.0.28
-	provides = mariadb-libs=8.0.28
+	provides = libmariadbclient=8.0.29
+	provides = libmysqlclient=8.0.29
+	provides = mariadb-libs=8.0.29
 	conflicts = libmariadbclient
 	conflicts = mariadb-libs
 
@@ -80,6 +81,6 @@ pkgname = mysql-clients
 	depends = lz4
 	depends = zstd
 	depends = bash
-	provides = mariadb-clients=8.0.28
-	provides = mysql-clients=8.0.28
+	provides = mariadb-clients=8.0.29
+	provides = mysql-clients=8.0.29
 	conflicts = mariadb-clients
diff --git a/PKGBUILD b/PKGBUILD
index 21918505f338..04e514fc738a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
 pkgbase=mysql
-pkgver=8.0.28
+pkgver=8.0.29
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition"
 arch=('x86_64')
@@ -22,12 +22,12 @@ source=("https://cdn.mysql.com/Downloads/MySQL-8.0/${pkgbase}-boost-${pkgver}.ta
         "mysqld_service.patch"
         "systemd-tmpfiles.patch"
         "systemd-sysusers.conf")
-sha256sums=('6dd0303998e70066d36905bd8fef1c01228ea182dbfbabc6c22ebacdbf8b5941'
+sha256sums=('fd34a84c65fc7b15609d55b1f5d128c4d5543a6b95fa638569c3277c5c7bb048'
             '6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328'
             'e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f'
             '203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae'
             '8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af'
-            '2df5f37482a5ba8bae3701924a3bd7ff558008b968e3ac2c40e407b1405b3d38'
+            '270074dc0a01e0f959590ad95e5bbaaac3f821bb44eba32d039a6aee506b9c6a'
             '200a992eb41c95efa99845d017439ddd4018a3e51f57ffca8cb802b0d25123f1')
 
 build() {
@@ -55,10 +55,10 @@ build() {
     -DINSTALL_MYSQLSHAREDIR=share/mysql \
     -DINSTALL_DOCDIR=share/mysql/docs \
     -DINSTALL_SHAREDIR=share/mysql \
-    -DROUTER_INSTALL_CONFIGDIR=etc/mysqlrouter \
-    -DROUTER_INSTALL_DATADIR=var/lib/mysqlrouter \
-    -DROUTER_INSTALL_RUNTIMEDIR=run \
-    -DROUTER_INSTALL_LOGDIR=var/log/mysqlrouter \
+    -DROUTER_INSTALL_CONFIGDIR=../etc/mysqlrouter \
+    -DROUTER_INSTALL_DATADIR=/var/lib/mysqlrouter \
+    -DROUTER_INSTALL_RUNTIMEDIR=/run \
+    -DROUTER_INSTALL_LOGDIR=/var/log/mysqlrouter \
     -DWITH_SYSTEM_LIBS=ON \
     -DWITH_FIDO=system \
     -DWITH_SSL=system \
@@ -145,6 +145,7 @@ package_mysql(){
   pkgdesc="Fast SQL database server, community edition"
   backup=("etc/mysql/my.cnf"
           "etc/mysqlrouter/mysqlrouter.conf"
+          "etc/logrotate.d/mysqlrouter"
           "etc/conf.d/${pkgname}.conf")
   install="${pkgbase}.install"
   depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc' 'icu'
@@ -167,7 +168,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.2.28"
+  rm "${pkgdir}/usr/lib/libmysqlclient.so.21.2.29"
   rm "${pkgdir}/usr/lib/libmysqlservices.a"
   rm "${pkgdir}/usr/lib/pkgconfig/mysqlclient.pc"
   rmdir "${pkgdir}/usr/lib/pkgconfig"
@@ -223,16 +224,8 @@ package_mysql(){
   rmdir "${pkgdir}/usr/docs"
 
   # Cleanup
-  rmdir "${pkgdir}/usr/etc/mysqlrouter"
-  rmdir "${pkgdir}/usr/etc"
-  rmdir "${pkgdir}/usr/run"
   rmdir "${pkgdir}/usr/usr/lib"
   rmdir "${pkgdir}/usr/usr"
-  rmdir "${pkgdir}/usr/var/lib/mysqlrouter"
-  rmdir "${pkgdir}/usr/var/lib"
-  rmdir "${pkgdir}/usr/var/log/mysqlrouter"
-  rmdir "${pkgdir}/usr/var/log"
-  rmdir "${pkgdir}/usr/var"
 
   # Arch Linux specific patches:
   #  * enable PrivateTmp for a little bit more security
diff --git a/systemd-tmpfiles.patch b/systemd-tmpfiles.patch
index 07925a3dd139..d567794b4b64 100644
--- a/systemd-tmpfiles.patch
+++ b/systemd-tmpfiles.patch
@@ -13,7 +13,7 @@ diff -Naur a/usr/lib/tmpfiles.d/mysqlrouter.conf b/usr/lib/tmpfiles.d/mysqlroute
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  
--d run 0755 mysqlrouter mysqlrouter  -
+-d /run 0755 mysqlrouter mysqlrouter  -
 +d /run/mysqlrouter 0755 mysqlrouter mysqlrouter  -
 +d /var/lib/mysqlrouter 0700 mysqlrouter mysqlrouter  -
 +d /var/log/mysqlrouter 0750 mysqlrouter mysqlrouter  -