Updated to 10.3.23

5 files changed, 23 insertions, 144 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56d7ac958916..2a0fa44c104b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mariadb103
 	pkgdesc = Fast SQL database server, version 10.3
-	pkgver = 10.3.22
+	pkgver = 10.3.23
 	pkgrel = 1
 	url = https://mariadb.org/
 	arch = x86_64
@@ -18,19 +18,15 @@ pkgbase = mariadb103
 	makedepends = systemd
 	makedepends = zlib
 	makedepends = zstd
-	source = https://mirrors.n-ix.net/mariadb/mariadb-10.3.22/source/mariadb-10.3.22.tar.gz
-	source = https://mirrors.n-ix.net/mariadb/mariadb-10.3.22/source/mariadb-10.3.22.tar.gz.asc
+	source = https://mirrors.n-ix.net/mariadb/mariadb-10.3.23/source/mariadb-10.3.23.tar.gz
+	source = https://mirrors.n-ix.net/mariadb/mariadb-10.3.23/source/mariadb-10.3.23.tar.gz.asc
 	source = 0001-arch-specific.patch
-	source = 0002-systemd-sysusers-tmpfiles.patch
 	source = 0004-do-not-break-main-configuration-with-instantiated-one.patch
-	source = 0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch
 	validpgpkeys = 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB
-	sha256sums = 3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7
+	sha256sums = fc405022457d8eec5991b870cc1c9a07b83b551d6165c414c4d8f31523aa86ae
 	sha256sums = SKIP
 	sha256sums = 5b74e328e75369dfb68491a06dd53bd736e34f87281103ae0dd2f50401dc70d3
-	sha256sums = 1cd009b473d5965c7cbe6d48fff272030a2ccdd9c7e67b4f837d03252786a09a
-	sha256sums = e8fecec204a7832948093c8ce5dc81808a8564f54854e57473b448ebc0cc4ff3
-	sha256sums = 66e0acac7436fd8925710ef5cc66ba1a8f63a385ce374f01ae83096cc33d97a0
+	sha256sums = 3216343c3de1cb33f4a7eb58b1eed4228fa1a61184358afdfdcdcaeddf617ef0
 
 pkgname = mariadb103-libs
 	pkgdesc = MariaDB libraries, version 10.3
@@ -53,25 +49,25 @@ pkgname = mariadb103-libs
 
 pkgname = mariadb103-clients
 	pkgdesc = MariaDB client tools, version 10.3
-	depends = mariadb103-libs=10.3.22
+	depends = mariadb103-libs=10.3.23
 	depends = jemalloc
-	provides = mysql-clients=10.3.22
-	provides = mariadb-clients=10.3.22
+	provides = mysql-clients=10.3.23
+	provides = mariadb-clients=10.3.23
 	conflicts = mysql-clients
 	conflicts = mariadb-clients
 
 pkgname = mariadb103
 	pkgdesc = Fast SQL database server, version 10.3
 	install = mariadb103.install
-	depends = mariadb103-clients=10.3.22
+	depends = mariadb103-clients=10.3.23
 	depends = inetutils
 	depends = systemd-libs
 	depends = libxml2
 	depends = zstd
 	optdepends = galera: for MariaDB cluster with Galera WSREP
 	optdepends = perl-dbd-mysql: for mysqlhotcopy, mysql_convert_table_format and mysql_setpermission
-	provides = mysql=10.3.22
-	provides = mariadb=10.3.22
+	provides = mysql=10.3.23
+	provides = mariadb=10.3.23
 	conflicts = mysql
 	conflicts = mariadb
 	options = emptydirs
