Updated pkgbase mysql 8.0.20-1

3 files changed, 44 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e3169a64273a..8a89ebdeece3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mysql
 	pkgdesc = Fast SQL database server, community edition
-	pkgver = 8.0.19
+	pkgver = 8.0.20
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
@@ -18,18 +18,18 @@ pkgbase = mysql
 	makedepends = libevent
 	makedepends = re2
 	makedepends = rapidjson
-	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.19.tar.gz
+	source = https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.20.tar.gz
 	source = my-default.cnf
 	source = mysql-ld.so.conf
 	source = mysql.sysconfig
 	source = mysqld_service.patch
 	source = systemd-sysusers-tmpfiles.patch
-	sha256sums = 3622d2a53236ed9ca62de0616a7e80fd477a9a3f862ba09d503da188f53ca523
+	sha256sums = b6ad1a09eb146fa913f1afc257bbed8ffab688e2d504fb8ddb652f69f551a9c1
 	sha256sums = 6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328
 	sha256sums = e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f
 	sha256sums = 203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae
 	sha256sums = 8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af
-	sha256sums = 9e585631cfe95da9d18df6c64fca370c0aff2b2cda5dc29f694579dab9d9f561
+	sha256sums = 7dfc863de8ba62b31e412bdb82a2617c90b9e588db34028ab694813547dab167
 
 pkgname = mysql
 	pkgdesc = Fast SQL database server, community edition
@@ -45,8 +45,8 @@ pkgname = mysql
 	depends = libevent
 	depends = systemd-libs
 	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission
-	provides = mariadb=8.0.19
-	provides = mysql=8.0.19
+	provides = mariadb=8.0.20
+	provides = mysql=8.0.20
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -57,9 +57,9 @@ pkgname = libmysqlclient
 	depends = libsasl
 	depends = zlib
 	depends = zstd
-	provides = libmariadbclient=8.0.19
-	provides = libmysqlclient=8.0.19
-	provides = mariadb-libs=8.0.19
+	provides = libmariadbclient=8.0.20
+	provides = libmysqlclient=8.0.20
+	provides = mariadb-libs=8.0.20
 	conflicts = libmariadbclient
 	conflicts = mariadb-libs
 
@@ -71,7 +71,7 @@ pkgname = mysql-clients
 	depends = jemalloc
 	depends = libedit
 	depends = lz4
-	provides = mariadb-clients=8.0.19
-	provides = mysql-clients=8.0.19
+	provides = mariadb-clients=8.0.20
+	provides = mysql-clients=8.0.20
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index eb0008f73eea..f51c92094f47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
 pkgbase=mysql
-pkgver=8.0.19
+pkgver=8.0.20
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition"
 arch=('x86_64')
@@ -21,12 +21,12 @@ source=("https://cdn.mysql.com/Downloads/MySQL-8.0/${pkgbase}-boost-${pkgver}.ta
         "mysql.sysconfig"
         "mysqld_service.patch"
         "systemd-sysusers-tmpfiles.patch")
