[arch-commits] Commit in mariadb/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Wed Feb 12 14:06:06 UTC 2020
Date: Wednesday, February 12, 2020 @ 14:06:05
Author: eworm
Revision: 375499
use patch from upstream commit
... and prepare to drop it for next release.
Added:
mariadb/trunk/0002-MDEV-17028-Use-descriptive-file-names.patch
Modified:
mariadb/trunk/0001-arch-specific.patch
mariadb/trunk/PKGBUILD
Deleted:
mariadb/trunk/0002-systemd-sysusers-tmpfiles.patch
--------------------------------------------------+
0001-arch-specific.patch | 21 ++++++
0002-MDEV-17028-Use-descriptive-file-names.patch | 37 +++++++++++
0002-systemd-sysusers-tmpfiles.patch | 65 ---------------------
PKGBUILD | 14 +---
4 files changed, 64 insertions(+), 73 deletions(-)
Modified: 0001-arch-specific.patch
===================================================================
--- 0001-arch-specific.patch 2020-02-12 13:54:17 UTC (rev 375498)
+++ 0001-arch-specific.patch 2020-02-12 14:06:05 UTC (rev 375499)
@@ -88,3 +88,24 @@
[Service]
+From 974bd397ff3492c57799e11a02cc3c07081bb1fc Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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@ -
Added: 0002-MDEV-17028-Use-descriptive-file-names.patch
===================================================================
--- 0002-MDEV-17028-Use-descriptive-file-names.patch (rev 0)
+++ 0002-MDEV-17028-Use-descriptive-file-names.patch 2020-02-12 14:06:05 UTC (rev 375499)
@@ -0,0 +1,37 @@
+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: 0002-systemd-sysusers-tmpfiles.patch
===================================================================
--- 0002-systemd-sysusers-tmpfiles.patch 2020-02-12 13:54:17 UTC (rev 375498)
+++ 0002-systemd-sysusers-tmpfiles.patch 2020-02-12 14:06:05 UTC (rev 375499)
@@ -1,65 +0,0 @@
-From aef4f58adf90e9fee4348c1cf6484faeae159255 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Tue, 2 Jan 2018 14:32:21 +0100
-Subject: [PATCH 1/2] 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'.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- 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 3655c87b94e..63443245e6e 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
-From 974bd397ff3492c57799e11a02cc3c07081bb1fc Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Tue, 2 Jan 2018 14:36:49 +0100
-Subject: [PATCH 2/2] 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.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- 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@ -
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-12 13:54:17 UTC (rev 375498)
+++ PKGBUILD 2020-02-12 14:06:05 UTC (rev 375499)
@@ -18,12 +18,12 @@
# 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-systemd-sysusers-tmpfiles.patch'
+ '0002-MDEV-17028-Use-descriptive-file-names.patch'
'0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch')
sha256sums=('fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208'
'SKIP'
- 'ce72ea1563ad773e00e8b1c299babea176abae1102827c2f743921e9de615041'
- '3e83467af80fbd53400a201a34fc858b88509ea8e88b10709947eb66545f9457'
+ 'e14e1ce5f0d7117dfa7870e92e1224d4ca5e6b3fc395ab6da78aa777e3e403ab'
+ '359e41ffdae0b22f12a9cc4a327e0b25942292235edb7373f690da19c5a67ef5'
'c8c801f80924ccb97b499552fe1c532b3ebf8f86cdfc0d23715d4adb1a8810f0')
prepare() {
@@ -33,13 +33,11 @@
# * enable PrivateTmp for a little bit more security
# * force preloading jemalloc for memory management
# * remove aliases in systemd unit files
+ # * make systemd-tmpfiles create MYSQL_DATADIR
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
+ # MDEV-17028: Use descriptive file names for sysusers and tmpfiles configuration
+ patch -Np1 < ../0002-MDEV-17028-Use-descriptive-file-names.patch
# fix galera_recovery with fs.protected_regular enabled
# https://github.com/MariaDB/server/pull/1137
More information about the arch-commits
mailing list