Updated package mysql57 5.7.23-1

3 files changed, 17 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1b47a07ef07..9cf75fa5f79b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 29 22:38:29 UTC 2018
+# Sat Aug 11 16:38:57 UTC 2018
 pkgbase = mysql57
 	pkgdesc = Fast SQL database server, community edition, v5.7
-	pkgver = 5.7.22
-	pkgrel = 2
+	pkgver = 5.7.23
+	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
 	license = GPL
@@ -16,22 +16,14 @@ pkgbase = mysql57
 	makedepends = rpcsvc-proto
 	makedepends = libtirpc
 	options = !libtool
-	source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.22.tar.gz
+	source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.23.tar.gz
 	source = http://sourceforge.net/projects/boost/files/boost/1.59.0/boost_1_59_0.tar.gz
-	source = bug_83814_my_aes_openssl.patch::https://bugs.mysql.com/file.php?id=25081&bug_id=83814
-	source = bug_83814_viosslfactories.patch::https://bugs.mysql.com/file.php?id=25082&bug_id=83814
-	source = bug_83814_xcom_ssl_transport.c.patch::https://bugs.mysql.com/file.php?id=25084&bug_id=83814
-	source = bug_83814_mysqld.cc.patch::https://bugs.mysql.com/file.php?id=25085&bug_id=83814
 	source = mysqld-post.sh
 	source = mysqld-tmpfile.conf
 	source = mysqld.service
 	source = my-default.cnf
-	sha256sums = 4eb8405b0a9acb0381eae94c1741b2850dfc6467742b24b676e62b566409cff2
+	sha256sums = 0730f2d5520bfac359e9272da6c989d0006682eacfdc086a139886c0741f6c65
 	sha256sums = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
-	sha256sums = 1353162f5ae6e3dd4b0b8660738adbbc36c6d514d65331c013d9c45359665c52
-	sha256sums = ca49f11ed70d4673d14df700caff4380ae27b81d4d10c7a49297d5b56f0eb288
-	sha256sums = 4d2333651b0727fbe182155b3c5b01e00a2769f4e0158d28a09fefc61ae5f198
-	sha256sums = a063a76ea1705423218e36a45417a3077643a0b673ce676294c864bcb4052ec2
 	sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
 	sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
 	sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
@@ -46,7 +38,8 @@ pkgname = mysql57
 	depends = jemalloc
 	depends = libaio
 	depends = libtirpc
-	provides = mariadb=5.7.22
+	provides = mariadb=5.7.23
+	provides = mysql=5.7.23
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -55,7 +48,8 @@ pkgname = libmysqlclient57
 	pkgdesc = MySQL client libraries, v5.7
 	depends = libsasl
 	depends = zlib
-	provides = libmariadbclient=5.7.22
+	provides = libmariadbclient=5.7.23
+	provides = libmysqlclient=5.7.23
 	conflicts = libmariadbclient
 
 pkgname = mysql-clients57
@@ -64,6 +58,7 @@ pkgname = mysql-clients57
 	depends = zlib
 	depends = openssl
 	depends = jemalloc
-	provides = mariadb-clients=5.7.22
+	provides = mariadb-clients=5.7.23
+	provides = mysql-clients=5.7.23
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index 24836478d2ac..5f23db266f66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 pkgname=('mysql57' 'libmysqlclient57' 'mysql-clients57')
 _pkgname=mysql
 pkgbase=mysql57
-pkgver=5.7.22
-pkgrel=2
+pkgver=5.7.23
+pkgrel=1
 pkgdesc="Fast SQL database server, community edition, v5.7"
 arch=('x86_64')
 makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc'
@@ -18,37 +18,17 @@ url="https://www.mysql.com/products/community/"
 options=('!libtool')
 source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${_pkgname}-${pkgver}.tar.gz"
         "http://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz"
-        "bug_83814_my_aes_openssl.patch"::"https://bugs.mysql.com/file.php?id=25081&bug_id=83814"
-        "bug_83814_viosslfactories.patch"::"https://bugs.mysql.com/file.php?id=25082&bug_id=83814"
-        "bug_83814_xcom_ssl_transport.c.patch"::"https://bugs.mysql.com/file.php?id=25084&bug_id=83814"
-        "bug_83814_mysqld.cc.patch"::"https://bugs.mysql.com/file.php?id=25085&bug_id=83814"
         "mysqld-post.sh"
         "mysqld-tmpfile.conf"
         "mysqld.service"
         "my-default.cnf")
-sha256sums=('4eb8405b0a9acb0381eae94c1741b2850dfc6467742b24b676e62b566409cff2'
+sha256sums=('0730f2d5520bfac359e9272da6c989d0006682eacfdc086a139886c0741f6c65'
             '47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
-            '1353162f5ae6e3dd4b0b8660738adbbc36c6d514d65331c013d9c45359665c52'
-            'ca49f11ed70d4673d14df700caff4380ae27b81d4d10c7a49297d5b56f0eb288'
-            '4d2333651b0727fbe182155b3c5b01e00a2769f4e0158d28a09fefc61ae5f198'
-            'a063a76ea1705423218e36a45417a3077643a0b673ce676294c864bcb4052ec2'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
             '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
             '3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d')
 
-prepare() {
-  cd "${_pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/bug_83814_my_aes_openssl.patch" \
-    "mysys_ssl/my_aes_openssl.cc"
-  patch -p0 -i "${srcdir}/bug_83814_viosslfactories.patch" \
-    "vio/viosslfactories.c"
-  patch -p0 -i "${srcdir}/bug_83814_xcom_ssl_transport.c.patch" \
-    "rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c"
-  patch -p0 -i "${srcdir}/bug_83814_mysqld.cc.patch" \
-    "sql/mysqld.cc"
-}
-
 build() {
   rm -rf build
   mkdir build
@@ -98,7 +78,7 @@ package_libmysqlclient57(){
   pkgdesc="MySQL client libraries, v5.7"
   depends=('libsasl' 'zlib')
   conflicts=('libmariadbclient')
-  provides=("libmariadbclient=${pkgver}")
+  provides=("libmariadbclient=${pkgver}" "libmysqlclient=${pkgver}")
 
   cd build
   for dir in include libmysql libmysqld libservices
@@ -119,7 +99,7 @@ package_mysql-clients57(){
   pkgdesc="MySQL client tools, v5.7"
   depends=('libmysqlclient57' 'zlib' 'openssl' 'jemalloc')
   conflicts=('mariadb-clients')
-  provides=("mariadb-clients=${pkgver}")
+  provides=("mariadb-clients=${pkgver}" "mysql-clients=${pkgver}")
 
   cd build
   make -C "client" DESTDIR="${pkgdir}" install
@@ -148,7 +128,7 @@ package_mysql57(){
   install="${_pkgname}.install"
   depends=('mysql-clients57' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc')
   conflicts=('mariadb')
-  provides=("mariadb=${pkgver}")
+  provides=("mariadb=${pkgver}" "mysql=${pkgver}")
   options=('emptydirs')
 
   cd build
diff --git a/mysql.install b/mysql.install
index c534f40cfafb..90583a1e83c4 100644
--- a/mysql.install
+++ b/mysql.install
@@ -7,8 +7,6 @@ post_install(){
     chown -R mysql:mysql "/var/lib/mysql" &>/dev/null
   fi
 
-  /usr/bin/systemd-tmpfiles --create mysqld.conf
-
   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"