Updated pkgbase mysql 8.0.13-1

3 files changed, 44 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68e99b7abb05..2c365a2dc1fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Aug 11 18:09:11 UTC 2018
+# Sat Oct 27 23:20:14 UTC 2018
 pkgbase = mysql
 	pkgdesc = Fast SQL database server, community edition
-	pkgver = 8.0.12
+	pkgver = 8.0.13
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
@@ -15,19 +15,23 @@ pkgbase = mysql
 	makedepends = jemalloc
 	makedepends = rpcsvc-proto
 	makedepends = libtirpc
+	makedepends = icu
 	options = !libtool
-	source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-8.0.12.tar.gz
+	options = !ccache
+	source = https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-8.0.13.tar.gz
 	source = http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.gz
 	source = mysqld-post.sh
 	source = mysqld-tmpfile.conf
 	source = mysqld.service
 	source = my-default.cnf
-	sha256sums = 69f16e20834dbc60cb28d6df7351deda323330b9de685d22415f135bcedd1b20
+	source = mysql-ld.so.conf
+	sha256sums = d85eb7f98b6aa3e2c6fe38263bf40b22acb444a4ce1f4668473e9e59fb98d62e
 	sha256sums = 8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665
 	sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
 	sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
 	sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
 	sha256sums = 3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d
+	sha256sums = e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f
 
 pkgname = mysql
 	pkgdesc = Fast SQL database server, community edition
@@ -38,8 +42,9 @@ pkgname = mysql
 	depends = jemalloc
 	depends = libaio
 	depends = libtirpc
-	provides = mariadb=8.0.12
-	provides = mysql=8.0.12
+	depends = icu
+	provides = mariadb=8.0.13
+	provides = mysql=8.0.13
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -48,8 +53,8 @@ pkgname = libmysqlclient
 	pkgdesc = MySQL client libraries
 	depends = libsasl
 	depends = zlib
-	provides = libmariadbclient=8.0.12
-	provides = libmysqlclient=8.0.12
+	provides = libmariadbclient=8.0.13
+	provides = libmysqlclient=8.0.13
 	conflicts = libmariadbclient
 
 pkgname = mysql-clients
@@ -58,7 +63,7 @@ pkgname = mysql-clients
 	depends = zlib
 	depends = openssl
 	depends = jemalloc
-	provides = mariadb-clients=8.0.12
-	provides = mysql-clients=8.0.12
+	provides = mariadb-clients=8.0.13
+	provides = mysql-clients=8.0.13
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a721118e997..2560d5a9843d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,28 +5,30 @@
 
 pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
 pkgbase=mysql
-pkgver=8.0.12
+pkgver=8.0.13
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition"
 arch=('x86_64')
 makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc'
-             'rpcsvc-proto' 'libtirpc')
+             'rpcsvc-proto' 'libtirpc' 'icu')
 _boost_ver=1.67.0
 license=('GPL')
 url="https://www.mysql.com/products/community/"
-options=('!libtool')
+options=('!libtool' '!ccache') # Sorry but actually ccache is not supported
 source=("https://dev.mysql.com/get/Downloads/MySQL-5.7/${pkgbase}-${pkgver}.tar.gz"
         "http://sourceforge.net/projects/boost/files/boost/${_boost_ver}/boost_${_boost_ver//./_}.tar.gz"
         "mysqld-post.sh"
         "mysqld-tmpfile.conf"
         "mysqld.service"
-        "my-default.cnf")
-sha256sums=('69f16e20834dbc60cb28d6df7351deda323330b9de685d22415f135bcedd1b20'
+        "my-default.cnf"
+        "mysql-ld.so.conf")
+sha256sums=('d85eb7f98b6aa3e2c6fe38263bf40b22acb444a4ce1f4668473e9e59fb98d62e'
             '8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
             '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
-            '3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d')
+            '3cc3ba4149fb2f9e823601b9a414ff5b28a2a52f20bc68c74cc0505cf2d1832d'
+            'e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f')
 
 build() {
   rm -rf build
@@ -56,6 +58,7 @@ build() {
     -DINSTALL_SHAREDIR=share/mysql \
     -DWITH_ZLIB=system \
     -DWITH_SSL=system \
+    -DWITH_ICU=system \
     -DWITH_LIBWRAP=OFF \
     -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \
     -DWITH_EXTRA_CHARSETS=complex \
@@ -67,8 +70,9 @@ build() {
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=ON \
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=ON \
     -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
-    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \
-    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" \
+    -DCMAKE_C_LINK_FLAGS="${LDFLAGS},-pie" \
+    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -std=gnu++11 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \
+    -DCMAKE_CXX_LINK_FLAGS="${LDFLAGS},-pie" \
     -DWITH_BOOST="../boost_${_boost_ver//./_}"
   make
 }
@@ -123,7 +127,7 @@ package_mysql(){
   pkgdesc="Fast SQL database server, community edition"
   backup=('etc/mysql/my.cnf')
   install="${pkgbase}.install"
-  depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc')
+  depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc' 'icu')
   conflicts=('mariadb')
   provides=("mariadb=${pkgver}" "mysql=${pkgver}")
   options=('emptydirs')
@@ -136,10 +140,15 @@ package_mysql(){
   install -m 644 -D "${srcdir}/mysqld-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/mysqld.conf"
   install -m 755 -d "${pkgdir}/usr/lib/systemd/system"
   install -m 644 -D "${srcdir}/mysqld.service" "${pkgdir}/usr/lib/systemd/system/"
+  install -m 755 -d "${pkgdir}/etc/ld.so.conf.d"
+  install -m 644 -D "${srcdir}/mysql-ld.so.conf" "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
 
   # provided by libmysqlclient
   rm "${pkgdir}/usr/bin/mysql_config"
-  rm "${pkgdir}"/usr/lib/libmysql*
+  rm "${pkgdir}/usr/lib/libmysqlclient.so"
+  rm "${pkgdir}/usr/lib/libmysqlclient.so.21"
+  rm "${pkgdir}/usr/lib/libmysqlclient.so.21.0.13"
+  rm "${pkgdir}/usr/lib/libmysqlservices.a"
   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"
@@ -163,5 +172,14 @@ package_mysql(){
 
   # not needed
   rm -r "${pkgdir}/usr/mysql-test"
+  rmdir "${pkgdir}/usr/run"
+  rmdir "${pkgdir}/usr/data"
+
+  # Move somewhere else
+  mv "${pkgdir}/usr/LICENSE.router" "${pkgdir}/usr/share/mysql/docs"
+  mv "${pkgdir}/usr/README.router" "${pkgdir}/usr/share/mysql/docs"
+
+  # Fix permissions
+  chmod 755 "${pkgdir}/usr"
 }
 
diff --git a/mysql-ld.so.conf b/mysql-ld.so.conf
new file mode 100644
index 000000000000..6f61463563e9
--- /dev/null
+++ b/mysql-ld.so.conf
@@ -0,0 +1 @@
+/usr/lib/mysqlrouter