diff --git a/0002-systemd-sysusers-tmpfiles.patch b/0002-systemd-sysusers-tmpfiles.patch
deleted file mode 100644
index c18cff67ffab..000000000000
--- a/0002-systemd-sysusers-tmpfiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From dc7aff5e5331820205282576f6ade015f672969b Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 2 Jan 2018 14:32:21 +0100
-Subject: Use descriptive file names for sysusers and tmpfiles configuration
-
-These files were installed to:
-
-${INSTALL_SYSTEMD_SYSUSERSDIR}/sysusers.conf
-${INSTALL_SYSTEMD_TMPFILESDIR}/tmpfiles.conf
-
-Instead rename the files to more descriptive file names 'mariadb.conf'.
----
- support-files/CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
-index 4ad3810e082..8363922d468 100644
---- a/support-files/CMakeLists.txt
-+++ b/support-files/CMakeLists.txt
-@@ -117,7 +117,8 @@ IF(UNIX)
-       CONFIGURE_FILE(sysusers.conf.in
-               ${CMAKE_CURRENT_BINARY_DIR}/sysusers.conf @ONLY)
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sysusers.conf
--              DESTINATION ${INSTALL_SYSTEMD_SYSUSERSDIR} COMPONENT Server)
-+              DESTINATION ${INSTALL_SYSTEMD_SYSUSERSDIR}
-+              RENAME mariadb.conf COMPONENT Server)
-     ENDIF()
- 
-     IF(INSTALL_SYSTEMD_TMPFILESDIR)
-@@ -125,7 +126,8 @@ IF(UNIX)
-       CONFIGURE_FILE(tmpfiles.conf.in
-               ${CMAKE_CURRENT_BINARY_DIR}/tmpfiles.conf @ONLY)
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tmpfiles.conf
--              DESTINATION ${INSTALL_SYSTEMD_TMPFILESDIR} COMPONENT Server)
-+              DESTINATION ${INSTALL_SYSTEMD_TMPFILESDIR}
-+              RENAME mariadb.conf COMPONENT Server)
-     ENDIF()
- 
-     # @ in directory name broken between CMake version 2.8.12.2 and 3.3
-From c86912c8896b65c1dd9226c1bc2987189d4840c2 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Tue, 2 Jan 2018 14:36:49 +0100
-Subject: Make systemd-tmpfiles create MYSQL_DATADIR
-
-This is a no-op if the directory exists, but makes sure it is created by
-systemd-tmpfiles with proper permissions otherwise.
-
-This solves packaging issues when the user MYSQLD_USER is created by
-systemd-sysusers and uid is not known in advance.
----
- support-files/tmpfiles.conf.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/support-files/tmpfiles.conf.in b/support-files/tmpfiles.conf.in
-index 03d66abc0c7..3c89cb258c9 100644
---- a/support-files/tmpfiles.conf.in
-+++ b/support-files/tmpfiles.conf.in
-@@ -1 +1,2 @@
- d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ -
-+d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -
diff --git a/0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch b/0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch
deleted file mode 100644
index f3de571d86a9..000000000000
--- a/0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5936f0be4a49eda7b05ea1591bbbba3d72e4d7b9 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Fri, 25 Jan 2019 14:50:53 +0100
-Subject: fix galera_recovery with fs.protected_regular enabled
-
-The fs.protected_regular sysctls was added in Linux 4.19 to make some
-data spoofing attacks harder. With systemd v241 these will be enabled
-by default.
-
-With this protection enabled galera_recovery fails with EPERM
-(permission denied). This is caused by a wrong security measure:
-The script changes ownership of $log_file to $user, though $user never
-touches it. The shell redirection writes output to the file, not mysqld.
-So just drop chown to fix this.
----
- scripts/galera_recovery.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/scripts/galera_recovery.sh b/scripts/galera_recovery.sh
-index c58f3d8f6b9..c70decc0005 100644
---- a/scripts/galera_recovery.sh
-+++ b/scripts/galera_recovery.sh
-@@ -101,8 +101,7 @@ wsrep_recover_position() {
- 
- # Safety checks
- if [ -n "$log_file" -a -f "$log_file" ]; then
--  [ "$euid" = "0" ] && chown $user $log_file
--      chmod 600 $log_file
-+  chmod 600 $log_file
- else
-   log "WSREP: mktemp failed"
- fi
diff --git a/PKGBUILD b/PKGBUILD
index 0b11c426e588..b0ab68fd97c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mariadb103
 pkgname=('mariadb103-libs' 'mariadb103-clients' 'mariadb103')
 _orgbase=mariadb
 pkgdesc='Fast SQL database server, version 10.3'
-pkgver=10.3.22
+pkgver=10.3.23
 pkgrel=1
 arch=('x86_64')
 license=('GPL')
@@ -16,15 +16,11 @@ makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'inetutils' 'libaio' 'libxml2' '
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
 source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
         '0001-arch-specific.patch'
-        '0002-systemd-sysusers-tmpfiles.patch'
-        '0004-do-not-break-main-configuration-with-instantiated-one.patch'
-        '0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch')
-sha256sums=('3200055dbdc27746981b3bb4bc182e2cb79dcf28ea88014b641a5b81280ccec7'
+        '0004-do-not-break-main-configuration-with-instantiated-one.patch')
+sha256sums=('fc405022457d8eec5991b870cc1c9a07b83b551d6165c414c4d8f31523aa86ae'
             'SKIP'
             '5b74e328e75369dfb68491a06dd53bd736e34f87281103ae0dd2f50401dc70d3'
-            '1cd009b473d5965c7cbe6d48fff272030a2ccdd9c7e67b4f837d03252786a09a'
-            'e8fecec204a7832948093c8ce5dc81808a8564f54854e57473b448ebc0cc4ff3'
-            '66e0acac7436fd8925710ef5cc66ba1a8f63a385ce374f01ae83096cc33d97a0')
+            '3216343c3de1cb33f4a7eb58b1eed4228fa1a61184358afdfdcdcaeddf617ef0')
 
 prepare() {
   cd $_orgbase-$pkgver/
@@ -35,19 +31,9 @@ prepare() {
   #  * fix path to our config
   patch -Np1 < ../0001-arch-specific.patch
 
-  # MDEV-17028 Fix glitches with systemd sysusers and tmpfiles:
-  #  * Use descriptive file names for sysusers and tmpfiles configuration
-  #  * Make systemd-tmpfiles create MYSQL_DATADIR
-  # https://github.com/MariaDB/server/pull/530
-  patch -Np1 < ../0002-systemd-sysusers-tmpfiles.patch
-
   # do not break main configuration with instantiated one
   # https://github.com/MariaDB/server/pull/1095
   patch -Np1 < ../0004-do-not-break-main-configuration-with-instantiated-one.patch
-
-  # fix galera_recovery with fs.protected_regular enabled
-  # https://github.com/MariaDB/server/pull/1137
-  patch -Np1 < ../0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch
 }
 
 build() {
@@ -205,7 +191,7 @@ package_mariadb103() {
   rm usr/bin/mysql_config
   rm -r usr/include/
   rm usr/share/man/man1/mysql_config.1
-  rm -r usr/share/{aclocal,pkgconfig}
+  rm -r usr/share/aclocal
   rm usr/lib/lib*
   rm usr/lib/mysql/plugin/{auth_gssapi_client,caching_sha2_password,dialog,client_ed25519,mysql_clear_password,sha256_password}.so
   rm -r usr/lib/pkgconfig/
diff --git a/mariadb103.install b/mariadb103.install
index 8506211a8adf..5bf223ad77c1 100644
--- a/mariadb103.install
+++ b/mariadb103.install
@@ -1,26 +1,15 @@
-#!/bin/sh
+k#!/bin/sh
 
 post_install() {
-  echo ":: If this is a clean install you need to initialize the MariaDB data directory"
-  echo "   prior to starting the service. This can be done with mysql_install_db command, e.g.:"
+  echo ":: You need to initialize the MariaDB data directory prior to starting"
+  echo "   the service. This can be done with mysql_install_db command, e.g.:"
   echo "   mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql"
-  echo
-  echo "   If instead MariaDB was downgraded (eg. 10.5 -> 10.3) or upgraded (eg. 10.2 -> 10.3)"
-  echo "   to a new feature release run this command instead to update the data:"
-  echo "   systemctl restart mariadb.service && mysql_upgrade -u root -p"
-
 }
 
 post_upgrade() {
-    echo ":: If MariaDB was downgraded (eg. 10.5 -> 10.3) or upgraded (eg. 10.2 -> 10.3)"
-    echo "   to a new feature release run this to update the data:"
+  # show for feature release: 10.1 -> 10.2 -> 10.3 -> ...
+  if [ $(vercmp "${1%.*-*}" "${2%.*-*}") -ne 0 ]; then 
+    echo ":: MariaDB was updated to a new feature release. To update the data run:"
     echo "   systemctl restart mariadb.service && mysql_upgrade -u root -p"
-}
-
-post_remove() {
-    echo ":: If MariaDB is to be upgraded to a new feature release (eg. 10.3 -> 10.5)"
-    echo "   after this uninstall do not run 'mysql_install_db ...' after the upgrade."
-    echo "   Run this command after the upgrade instead to update the data:"
-    echo "   systemctl restart mariadb.service && mysql_upgrade -u root -p"
-
+  fi
 }