[arch-commits] Commit in mariadb/trunk (3 files)
Christian Hesse
eworm at archlinux.org
Tue May 12 06:26:47 UTC 2020
Date: Tuesday, May 12, 2020 @ 06:26:47
Author: eworm
Revision: 383260
upgpkg: mariadb 10.4.13-1
new upstream release
Modified:
mariadb/trunk/PKGBUILD
Deleted:
mariadb/trunk/0002-MDEV-17028-Use-descriptive-file-names.patch
mariadb/trunk/0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch
------------------------------------------------------------------------------+
0002-MDEV-17028-Use-descriptive-file-names.patch | 37 ----------
0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch | 23 ------
PKGBUILD | 26 ++-----
3 files changed, 11 insertions(+), 75 deletions(-)
Deleted: 0002-MDEV-17028-Use-descriptive-file-names.patch
===================================================================
--- 0002-MDEV-17028-Use-descriptive-file-names.patch 2020-05-12 06:02:44 UTC (rev 383259)
+++ 0002-MDEV-17028-Use-descriptive-file-names.patch 2020-05-12 06:26:47 UTC (rev 383260)
@@ -1,37 +0,0 @@
-commit b472bc2eba017b3286dc7110f1c2ce3a039e6ac7
-Author: Christian Hesse <mail at eworm.de>
-Date: Tue Jan 2 14:32:21 2018 +0100
-
- MDEV-17028: 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'.
-
-diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
-index 62ad8bcffc9..b3162f484ce 100644
---- a/support-files/CMakeLists.txt
-+++ b/support-files/CMakeLists.txt
-@@ -118,7 +118,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)
-@@ -126,7 +127,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
Deleted: 0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch
===================================================================
--- 0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch 2020-05-12 06:02:44 UTC (rev 383259)
+++ 0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch 2020-05-12 06:26:47 UTC (rev 383260)
@@ -1,23 +0,0 @@
-commit f6003fbc8cbd6779b6e7fcf5b05293b54a4948f8
-Author: Alexander E. Patrakov <patrakov at gmail.com>
-Date: Thu Nov 28 17:37:57 2019 +0500
-
- MDEV-21140 Make galera_recovery.sh work with fs.protected_regular = 1 (#1417)
-
- The log file is opened as root since commit bb7a70c, so there is no need
- to chown it.
-
-diff --git a/scripts/galera_recovery.sh b/scripts/galera_recovery.sh
-index 709c4b0eed5..8df2abc3fd5 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
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-12 06:02:44 UTC (rev 383259)
+++ PKGBUILD 2020-05-12 06:26:47 UTC (rev 383260)
@@ -4,7 +4,7 @@
pkgbase=mariadb
pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
pkgdesc='Fast SQL database server, derived from MySQL'
-pkgver=10.4.12
+pkgver=10.4.13
pkgrel=1
arch=('x86_64')
license=('GPL')
@@ -18,14 +18,10 @@
# https://mariadb.com/kb/en/library/mirror-sites-for-mariadb/
source=("rsync://rsync.osuosl.org/mariadb/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc}
'0001-arch-specific.patch'
- '0002-MDEV-17028-Use-descriptive-file-names.patch'
- '0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch'
'0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch')
-sha256sums=('fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208'
+sha256sums=('45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df'
'SKIP'
'c97e36bd0aeb10f506f4843761a0cd13dbe2e7bc71c3e5cdcd1a5310338bffaf'
- '359e41ffdae0b22f12a9cc4a327e0b25942292235edb7373f690da19c5a67ef5'
- 'c6f4b3f19f254970d5738b7214da5ab25dd17885b4f83f8da3154ffecfcb44d4'
'1bb3b18afac8c95dbe964046e18b866288f41f8ec3a4a9c69875ca1620b89d29')
prepare() {
@@ -37,12 +33,6 @@
# * make systemd-tmpfiles create MYSQL_DATADIR
patch -Np1 < ../0001-arch-specific.patch
- # MDEV-17028: Use descriptive file names for sysusers and tmpfiles configuration
- patch -Np1 < ../0002-MDEV-17028-Use-descriptive-file-names.patch
-
- # MDEV-21140 Make galera_recovery.sh work with fs.protected_regular = 1 (#1417)
- patch -Np1 < ../0003-MDEV-21140-Make-galera_recovery.sh-work-with-fs.protected_regular.patch
-
# MDEV-15526 systemd unit files naming and installation
patch -Np1 < ../0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch
}
@@ -163,7 +153,8 @@
'etc/my.cnf.d/client.cnf'
'etc/my.cnf.d/enable_encryption.preset'
'etc/my.cnf.d/mysql-clients.cnf'
- 'etc/my.cnf.d/server.cnf')
+ 'etc/my.cnf.d/server.cnf'
+ 'etc/security/user_map.conf')
install=mariadb.install
depends=("mariadb-clients=${pkgver}" 'inetutils' 'systemd-libs' 'libxml2' 'zstd')
optdepends=('galera: for MariaDB cluster with Galera WSREP'
@@ -194,6 +185,11 @@
# move it where one might look for it
mv usr/share/{groonga{,-normalizer-mysql},doc/mariadb/}
+ # move to pam directories
+ install -d {etc,usr/lib}/security
+ mv usr/share/user_map.conf etc/security/
+ mv usr/share/pam_user_map.so usr/lib/security/
+
# already installed to real systemd unit directory or useless
rm -r usr/share/mysql/systemd/
rm -r usr/lib/systemd/system/mariadb at bootstrap.service.d
@@ -203,10 +199,10 @@
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 -r usr/lib/pkgconfig
rm usr/lib/mysql/plugin/{auth_gssapi_client,caching_sha2_password,client_ed25519,dialog,mysql_clear_password,sha256_password}.so
- rm -r usr/lib/pkgconfig/
# provided by mariadb-clients
rm usr/bin/mysql{,_plugin,_upgrade,admin,binlog,check,dump,import,show,slap,test}
More information about the arch-commits
mailing list