Updated pkgbase mysql56 5.6.42-1

2 files changed, 14 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27655293d2eb..1330c539c8f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Aug 11 15:34:02 UTC 2018
+# Sun Oct 28 13:24:17 UTC 2018
 pkgbase = mysql56
 	pkgdesc = Fast SQL database server, community edition v5.6
-	pkgver = 5.6.41
+	pkgver = 5.6.42
 	pkgrel = 1
 	url = https://www.mysql.com/products/community/
 	arch = i686
@@ -14,12 +14,12 @@ pkgbase = mysql56
 	makedepends = libaio
 	makedepends = jemalloc
 	options = !libtool
-	source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.41.tar.gz
+	source = https://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.42.tar.gz
 	source = mysqld-post.sh
 	source = mysqld-tmpfile.conf
 	source = mysqld.service
 	source = mysql-srv_buf_size.patch
-	sha256sums = 4a223c3daed88f8450fa2fc8fd0e7afe2b1a122dd58b74c4ea6526d6a72563ce
+	sha256sums = fc6d4aa9c2ed1a751163d0ec3d35bf800fc6b7c9bd2f890e376b6810c9393dba
 	sha256sums = 368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd
 	sha256sums = 2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd
 	sha256sums = 50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556
@@ -31,8 +31,8 @@ pkgname = mysql56
 	depends = mysql-clients56
 	depends = libaio
 	depends = perl
-	provides = mariadb=5.6.41
-	provides = mysql=5.6.41
+	provides = mariadb=5.6.42
+	provides = mysql=5.6.42
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
@@ -41,8 +41,8 @@ pkgname = libmysqlclient56
 	pkgdesc = MySQL client libraries, v5.6
 	depends = zlib
 	depends = bash
-	provides = libmariadbclient=5.6.41
-	provides = libmysqlclient=5.6.41
+	provides = libmariadbclient=5.6.42
+	provides = libmysqlclient=5.6.42
 	conflicts = libmariadbclient
 
 pkgname = mysql-clients56
@@ -50,7 +50,7 @@ pkgname = mysql-clients56
 	depends = libmysqlclient56
 	depends = jemalloc
 	depends = ncurses
-	provides = mariadb-clients=5.6.41
-	provides = mysql-clients=5.6.41
+	provides = mariadb-clients=5.6.42
+	provides = mysql-clients=5.6.42
 	conflicts = mariadb-clients
 
diff --git a/PKGBUILD b/PKGBUILD
index fd9a1669ceeb..44b206293a2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=('mysql56' 'libmysqlclient56' 'mysql-clients56')
 _pkgname=mysql
 pkgbase=mysql56
-pkgver=5.6.41
+pkgver=5.6.42
 pkgrel=1
 pkgdesc="Fast SQL database server, community edition v5.6"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ source=("https://dev.mysql.com/get/Downloads/MySQL-5.6/${_pkgname}-${pkgver}.tar
         "mysqld-tmpfile.conf"
         "mysqld.service"
         "mysql-srv_buf_size.patch")
-sha256sums=('4a223c3daed88f8450fa2fc8fd0e7afe2b1a122dd58b74c4ea6526d6a72563ce'
+sha256sums=('fc6d4aa9c2ed1a751163d0ec3d35bf800fc6b7c9bd2f890e376b6810c9393dba'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd'
             '50212165bdb09855b97b15a917464ba34f82edf30a0c43f9a0c93a27071df556'
@@ -69,8 +69,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_C_LINK_FLAGS="${LDFLAGS},-pie" \
     -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
-    -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
+    -DCMAKE_CXX_LINK_FLAGS="${LDFLAGS},-pie"
   make
 }