Date: Sunday, April 19, 2020 @ 20:27:57
Author: eworm
Revision: 380569
use another upstream patch
Added:
mariadb/trunk/0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch
Modified:
mariadb/trunk/0001-arch-specific.patch
mariadb/trunk/PKGBUILD
------------------------------------------------------------------+
0001-arch-specific.patch | 64
+++-------
0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch | 28 ++++
PKGBUILD | 12 +
3 files changed, 58 insertions(+), 46 deletions(-)
Modified: 0001-arch-specific.patch
===================================================================
--- 0001-arch-specific.patch 2020-04-19 20:26:27 UTC (rev 380568)
+++ 0001-arch-specific.patch 2020-04-19 20:27:57 UTC (rev 380569)
@@ -1,7 +1,7 @@
-From 07abbcbbe129a4c44c58fa2496b0921e52a759c2 Mon Sep 17 00:00:00 2001
+From bf66e7d610de0d7d3651742342c01ed9ff93f363 Mon Sep 17 00:00:00 2001
From: Christian Hesse <m...@eworm.de>
-Date: Tue, 29 Jan 2019 23:12:01 +0100
-Subject: enable PrivateTmp for a little bit more security
+Date: Wed, 19 Feb 2020 13:10:17 +0100
+Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security
---
support-files/mariadb.service.in | 2 +-
support-files/mari...@.service.in | 2 +-
@@ -8,10 +8,10 @@
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/support-files/mariadb.service.in
b/support-files/mariadb.service.in
-index 8d43b6db428..a96fbcc9d2c 100644
+index e7665ed1219..a1fe69d61c4 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
-@@ -117,7 +117,7 @@ UMask=007
+@@ -129,7 +129,7 @@ UMask=007
# If you don't use the /tmp directory for SELECT ... OUTFILE and
# LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
@@ -18,13 +18,13 @@
-PrivateTmp=false
+PrivateTmp=true
- ##
- ## Options previously available to be set via [mysqld_safe]
+ # Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
+ # this is the same value as used in SysV init scripts in the past
diff --git a/support-files/mari...@.service.in
b/support-files/mari...@.service.in
-index a2f5cff0828..30631a8738a 100644
+index ffefc2f22d8..f8b0b8aad8d 100644
--- a/support-files/mari...@.service.in
+++ b/support-files/mari...@.service.in
-@@ -138,7 +138,7 @@ UMask=007
+@@ -241,7 +241,7 @@ UMask=007
# If you don't use the /tmp directory for SELECT ... OUTFILE and
# LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
@@ -31,12 +31,13 @@
-PrivateTmp=false
+PrivateTmp=true
- ##
- ## Options previously available to be set via [mysqld_safe]
-From 0e4a158086b765aa3a12b84646aefb9b192443f7 Mon Sep 17 00:00:00 2001
+ # Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
+ # this is the same value as used in SysV init scripts in the past
+
+From 00aab78891a19a14a92039fcc6a73e391a3bb471 Mon Sep 17 00:00:00 2001
From: Christian Hesse <m...@eworm.de>
-Date: Tue, 29 Jan 2019 23:12:54 +0100
-Subject: force preloading jemalloc for memory management
+Date: Wed, 19 Feb 2020 13:10:46 +0100
+Subject: [PATCH 2/3] force preloading jemalloc for memory management
---
support-files/mariadb.service.in | 1 +
support-files/mari...@.service.in | 1 +
@@ -43,10 +44,10 @@
2 files changed, 2 insertions(+)
diff --git a/support-files/mariadb.service.in
b/support-files/mariadb.service.in
-index a96fbcc9d2c..6bb5d4227b9 100644
+index a1fe69d61c4..9a2941ae917 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
-@@ -140,6 +140,7 @@ LimitNOFILE=16364
+@@ -159,6 +159,7 @@ LimitNOFILE=16364
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit
paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@@ -55,10 +56,10 @@
# Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync
diff --git a/support-files/mari...@.service.in
b/support-files/mari...@.service.in
-index 83d75f80b87..d1d24d685f9 100644
+index f8b0b8aad8d..3309127330c 100644
--- a/support-files/mari...@.service.in
+++ b/support-files/mari...@.service.in
-@@ -161,6 +161,7 @@ LimitNOFILE=16364
+@@ -282,6 +282,7 @@ LimitNOFILE=16364
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit
paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@@ -66,32 +67,11 @@
# Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync
-From 820b47c1e70d36f1272cca3ddbdf4bbd2dd62bde Mon Sep 17 00:00:00 2001
-From: Christian Hesse <m...@eworm.de>
-Date: Wed, 30 Jan 2019 00:46:47 +0100
-Subject: remove aliases from systemd unit files
----
- support-files/mariadb.service.in | 2 --
- support-files/mari...@.service.in | 2 --
- 2 files changed, 4 deletions(-)
-diff --git a/support-files/mariadb.service.in
b/support-files/mariadb.service.in
-index 8d43b6db428..d7fa6bf5b14 100644
---- a/support-files/mariadb.service.in
-+++ b/support-files/mariadb.service.in
-@@ -20,8 +20,6 @@ After=network.target
-
- [Install]
- WantedBy=multi-user.target
--Alias=mysql.service
--Alias=mysqld.service
-
-
- [Service]
-From 974bd397ff3492c57799e11a02cc3c07081bb1fc Mon Sep 17 00:00:00 2001
+From a78ff18c83a5eb2556d4f3716f13786dcd8395d2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <m...@eworm.de>
-Date: Tue, 2 Jan 2018 14:36:49 +0100
-Subject: Make systemd-tmpfiles create MYSQL_DATADIR
+Date: Wed, 19 Feb 2020 13:11:31 +0100
+Subject: [PATCH 3/3] 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.
Added: 0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch
===================================================================
--- 0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch
(rev 0)
+++ 0004-MDEV-15526-systemd-unit-files-naming-and-installation.patch
2020-04-19 20:27:57 UTC (rev 380569)
@@ -0,0 +1,28 @@
+commit 6af0bd69074725c8d8b10f07ed4ccc013d010322
+Author: Faustin Lammler <faus...@fala.red>
+Date: Fri Jan 11 18:22:44 2019 -0300
+
+ MDEV-15526 systemd unit files naming and installation
+
+ Drop Aliases from the service file directive. Aliases in the service
+ file only take effect when the service is enabled. This is the case
+ because Aliases in service files do not have to be unique across various
+ services.
+
+ Shipping symlinks guarantees that one can always enable mariadb service
+ using `systemctl enable mysql` or `systemctl enable mysqld` and makes
+ the commands indempotent.
+
+diff --git a/support-files/mariadb.service.in
b/support-files/mariadb.service.in
+index dca7a4c13a7..e61e35c52ee 100644
+--- a/support-files/mariadb.service.in
++++ b/support-files/mariadb.service.in
+@@ -26,8 +26,6 @@ After=network.target
+
+ [Install]
+ WantedBy=multi-user.target
+-Alias=mysql.service
+-Alias=mysqld.service
+
+
+ [Service]
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-19 20:26:27 UTC (rev 380568)
+++ PKGBUILD 2020-04-19 20:27:57 UTC (rev 380569)
@@ -19,12 +19,14 @@
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')
+
'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'
'SKIP'
- 'e14e1ce5f0d7117dfa7870e92e1224d4ca5e6b3fc395ab6da78aa777e3e403ab'
+ 'c97e36bd0aeb10f506f4843761a0cd13dbe2e7bc71c3e5cdcd1a5310338bffaf'
'359e41ffdae0b22f12a9cc4a327e0b25942292235edb7373f690da19c5a67ef5'
- 'c6f4b3f19f254970d5738b7214da5ab25dd17885b4f83f8da3154ffecfcb44d4')
+ 'c6f4b3f19f254970d5738b7214da5ab25dd17885b4f83f8da3154ffecfcb44d4'
+ '1bb3b18afac8c95dbe964046e18b866288f41f8ec3a4a9c69875ca1620b89d29')
prepare() {
cd $pkgbase-$pkgver/
@@ -32,7 +34,6 @@
# Arch Linux specific patches:
# * 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
@@ -41,6 +42,9 @@
# 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
}
build() {
