From 3a2d0ae8408cdce0ad24bba1ea70a66d4ee413d0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 14 Aug 2024 10:24:08 +0000 Subject: [PATCH] extra/mariadb to 11.4.3-1 --- extra/mariadb/.SRCINFO | 18 +++++++++--------- extra/mariadb/PKGBUILD | 16 ++++++++++++---- extra/mariadb/mariadb.install | 14 +++++++++----- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/extra/mariadb/.SRCINFO b/extra/mariadb/.SRCINFO index db43acff4..0ee29e014 100644 --- a/extra/mariadb/.SRCINFO +++ b/extra/mariadb/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mariadb pkgdesc = Fast SQL database server, derived from MySQL - pkgver = 11.4.2 + pkgver = 11.4.3 pkgrel = 1 url = https://mariadb.org/ arch = x86_64 @@ -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.2?signed + source = mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-11.4.3?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,7 +33,7 @@ pkgbase = mariadb source = git+https://github.com/mariadb-corporation/mariadb-columnstore-engine.git source = 0001-arch-specific.patch validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8 - sha256sums = da69b2dee70ebf567cb5ff241a07bac2d45076ddf7465da85d1c17589f4b886d + sha256sums = 3f182bc2011b7419df613308cb969374389b9ca8aa81539c515e3ba9c8695d07 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -63,21 +63,21 @@ pkgname = mariadb-libs pkgname = mariadb-clients pkgdesc = MariaDB client tools - depends = mariadb-libs=11.4.2 + depends = mariadb-libs=11.4.3 depends = jemalloc depends = ncurses - provides = mysql-clients=11.4.2 + provides = mysql-clients=11.4.3 conflicts = mysql-clients pkgname = mariadb pkgdesc = Fast SQL database server, derived from MySQL install = mariadb.install - depends = mariadb-clients=11.4.2 + depends = mariadb-clients=11.4.3 depends = bzip2 + depends = coreutils depends = libxml2 depends = lz4 depends = systemd-libs - depends = libxml2 depends = zstd optdepends = cracklib: for cracklib plugin optdepends = curl: for ha_s3 plugin @@ -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 - provides = mysql=11.4.2 + provides = mariadb-server=11.4.3 + provides = mysql=11.4.3 conflicts = mysql options = emptydirs backup = etc/my.cnf diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 1510d7e87..b50b14f15 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -4,10 +4,17 @@ # - disable mroonga storage engine (doesn't build on ARM) # - build v7 with -j1 +# ➡️ The mariadb package will be latest stable (GA / General Availability) +# release, regardless of rolling or long-term release. +# ➡️ The mariadb-lts package will be latest long-term release not packaged +# in mariadb. So mariadb-lts will always be behind mariadb, please do not +# flag out-of-date too early! +# https://mariadb.com/kb/en/mariadb-server-release-dates/ + pkgbase=mariadb pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop') pkgdesc='Fast SQL database server, derived from MySQL' -pkgver=11.4.2 +pkgver=11.4.3 pkgrel=1 arch=('x86_64') license=('GPL') @@ -23,7 +30,7 @@ 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=('da69b2dee70ebf567cb5ff241a07bac2d45076ddf7465da85d1c17589f4b886d' +sha256sums=('3f182bc2011b7419df613308cb969374389b9ca8aa81539c515e3ba9c8695d07' 'SKIP' 'SKIP' 'SKIP' @@ -189,7 +196,8 @@ package_mariadb() { 'etc/my.cnf.d/spider.cnf' 'etc/security/user_map.conf') install=mariadb.install - depends=("mariadb-clients=${pkgver}" 'bzip2' 'libxml2' 'lz4' 'systemd-libs' 'libxml2' 'zstd') + depends=("mariadb-clients=${pkgver}" 'bzip2' 'coreutils' 'libxml2' 'lz4' + 'systemd-libs' 'zstd') optdepends=('cracklib: for cracklib plugin' 'curl: for ha_s3 plugin' 'galera: for MariaDB cluster with Galera WSREP' @@ -198,7 +206,7 @@ package_mariadb() { 'python-mysqlclient: for myrocks_hotbackup' 'xz: lzma provider') conflicts=('mysql') - provides=('mariadb-server' "mysql=${pkgver}") + provides=("mariadb-server=${pkgver}" "mysql=${pkgver}") options=('emptydirs') cd build diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install index bad452677..aa379d3d4 100644 --- a/extra/mariadb/mariadb.install +++ b/extra/mariadb/mariadb.install @@ -1,15 +1,19 @@ #!/bin/sh post_install() { - echo ":: You need to initialize the MariaDB data directory prior to starting" - echo " the service. This can be done with mariadb-install-db command, e.g.:" - echo " # mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql" + cat <<-EOM + :: You need to initialize the MariaDB data directory prior to starting + the service. This can be done with mariadb-install-db command, e.g.: + # mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql + EOM } post_upgrade() { # show for feature release: 10.1 -> 10.2 -> 10.3 -> ... if [ $(vercmp "${1%.*-*}" "${2%.*-*}") -ne 0 ]; then - echo ":: MariaDB was updated to a new feature release. To update the data run:" - echo " # systemctl restart mariadb.service && mariadb-upgrade -u root -p" + cat <<-EOM + :: MariaDB was updated to a new feature release. To update the data run: + # systemctl restart mariadb.service && mariadb-upgrade -u root -p + EOM fi }