[arch-commits] Commit in mariadb/trunk (4 files)

[Christian Hesse via arch-commits]

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.patch2020-02-12 13:54:17 UTC (rev 375498)
+++ 0001-arch-specific.patch2020-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 
+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.patch2020-02-12 14:06:05 UTC 
(rev 375499)
@@ -0,0 +1,37 @@
+commit b472bc2eba017b3286dc7110f1c2ce3a039e6ac7
+Author: Christian Hesse 
+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.patch2020-02-12 13:54:17 UTC (rev 
375498)
+++ 0002-systemd-sysusers-tmpfiles.patch2020-02-12 14:06:05 UTC (rev 
375499)
@@ -1,65 +0,0 @@
-From aef4f58adf90e9fee4348c1cf6484faeae159255 Mon Sep 17 00:00:00 2001
-From: Christian Hesse 
-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 

- 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
--

[arch-commits] Commit in mariadb/trunk (4 files)

[Christian Hesse via arch-commits]

Date: Saturday, December 23, 2017 @ 22:29:56
  Author: eworm
Revision: 313572

upgpkg: mariadb 10.1.30-1

new upstream release

Modified:
  mariadb/trunk/PKGBUILD
  mariadb/trunk/mariadb.install
Deleted:
  mariadb/trunk/mariadb-sysusers.conf
  mariadb/trunk/mariadb-tmpfile.conf

---+
 PKGBUILD  |   25 -
 mariadb-sysusers.conf |1 -
 mariadb-tmpfile.conf  |1 -
 mariadb.install   |2 ++
 4 files changed, 14 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-23 19:13:41 UTC (rev 313571)
+++ PKGBUILD2017-12-23 22:29:56 UTC (rev 313572)
@@ -4,7 +4,7 @@
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=10.1.29
+pkgver=10.1.30
 pkgrel=1
 arch=('x86_64')
 license=('GPL')
@@ -14,15 +14,11 @@
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package 
Signing Key 
 
source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
 '0001-openssl-1-1-0.patch'
-'0002-mroonga-after-merge-CMakeLists.txt-fixes.patch'
-'mariadb-sysusers.conf'
-'mariadb-tmpfile.conf')
-sha256sums=('73bbd5602f52ab5aa4d83f465134871b6c87bda25371d098f6da5a3d98517ed4'
+'0002-mroonga-after-merge-CMakeLists.txt-fixes.patch')
+sha256sums=('173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88'
 'SKIP'
 '40d298ca77c0459ade4ef9fc68a3a7450273b098b9f7edfb0a5251c5db434cfc'
-'98736aefef21e575e450f8066685ba82771264409412e33491ab0a54e4407ba7'
-'e1a22777c65854041f16fc0a2db3218d17b4d7e7ec7ab7a77cf49c71277c1515'
-'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+'98736aefef21e575e450f8066685ba82771264409412e33491ab0a54e4407ba7')
 
 prepare() {
   cd $pkgbase-$pkgver/
@@ -40,6 +36,9 @@
   # revert to fix the build
   # mroonga after-merge CMakeLists.txt fixes
   patch -Np1 -R < 
"${srcdir}"/0002-mroonga-after-merge-CMakeLists.txt-fixes.patch
+
+  # let's create the datadir from tmpfiles
+  echo 'd @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -' >> 
support-files/tmpfiles.conf.in
 }
 
 build() {
@@ -67,6 +66,8 @@
 -DINSTALL_SUPPORTFILESDIR=share/mysql \
 -DINSTALL_MYSQLSHAREDIR=share/mysql \
 -DINSTALL_SHAREDIR=share/mysql \
+-DINSTALL_SYSTEMD_SYSUSERSDIR=/usr/lib/sysusers.d/ \
+-DINSTALL_SYSTEMD_TMPFILESDIR=/usr/lib/tmpfiles.d/ \
 -DINSTALL_SYSTEMD_UNITDIR=/usr/lib/systemd/system/ \
 -DWITH_SYSTEMD=yes \
 -DWITH_READLINE=ON \
@@ -165,14 +166,12 @@
   install -Dm0644 usr/share/mysql/my-medium.cnf etc/mysql/my.cnf
   install -Dm0644 usr/share/mysql/wsrep.cnf etc/mysql/wsrep.cnf
 
-  install -Dm0644 "${srcdir}"/mariadb-tmpfile.conf 
usr/lib/tmpfiles.d/mariadb.conf
-  install -Dm0644 "${srcdir}"/mariadb-sysusers.conf 
usr/lib/sysusers.d/mariadb.conf
+  mv usr/lib/sysusers.d/{sysusers,mariadb}.conf
+  mv usr/lib/tmpfiles.d/{tmpfiles,mariadb}.conf
+
   ln -s mariadb.service usr/lib/systemd/system/mysqld.service
   ln -s mariadb@.service usr/lib/systemd/system/mysqld@.service
 
-  install -dm0700 var/lib/mysql
-  chown -R 89:89 var/lib/mysql &>/dev/null
-
   # move to proper licenses directories
   install -d usr/share/licenses/mariadb
   mv usr/share/doc/mariadb/COPYING* usr/share/licenses/mariadb/

Deleted: mariadb-sysusers.conf
===
--- mariadb-sysusers.conf   2017-12-23 19:13:41 UTC (rev 313571)
+++ mariadb-sysusers.conf   2017-12-23 22:29:56 UTC (rev 313572)
@@ -1 +0,0 @@
-u mysql 89 "MariaDB" /var/lib/mysql

Deleted: mariadb-tmpfile.conf
===
--- mariadb-tmpfile.conf2017-12-23 19:13:41 UTC (rev 313571)
+++ mariadb-tmpfile.conf2017-12-23 22:29:56 UTC (rev 313572)
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -

Modified: mariadb.install
===
--- mariadb.install 2017-12-23 19:13:41 UTC (rev 313571)
+++ mariadb.install 2017-12-23 22:29:56 UTC (rev 313572)
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 post_install(){
 
   echo ":: You need to initialize the MariaDB data directory prior to starting"