Updated pkgbase mysql 8.0.22-2

4 files changed, 51 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a902d65fb35..cc7864e3dd06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mysql
 	pkgdesc = Fast SQL database server, community edition
 	pkgver = 8.0.22
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mysql.com/products/community/
 	arch = x86_64
 	license = GPL
@@ -29,7 +29,7 @@ pkgbase = mysql
 	sha256sums = e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f
 	sha256sums = 203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae
 	sha256sums = 8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af
-	sha256sums = 7dfc863de8ba62b31e412bdb82a2617c90b9e588db34028ab694813547dab167
+	sha256sums = e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77
 
 pkgname = mysql
 	pkgdesc = Fast SQL database server, community edition
@@ -50,6 +50,7 @@ pkgname = mysql
 	conflicts = mariadb
 	options = emptydirs
 	backup = etc/mysql/my.cnf
+	backup = etc/mysqlrouter/mysqlrouter.conf
 	backup = etc/conf.d/mysql.conf
 
 pkgname = libmysqlclient
diff --git a/PKGBUILD b/PKGBUILD
index 4d305fe44e8e..ae8ef4182e60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=('mysql' 'libmysqlclient' 'mysql-clients')
 pkgbase=mysql
 pkgver=8.0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast SQL database server, community edition"
 arch=('x86_64')
 makedepends=('openssl' 'zlib' 'cmake' 'systemd-tools' 'libaio' 'jemalloc'
@@ -26,7 +26,7 @@ sha256sums=('ba765f74367c638d7cd1c546c05c14382fd997669bcd9680278e907f8d7eb484'
             'e1c23fa0971a13d998f2790379b68c475438d05b6d6f2691b99051dbf497567f'
             '203dcd22fea668477ac7123dbd9909fae72d3d07f8855417a669a9c94db072ae'
             '8fbedfc2c5fe271ed13217feeceeac00202d2cb135e4283eeee2f9a13d6251af'
-            '7dfc863de8ba62b31e412bdb82a2617c90b9e588db34028ab694813547dab167')
+            'e2abfc23fcc417e201a893cc7c8bdf847a275a35783d4d135d3b3a2ecf108d77')
 
 build() {
   rm -rf build
@@ -53,6 +53,10 @@ build() {
     -DINSTALL_MYSQLSHAREDIR=share/mysql \
     -DINSTALL_DOCDIR=share/mysql/docs \
     -DINSTALL_SHAREDIR=share/mysql \
+    -DROUTER_INSTALL_CONFIGDIR=etc/mysqlrouter \
+    -DROUTER_INSTALL_DATADIR=var/lib/mysqlrouter \
+    -DROUTER_INSTALL_RUNTIMEDIR=run \
+    -DROUTER_INSTALL_LOGDIR=var/log/mysqlrouter \
     -DWITH_SYSTEM_LIBS=ON \
     -DWITH_SSL=system \
     -DWITH_LIBWRAP=OFF \
@@ -69,7 +73,7 @@ build() {
     -DPLUGIN_FEEDBACK=NO \
     -DCMAKE_C_FLAGS="${CFLAGS}" \
     -DCMAKE_C_LINK_FLAGS="${LDFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DU_DEFINE_FALSE_AND_TRUE=1" \
     -DCMAKE_CXX_LINK_FLAGS="${LDFLAGS}" \
     -DDEFAULT_CHARSET=utf8mb4 \
     -DDEFAULT_COLLATION=utf8mb4_unicode_ci \
@@ -136,6 +140,7 @@ package_mysql-clients(){
 package_mysql(){
   pkgdesc="Fast SQL database server, community edition"
   backup=("etc/mysql/my.cnf"
+          "etc/mysqlrouter/mysqlrouter.conf"
           "etc/conf.d/${pkgname}.conf")
   install="${pkgbase}.install"
   depends=('mysql-clients' 'libsasl' 'zlib' 'jemalloc' 'libaio' 'libtirpc' 'icu'
@@ -151,6 +156,7 @@ package_mysql(){
   install -m 644 -D "${srcdir}/my-default.cnf" "${pkgdir}/etc/mysql/my.cnf"
   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"
+  install -m 644 -D "${srcdir}/build/packaging/rpm-common/mysqlrouter.conf" "${pkgdir}/etc/mysqlrouter/mysqlrouter.conf"
 
   # provided by libmysqlclient
   rm "${pkgdir}/usr/bin/mysql_config"
@@ -188,7 +194,6 @@ package_mysql(){
 
   # not needed
   rm -r "${pkgdir}/usr/mysql-test"
-  rmdir "${pkgdir}/usr/run"
 
   # Move somewhere else
   mv "${pkgdir}/usr/LICENSE.router" "${pkgdir}/usr/share/mysql/docs"
@@ -204,11 +209,24 @@ package_mysql(){
   mv "${pkgdir}/usr/usr/lib/systemd" "${pkgdir}/usr/lib"
   mv "${pkgdir}/usr/usr/lib/tmpfiles.d" "${pkgdir}/usr/lib"
 
+  # Move logrotate files
+  install -d -m 755 "${pkgdir}/etc/logrotate.d/"
+  mv "${pkgdir}/usr/mysqlrouter-log-rotate" "${pkgdir}/etc/logrotate.d/mysqlrouter"
+
+  # Move docs files
+  mv "${pkgdir}/usr/docs/sample_mysqlrouter.conf" "${pkgdir}/usr/share/mysql/docs"
+  rmdir "${pkgdir}/usr/docs"
+
   # Cleanup
+  rmdir "${pkgdir}/usr/etc/mysqlrouter"
+  rmdir "${pkgdir}/usr/etc"
+  rmdir "${pkgdir}/usr/run"
   rmdir "${pkgdir}/usr/usr/lib"
   rmdir "${pkgdir}/usr/usr"
   rmdir "${pkgdir}/usr/var/lib/mysqlrouter"
   rmdir "${pkgdir}/usr/var/lib"
+  rmdir "${pkgdir}/usr/var/log/mysqlrouter"
+  rmdir "${pkgdir}/usr/var/log"
   rmdir "${pkgdir}/usr/var"
 
   # Arch Linux specific patches:
diff --git a/mysql.install b/mysql.install
index 90583a1e83c4..1037590b61ef 100644
--- a/mysql.install
+++ b/mysql.install
@@ -7,6 +7,14 @@ post_install(){
     chown -R mysql:mysql "/var/lib/mysql" &>/dev/null
   fi
 
+  groupadd -g 88 mysqlrouter &>/dev/null
+  useradd -u 88 -g mysqlrouter -d "/var/lib/mysqlrouter" -s /bin/false mysqlrouter &>/dev/null
+
+  if [[ ! -e "/var/lib/mysqlrouter" ]]; then
+    install -dm700 "/var/lib/mysqlrouter"
+    chown -R mysqlrouter:mysqlrouter "/var/lib/mysqlrouter" &>/dev/null
+  fi
+
   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"
@@ -21,4 +29,11 @@ post_remove(){
   if getent group mysql >/dev/null 2>&1; then
     groupdel mysql
   fi
+
+  if getent passwd mysqlrouter >/dev/null 2>&1; then
+    userdel mysqlrouter
+  fi
+  if getent group mysqlrouter >/dev/null 2>&1; then
+    groupdel mysqlrouter
+  fi
 }
diff --git a/systemd-sysusers-tmpfiles.patch b/systemd-sysusers-tmpfiles.patch
index 6eccab1f62dd..4116f3e43d18 100644
--- a/systemd-sysusers-tmpfiles.patch
+++ b/systemd-sysusers-tmpfiles.patch
@@ -8,3 +8,14 @@
 +d /run/mysqld 0755 mysql mysql  -
 +d /var/lib/mysql 0700 mysql mysql  -
 
+--- a/usr/lib/tmpfiles.d/mysqlrouter.conf  2020-12-25 21:41:47.218202248 +1100
++++ b/usr/lib/tmpfiles.d/mysqlrouter.conf  2020-12-25 21:42:07.126124043 +1100
+@@ -20,4 +20,6 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+-d run 0755 mysqlrouter mysqlrouter  -
++d /run/mysqlrouter 0755 mysqlrouter mysqlrouter  -
++d /var/lib/mysqlrouter 0700 mysqlrouter mysqlrouter  -
++d /var/log/mysqlrouter 0750 mysqlrouter mysqlrouter  -
+