archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/mariadb to 11.4.2-1

Browse source
This commit is contained in:
Kevin Mihelich 2024-06-03 00:09:01 +00:00
parent 30da3dff55
commit 7b4e8947c3
3 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
extra/mariadb/.SRCINFO
View file

@ -1,7 +1,7 @@
pkgbase = mariadb pkgbase = mariadb
pkgdesc = Fast SQL database server, derived from MySQL pkgdesc = Fast SQL database server, derived from MySQL
pkgver = 11.3.2 pkgver = 11.4.2
pkgrel = 2 pkgrel = 1
url = https://mariadb.org/ url = https://mariadb.org/
arch = x86_64 arch = x86_64
license = GPL license = GPL
@ -24,7 +24,7 @@ pkgbase = mariadb
makedepends = zlib makedepends = zlib
makedepends = zstd makedepends = zstd
makedepends = xz makedepends = xz
source = mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-11.3.2?signed source = mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-11.4.2?signed
source = git+https://github.com/MariaDB/mariadb-connector-c.git source = git+https://github.com/MariaDB/mariadb-connector-c.git
source = git+https://github.com/facebook/rocksdb.git source = git+https://github.com/facebook/rocksdb.git
source = git+https://github.com/codership/wsrep-lib.git source = git+https://github.com/codership/wsrep-lib.git
@ -33,14 +33,14 @@ pkgbase = mariadb
source = git+https://github.com/mariadb-corporation/mariadb-columnstore-engine.git source = git+https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
source = 0001-arch-specific.patch source = 0001-arch-specific.patch
validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8 validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8
sha256sums = a7ee96e4f90bf5d9f4185f36dae506980242b09578578568ed5ac4334dc05287 sha256sums = da69b2dee70ebf567cb5ff241a07bac2d45076ddf7465da85d1c17589f4b886d
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = SKIP sha256sums = SKIP
sha256sums = 3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460 sha256sums = 966ddd4fa21068e6ab5b560d69f607aa9291790fb15c3be424c20962a26032f9
pkgname = mariadb-libs pkgname = mariadb-libs
pkgdesc = MariaDB libraries pkgdesc = MariaDB libraries
@ -63,16 +63,16 @@ pkgname = mariadb-libs
pkgname = mariadb-clients pkgname = mariadb-clients
pkgdesc = MariaDB client tools pkgdesc = MariaDB client tools
depends = mariadb-libs=11.3.2 depends = mariadb-libs=11.4.2
depends = jemalloc depends = jemalloc
depends = ncurses depends = ncurses
provides = mysql-clients=11.3.2 provides = mysql-clients=11.4.2
conflicts = mysql-clients conflicts = mysql-clients
pkgname = mariadb pkgname = mariadb
pkgdesc = Fast SQL database server, derived from MySQL pkgdesc = Fast SQL database server, derived from MySQL
install = mariadb.install install = mariadb.install
depends = mariadb-clients=11.3.2 depends = mariadb-clients=11.4.2
depends = bzip2 depends = bzip2
depends = libxml2 depends = libxml2
depends = lz4 depends = lz4
@ -87,7 +87,7 @@ pkgname = mariadb
optdepends = python-mysqlclient: for myrocks_hotbackup optdepends = python-mysqlclient: for myrocks_hotbackup
optdepends = xz: lzma provider optdepends = xz: lzma provider
provides = mariadb-server provides = mariadb-server
provides = mysql=11.3.2 provides = mysql=11.4.2
conflicts = mysql conflicts = mysql
options = emptydirs options = emptydirs
backup = etc/my.cnf backup = etc/my.cnf

43
extra/mariadb/0001-arch-specific.patch
View file

