From 465736fb89aaee43f21a5183343f02982c7ab94c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 10 Aug 2020 17:38:59 +0000 Subject: [PATCH] extra/mariadb: updates --- extra/mariadb/0001-arch-specific.patch | 9 ++++++--- extra/mariadb/PKGBUILD | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/extra/mariadb/0001-arch-specific.patch b/extra/mariadb/0001-arch-specific.patch index 15d24936e..d194e7d42 100644 --- a/extra/mariadb/0001-arch-specific.patch +++ b/extra/mariadb/0001-arch-specific.patch @@ -78,14 +78,17 @@ 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. + +Also this now sets the No_COW attribute. --- - support-files/tmpfiles.conf.in | 1 + - 1 file changed, 1 insertion(+) + support-files/tmpfiles.conf.in | 2 + + 1 file changed, 2 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 @@ +@@ -1 +1,3 @@ d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ - +d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ - ++h @MYSQL_DATADIR@ - - - - +C diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index af32fde38..88301ac58 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -13,8 +13,8 @@ pkgrel=1 arch=('x86_64') license=('GPL') url='https://mariadb.org/' -makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxml2' 'lz4' 'lzo' - 'openssl' 'systemd' 'zlib' 'zstd') +makedepends=('rsync' 'boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxml2' + 'lz4' 'lzo' 'openssl' 'systemd' 'zlib' 'zstd') validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key # The default links with mirror redirection fail for signatures, specific # mirrors may be out of date every now and then. Let's use the upstream @@ -26,7 +26,7 @@ source=("rsync://rsync.osuosl.org/mariadb/mariadb-${pkgver}/source/mariadb-${pkg '0001-libatomic.patch') sha256sums=('f92fcd59e0122461482f28c67c5ea01c7cf6979494a571db68074396864c86fc' 'SKIP' - 'c97e36bd0aeb10f506f4843761a0cd13dbe2e7bc71c3e5cdcd1a5310338bffaf' + '3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460' '1bb3b18afac8c95dbe964046e18b866288f41f8ec3a4a9c69875ca1620b89d29' '1c7360453b6e964c6546cbbb10fff697f6227554eba716b2a1df74f7c2613d95')