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

[Christian Hesse]

    Date: Thursday, February 21, 2019 @ 11:22:04
  Author: eworm
Revision: 346614

upgpkg: mariadb 10.3.13-1

new upstream release

Modified:
  mariadb/trunk/PKGBUILD
Deleted:
  mariadb/trunk/0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch

---------------------------------------------------------------------------------+
 0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch |   31 ----------
 PKGBUILD                                                                        |   16 +----
 2 files changed, 4 insertions(+), 43 deletions(-)

Deleted: 0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch
===================================================================
--- 0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch	2019-02-21 07:38:07 UTC (rev 346613)
+++ 0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch	2019-02-21 11:22:04 UTC (rev 346614)
@@ -1,31 +0,0 @@
-From 8b87e87252f7d0599a99f18cd5f51914d2611397 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu at mariadb.org>
-Date: Thu, 24 Jan 2019 00:58:20 +0200
-Subject: MDEV-18360 Prevent set_max_open_files from allocating too many files
-
-If the rlimit.rlim_cur value returned by getrlimit is not the
-RLIM_INFINITY magic constant, but a *very* large number, we can allocate
-too many open files. Restrict set_max_open_files to only return at most
-max_file_limit, as passed via its parameter.
----
- mysys/my_file.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/mysys/my_file.c b/mysys/my_file.c
-index 8d01285a94b..b3aef8494cb 100644
---- a/mysys/my_file.c
-+++ b/mysys/my_file.c
-@@ -52,10 +52,9 @@ static uint set_max_open_files(uint max_file_limit)
-     DBUG_PRINT("info", ("rlim_cur: %u  rlim_max: %u",
- 			(uint) rlimit.rlim_cur,
- 			(uint) rlimit.rlim_max));
--    if ((ulonglong) rlimit.rlim_cur == (ulonglong) RLIM_INFINITY)
--      rlimit.rlim_cur = max_file_limit;
--    if (rlimit.rlim_cur >= max_file_limit)
--      DBUG_RETURN(rlimit.rlim_cur);		/* purecov: inspected */
-+    if ((ulonglong) rlimit.rlim_cur == (ulonglong) RLIM_INFINITY ||
-+        rlimit.rlim_cur >= max_file_limit)
-+      DBUG_RETURN(max_file_limit);
-     rlimit.rlim_cur= rlimit.rlim_max= max_file_limit;
-     if (setrlimit(RLIMIT_NOFILE, &rlimit))
-       max_file_limit= old_cur;			/* Use original value */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-21 07:38:07 UTC (rev 346613)
+++ PKGBUILD	2019-02-21 11:22:04 UTC (rev 346614)
@@ -4,8 +4,8 @@
 pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
-pkgver=10.3.12
-pkgrel=5
+pkgver=10.3.13
+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://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
+source=("https://mirrors.n-ix.net/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
         '0001-arch-specific.patch'
         '0002-systemd-sysusers-tmpfiles.patch'
-        '0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch'
         '0004-do-not-break-main-configuration-with-instantiated-one.patch'
         '0005-fix-galera_recovery-with-fs.protected_regular-enabled.patch')
-sha256sums=('f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6'
+sha256sums=('b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a'
             'SKIP'
             '5a443a403821931ce35759e9583d23cd809b3b5a5df5b8293ac8e33b9c0cbc0f'
             '1cd009b473d5965c7cbe6d48fff272030a2ccdd9c7e67b4f837d03252786a09a'
-            'f2a93769bfd9a5421871846b091ff752dfceea1791beab2ee55ac93d24df02c7'
             'd12806e4f90cc0fc081205dd4c0a5e0e7c455844f04276811b61b57fd24f5545'
             '66e0acac7436fd8925710ef5cc66ba1a8f63a385ce374f01ae83096cc33d97a0')
 
@@ -41,12 +39,6 @@
   # https://github.com/MariaDB/server/pull/530
   patch -Np1 < ../0002-systemd-sysusers-tmpfiles.patch
 
-  # MDEV-18360 Prevent set_max_open_files from allocating too many files
-  # https://bugs.archlinux.org/task/61433
-  # https://github.com/systemd/systemd/issues/11510
-  # https://jira.mariadb.org/browse/MDEV-18360
-  patch -Np1 < ../0003-MDEV-18360-Prevent-set_max_open_files-from-allocating-too-many-files.patch
-
   # do not break main configuration with instantiated one
   # https://github.com/MariaDB/server/pull/1095
   patch -Np1 < ../0004-do-not-break-main-configuration-with-instantiated-one.patch