@ -1,14 +1,15 @@
From bf66e7d610de0d7d3651742342c01ed9ff93f363 Mon Sep 17 00:00:00 2001 From ceef73b08ba6e73d9477b583e1a4695c0854c0f3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de> From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:10:17 +0100 Date: Wed, 19 Feb 2020 13:10:17 +0100
Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security
--- ---
support-files/mariadb.service.in | 2 +- support-files/mariadb.service.in | 2 +-
support-files/mariadb@.service.in | 2 +- support-files/mariadb@.service.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index e7665ed1219..a1fe69d61c4 100644 index 79c8b9a8cca..9e1ddfc82e1 100644
--- a/support-files/mariadb.service.in --- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in
@@ -129,7 +129,7 @@ UMask=007 @@ -129,7 +129,7 @@ UMask=007
@ -21,10 +22,10 @@ index e7665ed1219..a1fe69d61c4 100644
# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!) # 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 # this is the same value as used in SysV init scripts in the past
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index ffefc2f22d8..f8b0b8aad8d 100644 index 31f1586f1bf..b7094662bbd 100644
--- a/support-files/mariadb@.service.in --- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in
@@ -241,7 +241,7 @@ UMask=007 @@ -243,7 +243,7 @@ UMask=007
# If you don't use the /tmp directory for SELECT ... OUTFILE and # 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. # LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
@ -33,21 +34,25 @@ index ffefc2f22d8..f8b0b8aad8d 100644
# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!) # 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 # this is the same value as used in SysV init scripts in the past
--
2.45.1
From 00aab78891a19a14a92039fcc6a73e391a3bb471 Mon Sep 17 00:00:00 2001
From 51fdbe18eca303edfe68111d02638280edd8f5ad Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de> From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:10:46 +0100 Date: Wed, 19 Feb 2020 13:10:46 +0100
Subject: [PATCH 2/3] force preloading jemalloc for memory management Subject: [PATCH 2/3] force preloading jemalloc for memory management
--- ---
support-files/mariadb.service.in | 1 + support-files/mariadb.service.in | 1 +
support-files/mariadb@.service.in | 1 + support-files/mariadb@.service.in | 1 +
2 files changed, 2 insertions(+) 2 files changed, 2 insertions(+)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index a1fe69d61c4..9a2941ae917 100644 index 9e1ddfc82e1..f48ac56140c 100644
--- a/support-files/mariadb.service.in --- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in
@@ -159,6 +159,7 @@ LimitNOFILE=16364 @@ -165,6 +165,7 @@ LimitNOFILE=32768
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths # Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD). # (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD= # Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@ -56,10 +61,10 @@ index a1fe69d61c4..9a2941ae917 100644
# Flush caches. previously [mysqld_safe] flush-caches=1 # Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync # ExecStartPre=sync
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index f8b0b8aad8d..3309127330c 100644 index b7094662bbd..c6f1605276e 100644
--- a/support-files/mariadb@.service.in --- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in
@@ -282,6 +282,7 @@ LimitNOFILE=16364 @@ -290,6 +290,7 @@ LimitNOFILE=32768
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths # Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD). # (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD= # Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@ -67,8 +72,11 @@ index f8b0b8aad8d..3309127330c 100644
# Flush caches. previously [mysqld_safe] flush-caches=1 # Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync # ExecStartPre=sync
--
2.45.1
From a78ff18c83a5eb2556d4f3716f13786dcd8395d2 Mon Sep 17 00:00:00 2001
From 77d9419c79013e29146d33fe491f8285d6311ead Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de> From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:11:31 +0100 Date: Wed, 19 Feb 2020 13:11:31 +0100
Subject: [PATCH 3/3] Make systemd-tmpfiles create MYSQL_DATADIR Subject: [PATCH 3/3] Make systemd-tmpfiles create MYSQL_DATADIR
@ -81,14 +89,19 @@ systemd-sysusers and uid is not known in advance.
Also this now sets the No_COW attribute. Also this now sets the No_COW attribute.
--- ---
support-files/tmpfiles.conf.in | 2 + support-files/tmpfiles.conf.in | 2 ++
1 file changed, 2 insertion(+) 1 file changed, 2 insertions(+)
diff --git a/support-files/tmpfiles.conf.in b/support-files/tmpfiles.conf.in diff --git a/support-files/tmpfiles.conf.in b/support-files/tmpfiles.conf.in
index 03d66abc0c7..3c89cb258c9 100644 index 70de7a12fdb..101b37f306a 100644
--- a/support-files/tmpfiles.conf.in --- a/support-files/tmpfiles.conf.in
+++ b/support-files/tmpfiles.conf.in +++ b/support-files/tmpfiles.conf.in
@@ -1 +1,3 @@ @@ -9,3 +9,5 @@
d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ - # It shouldn't be used for datadir which is why it
# may be disabled.
@DISABLE_TMP@d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ -
+d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ - +d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -
+h @MYSQL_DATADIR@ - - - - +C +h @MYSQL_DATADIR@ - - - - +C
--
2.45.1

8
extra/mariadb/PKGBUILD
View file

@ -7,8 +7,8 @@
pkgbase=mariadb pkgbase=mariadb
pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop') pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
pkgdesc='Fast SQL database server, derived from MySQL' pkgdesc='Fast SQL database server, derived from MySQL'
pkgver=11.3.2 pkgver=11.4.2
pkgrel=2 pkgrel=1
arch=('x86_64') arch=('x86_64')
license=('GPL') license=('GPL')
url='https://mariadb.org/' url='https://mariadb.org/'
@ -23,14 +23,14 @@ source=("mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-${pkgver
'git+https://github.com/mariadb-corporation/libmarias3.git' 'git+https://github.com/mariadb-corporation/libmarias3.git'
'git+https://github.com/mariadb-corporation/mariadb-columnstore-engine.git' 'git+https://github.com/mariadb-corporation/mariadb-columnstore-engine.git'
'0001-arch-specific.patch') '0001-arch-specific.patch')
sha256sums=('a7ee96e4f90bf5d9f4185f36dae506980242b09578578568ed5ac4334dc05287' sha256sums=('da69b2dee70ebf567cb5ff241a07bac2d45076ddf7465da85d1c17589f4b886d'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460') '966ddd4fa21068e6ab5b560d69f607aa9291790fb15c3be424c20962a26032f9')
prepare() { prepare() {
cd mariadb/ cd mariadb/