From 5ff3c126c417fd5a62b303944b2cc2903a03ab97 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Wed, 27 Jan 2021 01:58:07 +0100
Subject: [PATCH] mysql: updated to 5.7.33

---
 mysql/.footprint |  4 ++--
 mysql/.signature |  8 ++++----
 mysql/Pkgfile    | 45 +++++++++++++++++++++++++--------------------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/mysql/.footprint b/mysql/.footprint
index fae4ed5..bad0edd 100644
--- a/mysql/.footprint
+++ b/mysql/.footprint
@@ -159,8 +159,8 @@ drwxr-xr-x	root/root	usr/include/mysql/mysql/psi/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmysqlclient.a
 lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so -> libmysqlclient.so.20
-lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so.20 -> libmysqlclient.so.20.3.19
--rwxr-xr-x	root/root	usr/lib/libmysqlclient.so.20.3.19
+lrwxrwxrwx	root/root	usr/lib/libmysqlclient.so.20 -> libmysqlclient.so.20.3.20
+-rwxr-xr-x	root/root	usr/lib/libmysqlclient.so.20.3.20
 -rw-r--r--	root/root	usr/lib/libmysqld.a
 -rw-r--r--	root/root	usr/lib/libmysqlservices.a
 drwxr-xr-x	root/root	usr/lib/mysql/
diff --git a/mysql/.signature b/mysql/.signature
index ee06806..81ab179 100644
--- a/mysql/.signature
+++ b/mysql/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt-arm64.pub
-RWRitF9a2DJqMZ0WGCR7urIDv/JMpWBP5ImUys+ThvWIVIVFgcFbxd1tEgK2zqYVwzdeSYZaycrzik678iiBa4N20L3aiD3J3AY=
-SHA256 (Pkgfile) = 89a372bf62faca11debe1b628cd3937f3a55fbd1f484a6714f7b242ec5cff422
-SHA256 (.footprint) = e0c4b9981944d6976f3944f69622c08ce0aeb9dd88285ad7df1a842cd54628c3
-SHA256 (mysql-boost-5.7.32.tar.gz) = 9a8a04a2b0116ccff9a8d8aace07aaeaacf47329b701c5dfa9fa4351d3f1933b
+RWRitF9a2DJqMSYazPpGVmpeJ1pMkRLOmziBBomF79JO1SL6ewozAUkPjYYdbQnXyzqPe+raLRSCRW0yeDhID3my/oE3tJPdyQk=
+SHA256 (Pkgfile) = 34ddc9b9b6cf8b0e3ecde890f5b8f9d5bd193aa3697ce3a49cad0360126ce806
+SHA256 (.footprint) = 71ed8ba7ef1107c815825071c283b667f61057ba04cd301e9b7ca058be80c2d3
+SHA256 (mysql-boost-5.7.33.tar.gz) = cfcaf6f37a055d808fe1472eb0359864e2227aa0206c55c4e1961bab2ecc304b
 SHA256 (my.cnf) = 51d46fe239e1e18a608e64ea1242fda946c2ea5a9ecea4507d89734e263ab828
 SHA256 (mysqld) = 35c913fde78b6e51e35bd57a01419209258e80677fdd6a1eaa40388848167e33
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 3dc7065..33483e4 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -2,35 +2,40 @@
 # URL: http://www.mysql.com
 # Maintainer: Juergen Daubert, jue at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: ncurses zlib openssl cmake libaio
+# Depends on: ncurses zlib openssl cmake libaio rpcsvc-proto
 
 name=mysql
-version=5.7.32
+version=5.7.33
 release=1
 source=(https://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.7/$name-boost-$version.tar.gz \
         my.cnf mysqld)
 
 build () {
-  cd $name-$version
+  export CXXFLAGS+=" -Wno-deprecated-declarations"
 
-  cmake . \
-        -DBUILD_CONFIG=mysql_release \
-        -DINSTALL_LAYOUT=RPM \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DSYSCONFDIR=/etc \
-        -DINSTALL_LIBDIR=lib \
-        -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-        -DINSTALL_MANDIR=share/man \
-        -DINSTALL_SECURE_PRIVDIR=/var/lib/mysql-files \
-        -DWITH_BOOST=./boost \
-        -DWITH_LIBWRAP=0 \
-        -DWITH_SSL=system \
-        -DWITH_ZLIB=system \
-        -DCMAKE_C_FLAGS="-O2 -pipe" \
-        -DCMAKE_CXX_FLAGS="-O2 -pipe"
+  cmake -S $name-$version -B build \
+        -D CMAKE_BUILD_TYPE=Release \
+        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+        -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+        -D CMAKE_INSTALL_PREFIX=/usr \
+        -D BUILD_CONFIG=mysql_release \
+        -D INSTALL_LAYOUT=RPM \
+        -D SYSCONFDIR=/etc \
+        -D INSTALL_LIBDIR=lib \
+        -D INSTALL_PLUGINDIR=lib/mysql/plugin \
+        -D INSTALL_MANDIR=share/man \
+        -D INSTALL_SECURE_PRIVDIR=/var/lib/mysql-files \
+        -D WITH_BOOST=$name-$version/boost \
+        -D WITH_LIBWRAP=0 \
+        -D WITH_SSL=system \
+        -D WITH_ZLIB=system \
+        -Wno-dev
 
-  make
-  make DESTDIR=$PKG install
+#        -DCMAKE_C_FLAGS="-O2 -pipe" \
+#        -DCMAKE_CXX_FLAGS="-O2 -pipe"
+
+  cmake --build build
+  DESTDIR=$PKG cmake --install build
 
   rm -r $PKG/usr/share/{mysql-test,info}
   rm $PKG/usr/share/mysql/charsets/README
-- 
2.26.2