Updated pkgbase mysql 8.0.28-1

3 files changed, 28 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9341d70b7135..f8903b898aad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mysql
 	pkgdesc = Fast SQL database server, community edition
-	pkgver = 8.0.27
+	pkgver = 8.0.28
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
@@ -17,21 +17,22 @@ pkgbase = mysql
 	makedepends = icu
 	makedepends = libedit
 	makedepends = libevent
+	makedepends = libfido2
 	makedepends = re2
 	makedepends = rapidjson
-	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz
+	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.28.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 = 74b5bc6ff88fe225560174a24b7d5ff139f4c17271c43000dbcf3dcc9507b3f9
+	sha256sums = 6dd0303998e70066d36905bd8fef1c01228ea182dbfbabc6c22ebacdbf8b5941
 	sha256sums = 6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328
 	sha256sums = e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f
 	sha256sums = 203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae
 	sha256sums = 8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af
-	sha256sums = e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77
+	sha256sums = d6af057a614a326fe25f28ccbe974e3388f5509ac18e2fb1a36d6822433ca17f
 	sha256sums = 200a992eb41c95efa99845d017439ddd4018a3e51f57ffca8cb802b0d25123f1
 
 pkgname = mysql
@@ -50,8 +51,8 @@ pkgname = mysql
 	depends = zstd
 	depends = bash
 	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format, mysql_setpermission, mysqldumpslow
-	provides = mariadb=8.0.27
-	provides = mysql=8.0.27
+	provides = mariadb=8.0.28
+	provides = mysql=8.0.28
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -63,9 +64,9 @@ pkgname = libmysqlclient
 	depends = libsasl
 	depends = zlib
 	depends = zstd
-	provides = libmariadbclient=8.0.27
-	provides = libmysqlclient=8.0.27
-	provides = mariadb-libs=8.0.27
+	provides = libmariadbclient=8.0.28
+	provides = libmysqlclient=8.0.28
+	provides = mariadb-libs=8.0.28
 	conflicts = libmariadbclient
 	conflicts = mariadb-libs
 
@@ -79,6 +80,6 @@ pkgname = mysql-clients
 	depends = lz4
 	depends = zstd
 	depends = bash
-	provides = mariadb-clients=8.0.27
-	provides = mysql-clients=8.0.27
+	provides = mariadb-clients=8.0.28
+	provides = mysql-clients=8.0.28
 	conflicts = mariadb-clients
diff --git a/PKGBUILD b/PKGBUILD
index 1f527ded8c79..21918505f338 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,13 @@
 
 pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
 pkgbase=mysql
-pkgver=8.0.27
+pkgver=8.0.28
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition"
 arch=('x86_64')
 makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'systemd-libs' 'libaio'
              'jemalloc' 'rpcsvc-proto' 'libtirpc' 'icu' 'libedit' 'libevent'
-             're2' 'rapidjson')
+             'libfido2' '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"
@@ -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=('74b5bc6ff88fe225560174a24b7d5ff139f4c17271c43000dbcf3dcc9507b3f9'
+sha256sums=('6dd0303998e70066d36905bd8fef1c01228ea182dbfbabc6c22ebacdbf8b5941'
             '6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328'
             'e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f'
             '203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae'
             '8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af'
-            'e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77'
+            '2df5f37482a5ba8bae3701924a3bd7ff558008b968e3ac2c40e407b1405b3d38'
             '200a992eb41c95efa99845d017439ddd4018a3e51f57ffca8cb802b0d25123f1')
 
 build() {
@@ -60,6 +60,7 @@ build() {
     -DROUTER_INSTALL_RUNTIMEDIR=run \
     -DROUTER_INSTALL_LOGDIR=var/log/mysqlrouter \
     -DWITH_SYSTEM_LIBS=ON \
+    -DWITH_FIDO=system \
     -DWITH_SSL=system \
     -DWITH_LIBWRAP=OFF \
     -DWITH_LTO=ON \
@@ -166,7 +167,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.27"
+  rm "${pkgdir}/usr/lib/libmysqlclient.so.21.2.28"
   rm "${pkgdir}/usr/lib/libmysqlservices.a"
   rm "${pkgdir}/usr/lib/pkgconfig/mysqlclient.pc"
   rmdir "${pkgdir}/usr/lib/pkgconfig"
diff --git a/systemd-tmpfiles.patch b/systemd-tmpfiles.patch
index 4116f3e43d18..07925a3dd139 100644
--- a/systemd-tmpfiles.patch
+++ b/systemd-tmpfiles.patch
@@ -1,16 +1,15 @@
---- a/usr/lib/tmpfiles.d/mysql.conf	2020-05-04 00:44:00.673600092 +0200
-+++ b/usr/lib/tmpfiles.d/mysql.conf	2020-05-04 00:44:21.536926656 +0200
-@@ -20,4 +20,5 @@
- # along with this program; if not, write to the Free Software
+diff -Naur a/usr/lib/tmpfiles.d/mysql.conf b/usr/lib/tmpfiles.d/mysql.conf
+--- a/usr/lib/tmpfiles.d/mysql.conf	2022-01-29 17:27:06.996635977 +0100
++++ b/usr/lib/tmpfiles.d/mysql.conf	2022-01-29 17:28:52.839503490 +0100
+@@ -21,3 +21,4 @@
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  
--d /var/run/mysqld 0755 mysql mysql  -
-+d /run/mysqld 0755 mysql mysql  -
+ d /run/mysqld 0755 mysql mysql  -
 +d /var/lib/mysql 0700 mysql mysql  -
-
---- a/usr/lib/tmpfiles.d/mysqlrouter.conf  2020-12-25 21:41:47.218202248 +1100
-+++ b/usr/lib/tmpfiles.d/mysqlrouter.conf  2020-12-25 21:42:07.126124043 +1100
-@@ -20,4 +20,6 @@
+diff -Naur a/usr/lib/tmpfiles.d/mysqlrouter.conf b/usr/lib/tmpfiles.d/mysqlrouter.conf
+--- a/usr/lib/tmpfiles.d/mysqlrouter.conf	2022-01-29 17:47:51.586650998 +0100
++++ b/usr/lib/tmpfiles.d/mysqlrouter.conf	2022-01-29 17:48:27.181437880 +0100
+@@ -20,4 +20,7 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  
@@ -18,4 +17,4 @@
 +d /run/mysqlrouter 0755 mysqlrouter mysqlrouter  -
 +d /var/lib/mysqlrouter 0700 mysqlrouter mysqlrouter  -
 +d /var/log/mysqlrouter 0750 mysqlrouter mysqlrouter  -
-
++