-sha256sums=('3622d2a53236ed9ca62de0616a7e80fd477a9a3f862ba09d503da188f53ca523'
+sha256sums=('b6ad1a09eb146fa913f1afc257bbed8ffab688e2d504fb8ddb652f69f551a9c1'
             '6bc24ae510f6b6bbad6b3edda2d0028b29292937b482274a4c2fae335f4de328'
             'e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f'
             '203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae'
             '8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af'
-            '9e585631cfe95da9d18df6c64fca370c0aff2b2cda5dc29f694579dab9d9f561')
+            '7dfc863de8ba62b31e412bdb82a2617c90b9e588db34028ab694813547dab167')
 
 build() {
   rm -rf build
@@ -96,16 +96,9 @@ package_libmysqlclient(){
     make -C "${dir}" DESTDIR="${pkgdir}" install
   done
 
-  install -m 755 -d "${pkgdir}/usr/bin"
-  install -m 755 scripts/mysql_config "${pkgdir}/usr/bin/"
-  install -m 755 -d "${pkgdir}/usr/share/man/man1"
   install -m 700 -d "${pkgdir}/var/lib/mysql"
   install -m 644 -D "${srcdir}/my-default.cnf" "${pkgdir}/etc/mysql/my.cnf.default"
   install -m 644 -D "${srcdir}/${pkgbase}-${pkgver}/support-files/mysql.m4" "${pkgdir}/usr/share/aclocal/mysql.m4"
-  for man in mysql_config
-  do
-    install -m 644 "${srcdir}/${pkgbase}-${pkgver}/man/${man}.1" "${pkgdir}/usr/share/man/man1/${man}.1"
-  done
 }
 
 package_mysql-clients(){
@@ -117,16 +110,22 @@ package_mysql-clients(){
   cd build
   make -C "client" DESTDIR="${pkgdir}" install
 
+  install -m 755 -d "${pkgdir}/usr/bin"
+  install -m 755 "runtime_output_directory/mysql_client_test" "${pkgdir}/usr/bin"
+  install -m 755 "scripts/mysql_config" "${pkgdir}/usr/bin"
+
   # install man pages
-  install -d "${pkgdir}/usr/share/man/man1"
-  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
+  install -m 755 -d "${pkgdir}/usr/share/man/man1"
+  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysql_config mysql_config_editor
   do
-    install -m644 "${srcdir}/${pkgbase}-${pkgver}/man/${man}.1" "${pkgdir}/usr/share/man/man1/${man}.1"
+    install -m 644 "${srcdir}/${pkgbase}-${pkgver}/man/${man}.1" "${pkgdir}/usr/share/man/man1/${man}.1"
   done
 
+  # install pkgconfig
+  install -m 644 -D "${srcdir}/build/scripts/mysqlclient.pc" "${pkgdir}/usr/lib/pkgconfig/mysqlclient.pc"
+
   # provided by mysql
   rm "${pkgdir}/usr/bin/mysql_upgrade"
-  rm "${pkgdir}/usr/bin/mysql_config_editor"
   rm "${pkgdir}/usr/bin/mysqlbinlog"
   rm "${pkgdir}/usr/bin/mysqlpump"
   rm "${pkgdir}/usr/bin/mysql_secure_installation"
@@ -155,35 +154,37 @@ package_mysql(){
 
   # provided by libmysqlclient
   rm "${pkgdir}/usr/bin/mysql_config"
+  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.19"
+  rm "${pkgdir}/usr/lib/libmysqlclient.so.21.1.20"
   rm "${pkgdir}/usr/lib/libmysqlservices.a"
+  rm "${pkgdir}/usr/lib/pkgconfig/mysqlclient.pc"
+  rmdir "${pkgdir}/usr/lib/pkgconfig"
   rm "${pkgdir}/usr/lib/mysql/plugin/authentication_ldap_sasl_client.so"
-  rm -r "${pkgdir}/usr/include/"
-  rm "${pkgdir}/usr/share/man/man1/mysql_config.1"
+  rm -r "${pkgdir}/usr/include"
   rm "${pkgdir}/usr/share/mysql/aclocal/mysql.m4"
-  rmdir "${pkgdir}/usr/share/mysql/aclocal/"
+  rmdir "${pkgdir}/usr/share/mysql/aclocal"
 
   # provided by mysql-clients
   rm "${pkgdir}/usr/bin/mysql"
   rm "${pkgdir}/usr/bin/mysqladmin"
-  rm "${pkgdir}/usr/bin/mysqlbinlog"
   rm "${pkgdir}/usr/bin/mysqlcheck"
   rm "${pkgdir}/usr/bin/mysqldump"
   rm "${pkgdir}/usr/bin/mysqlimport"
   rm "${pkgdir}/usr/bin/mysqlshow"
   rm "${pkgdir}/usr/bin/mysqlslap"
-  rm "${pkgdir}/usr/bin/mysql_upgrade"
+  rm "${pkgdir}/usr/bin/mysql_client_test"
+  rm "${pkgdir}/usr/bin/mysql_config_editor"
   rm "${pkgdir}/usr/share/man/man1/mysql.1"
   rm "${pkgdir}/usr/share/man/man1/mysqladmin.1"
-  rm "${pkgdir}/usr/share/man/man1/mysqlbinlog.1"
   rm "${pkgdir}/usr/share/man/man1/mysqlcheck.1"
+  rm "${pkgdir}/usr/share/man/man1/mysql_config.1"
+  rm "${pkgdir}/usr/share/man/man1/mysql_config_editor.1"
   rm "${pkgdir}/usr/share/man/man1/mysqldump.1"
   rm "${pkgdir}/usr/share/man/man1/mysqlimport.1"
   rm "${pkgdir}/usr/share/man/man1/mysqlshow.1"
   rm "${pkgdir}/usr/share/man/man1/mysqlslap.1"
-  rm "${pkgdir}/usr/share/man/man1/mysql_upgrade.1"
 
   # not needed
   rm -r "${pkgdir}/usr/mysql-test"
@@ -194,14 +195,14 @@ package_mysql(){
   mv "${pkgdir}/usr/README.router" "${pkgdir}/usr/share/mysql/docs"
 
   # Create environment file
-  install -D -m 644 "${srcdir}/mysql.sysconfig" "${pkgdir}/etc/conf.d/${pkgname}.conf"
+  install -m 644 -D "${srcdir}/mysql.sysconfig" "${pkgdir}/etc/conf.d/${pkgname}.conf"
 
   # Fix permissions
   chmod 755 "${pkgdir}/usr"
 
   # Move systemd files
-  mv "${pkgdir}/usr/usr/lib/systemd" "${pkgdir}/usr/lib/"
-  mv "${pkgdir}/usr/usr/lib/tmpfiles.d" "${pkgdir}/usr/lib/"
+  mv "${pkgdir}/usr/usr/lib/systemd" "${pkgdir}/usr/lib"
+  mv "${pkgdir}/usr/usr/lib/tmpfiles.d" "${pkgdir}/usr/lib"
 
   # Cleanup
   rmdir "${pkgdir}/usr/usr/lib"
diff --git a/systemd-sysusers-tmpfiles.patch b/systemd-sysusers-tmpfiles.patch
index cd2cd803bd1c..6eccab1f62dd 100644
--- a/systemd-sysusers-tmpfiles.patch
+++ b/systemd-sysusers-tmpfiles.patch
@@ -1,7 +1,10 @@
---- a/usr/lib/tmpfiles.d/mysql.conf
-+++ b/usr/lib/tmpfiles.d/mysql.conf
-@@ -21,3 +21,4 @@
+--- 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
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  
- d /var/run/mysqld 0755 mysql mysql  -
+-d /var/run/mysqld 0755 mysql mysql  -
++d /run/mysqld 0755 mysql mysql  -
 +d /var/lib/mysql 0700 mysql mysql  -
+