diff --git a/extra/mariadb/.SRCINFO b/extra/mariadb/.SRCINFO index 0ee29e014..516581a5a 100644 --- a/extra/mariadb/.SRCINFO +++ b/extra/mariadb/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = mariadb pkgdesc = Fast SQL database server, derived from MySQL - pkgver = 11.4.3 + pkgver = 11.5.2 pkgrel = 1 url = https://mariadb.org/ arch = x86_64 - license = GPL + license = GPL-2.0-only makedepends = git makedepends = boost makedepends = bzip2 @@ -24,7 +24,7 @@ pkgbase = mariadb makedepends = zlib makedepends = zstd makedepends = xz - source = mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-11.4.3?signed + source = mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-11.5.2?signed source = git+https://github.com/MariaDB/mariadb-connector-c.git source = git+https://github.com/facebook/rocksdb.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 = 0001-arch-specific.patch validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8 - sha256sums = 3f182bc2011b7419df613308cb969374389b9ca8aa81539c515e3ba9c8695d07 + sha256sums = da69a53d27a52b64c15b5c665c2d48d7ed362ae51d01f32edd0b29f69b8f8e96 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 966ddd4fa21068e6ab5b560d69f607aa9291790fb15c3be424c20962a26032f9 + sha256sums = 08c2c661159f4a7c54a764bb13459e37cbccdf98a93c2cf151d53f600f1fa35d pkgname = mariadb-libs pkgdesc = MariaDB libraries @@ -63,16 +63,16 @@ pkgname = mariadb-libs pkgname = mariadb-clients pkgdesc = MariaDB client tools - depends = mariadb-libs=11.4.3 + depends = mariadb-libs=11.5.2 depends = jemalloc depends = ncurses - provides = mysql-clients=11.4.3 + provides = mysql-clients=11.5.2 conflicts = mysql-clients pkgname = mariadb pkgdesc = Fast SQL database server, derived from MySQL install = mariadb.install - depends = mariadb-clients=11.4.3 + depends = mariadb-clients=11.5.2 depends = bzip2 depends = coreutils depends = libxml2 @@ -86,8 +86,8 @@ pkgname = mariadb optdepends = perl-dbd-mariadb: for mariadb-hotcopy, mariadb-convert-table-format and mariadb-setpermission optdepends = python-mysqlclient: for myrocks_hotbackup optdepends = xz: lzma provider - provides = mariadb-server=11.4.3 - provides = mysql=11.4.3 + provides = mariadb-server=11.5.2 + provides = mysql=11.5.2 conflicts = mysql options = emptydirs backup = etc/my.cnf diff --git a/extra/mariadb/0001-arch-specific.patch b/extra/mariadb/0001-arch-specific.patch index 02eccfd55..90e0af301 100644 --- a/extra/mariadb/0001-arch-specific.patch +++ b/extra/mariadb/0001-arch-specific.patch @@ -1,4 +1,4 @@ -From ceef73b08ba6e73d9477b583e1a4695c0854c0f3 Mon Sep 17 00:00:00 2001 +From f7f319cc00c5c7a9cfaad918989995543295474f Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 19 Feb 2020 13:10:17 +0100 Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security @@ -9,7 +9,7 @@ Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in -index 79c8b9a8cca..9e1ddfc82e1 100644 +index e47a67f6880..54cd9776e41 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -129,7 +129,7 @@ UMask=007 @@ -35,10 +35,10 @@ index 31f1586f1bf..b7094662bbd 100644 # 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 -- -2.45.1 +2.46.0 -From 51fdbe18eca303edfe68111d02638280edd8f5ad Mon Sep 17 00:00:00 2001 +From e88246b9f23f4b1a0879c494efe0d8703069e1ec Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 19 Feb 2020 13:10:46 +0100 Subject: [PATCH 2/3] force preloading jemalloc for memory management @@ -49,7 +49,7 @@ Subject: [PATCH 2/3] force preloading jemalloc for memory management 2 files changed, 2 insertions(+) diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in -index 9e1ddfc82e1..f48ac56140c 100644 +index 54cd9776e41..6b9eec7dbc5 100644 --- a/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in @@ -165,6 +165,7 @@ LimitNOFILE=32768 @@ -73,10 +73,10 @@ index b7094662bbd..c6f1605276e 100644 # Flush caches. previously [mysqld_safe] flush-caches=1 # ExecStartPre=sync -- -2.45.1 +2.46.0 -From 77d9419c79013e29146d33fe491f8285d6311ead Mon Sep 17 00:00:00 2001 +From 805eab247057095b013cda026ab211e9805177da Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 19 Feb 2020 13:11:31 +0100 Subject: [PATCH 3/3] Make systemd-tmpfiles create MYSQL_DATADIR @@ -103,5 +103,5 @@ index 70de7a12fdb..101b37f306a 100644 +d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ - +h @MYSQL_DATADIR@ - - - - +C -- -2.45.1 +2.46.0 diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index b50b14f15..192ca2739 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -14,10 +14,10 @@ pkgbase=mariadb pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop') pkgdesc='Fast SQL database server, derived from MySQL' -pkgver=11.4.3 +pkgver=11.5.2 pkgrel=1 arch=('x86_64') -license=('GPL') +license=('GPL-2.0-only') url='https://mariadb.org/' makedepends=('git' 'boost' 'bzip2' 'cmake' 'cracklib' 'curl' 'jemalloc' 'judy' 'krb5' 'liburing' 'libxcrypt' 'libxml2' 'lz4' 'openssl' 'pcre2' 'systemd' 'zlib' 'zstd' 'xz') @@ -30,14 +30,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/mariadb-columnstore-engine.git' '0001-arch-specific.patch') -sha256sums=('3f182bc2011b7419df613308cb969374389b9ca8aa81539c515e3ba9c8695d07' +sha256sums=('da69a53d27a52b64c15b5c665c2d48d7ed362ae51d01f32edd0b29f69b8f8e96' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - '966ddd4fa21068e6ab5b560d69f607aa9291790fb15c3be424c20962a26032f9') + '08c2c661159f4a7c54a764bb13459e37cbccdf98a93c2cf151d53f600f1fa35d') prepare() { cd mariadb/