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

[Christian Hesse]

    Date: Tuesday, November 5, 2019 @ 00:18:41
  Author: eworm
Revision: 366775

upgpkg: mariadb 10.4.9-1

new upstream release

Modified:
  mariadb/trunk/PKGBUILD
Deleted:
  mariadb/trunk/0007-systemd-service-add-instance-name-in-description.patch

-------------------------------------------------------------+
 0007-systemd-service-add-instance-name-in-description.patch |   32 ----------
 PKGBUILD                                                    |   18 +----
 2 files changed, 6 insertions(+), 44 deletions(-)

Deleted: 0007-systemd-service-add-instance-name-in-description.patch
===================================================================
--- 0007-systemd-service-add-instance-name-in-description.patch	2019-11-04 22:45:12 UTC (rev 366774)
+++ 0007-systemd-service-add-instance-name-in-description.patch	2019-11-05 00:18:41 UTC (rev 366775)
@@ -1,32 +0,0 @@
-From 34ac8a4f31f490db5cec7b6291dc98479c45c78f Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Fri, 1 Mar 2019 10:00:27 +0100
-Subject: [PATCH 1/1] systemd service: add instance name in description
-
-The unit files made systemd print:
-
-systemd[1]: Started MariaDB 10.3.13 database server (multi-instance).
-
-Let's add the instance name, so starting mariadb at foo.service
-makes it print:
-
-systemd[1]: Started MariaDB 10.3.13 database server (multi-instance foo).
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- support-files/mariadb at .service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/support-files/mariadb at .service.in b/support-files/mariadb at .service.in
-index 727c1b85301..fd997b2ce3d 100644
---- a/support-files/mariadb at .service.in
-+++ b/support-files/mariadb at .service.in
-@@ -131,7 +131,7 @@
- # systemd.service(5)
- 
- [Unit]
--Description=MariaDB @VERSION@ database server (multi-instance)
-+Description=MariaDB @VERSION@ database server (multi-instance %I)
- Documentation=man:mysqld(8)
- Documentation=https://mariadb.com/kb/en/library/systemd/
- After=network.target

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-04 22:45:12 UTC (rev 366774)
+++ PKGBUILD	2019-11-05 00:18:41 UTC (rev 366775)
@@ -4,8 +4,8 @@
 pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
-pkgver=10.4.8
-pkgrel=2
+pkgver=10.4.9
+pkgrel=1
 arch=('x86_64')
 license=('GPL')
 url='https://mariadb.org/'
@@ -12,17 +12,15 @@
 makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxml2' 'lz4' 'lzo'
              'openssl' 'systemd' 'zlib' 'zstd')
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key at mariadb.org>
-source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
+source=("https://downloads.mariadb.org/interstitial/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc}
         '0001-arch-specific.patch'
         '0002-systemd-sysusers-tmpfiles.patch'
-        '0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch'
-        '0007-systemd-service-add-instance-name-in-description.patch')
-sha256sums=('10cc2c3bdb76733c9c6fd1e3c6c860d8b4282c85926da7d472d2a0e00fffca9b'
+        '0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch')
+sha256sums=('5c924fc516aa1794afec49362c7e07ba95de0c94f324056a23f7ae88658e0f84'
             'SKIP'
             'ce72ea1563ad773e00e8b1c299babea176abae1102827c2f743921e9de615041'
             '3e83467af80fbd53400a201a34fc858b88509ea8e88b10709947eb66545f9457'
-            'c8c801f80924ccb97b499552fe1c532b3ebf8f86cdfc0d23715d4adb1a8810f0'
-            'd4575c349fdc6268135cd3483e70e04b149ec8004583bac7f79f190a084cbfc8')
+            'c8c801f80924ccb97b499552fe1c532b3ebf8f86cdfc0d23715d4adb1a8810f0')
 
 prepare() {
   cd $pkgbase-$pkgver/
@@ -42,10 +40,6 @@
   # fix galera_recovery with fs.protected_regular enabled
   # https://github.com/MariaDB/server/pull/1137
   patch -Np1 < ../0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch
-
-  # systemd service: add instance name in description
-  # https://github.com/MariaDB/server/pull/1216
-  patch -Np1 < ../0007-systemd-service-add-instance-name-in-description.patch
 }
 
 build() {