[arch-commits] Commit in mariadb/trunk (0002-use-uname-n.patch PKGBUILD)

[Christian Hesse]

    Date: Wednesday, November 4, 2020 @ 06:57:59
  Author: eworm
Revision: 399238

upgpkg: mariadb 10.5.7-1: new upstream release

Modified:
  mariadb/trunk/PKGBUILD
Deleted:
  mariadb/trunk/0002-use-uname-n.patch

------------------------+
 0002-use-uname-n.patch |   34 ----------------------------------
 PKGBUILD               |   15 +++++----------
 2 files changed, 5 insertions(+), 44 deletions(-)

Deleted: 0002-use-uname-n.patch
===================================================================
--- 0002-use-uname-n.patch	2020-11-04 06:39:12 UTC (rev 399237)
+++ 0002-use-uname-n.patch	2020-11-04 06:57:59 UTC (rev 399238)
@@ -1,34 +0,0 @@
-commit 1bb3ad6dfc885112d05d8d73b066f18a416ca965
-Author: Geert Hendrickx <geert at hendrickx.be>
-Date:   Thu Aug 27 17:30:03 2020 +0200
-
-    MDEV-23589: Portability: use `uname -n` instead of `hostname`
-    
-    Closes PR #1663
-
-diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
-index 33e32ea22f7..eafb051ad60 100644
---- a/scripts/CMakeLists.txt
-+++ b/scripts/CMakeLists.txt
-@@ -162,7 +162,7 @@ ELSE()
-   SET(CHECK_PID "kill -s SIGCONT $PID  > /dev/null 2> /dev/null")
- ENDIF()
- 
--SET(HOSTNAME "hostname")
-+SET(HOSTNAME "uname -n")
- SET(MYSQLD_USER "mysql")
- ENDIF(UNIX)
- 
-diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
-index 80b6ca386df..2a17cf6d0d8 100644
---- a/support-files/CMakeLists.txt
-+++ b/support-files/CMakeLists.txt
-@@ -30,7 +30,7 @@ ELSE()
-   SET(CXXFLAGS ${CMAKE_CXX_FLAGS})
-   SET(MYSQLD_USER "mysql")
-   SET(ini_file_extension "cnf")
--  SET(HOSTNAME "hostname")
-+  SET(HOSTNAME "uname -n")
- ENDIF()
- 
- # XXX: shouldn't we just have variables for all this stuff and centralise

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-04 06:39:12 UTC (rev 399237)
+++ PKGBUILD	2020-11-04 06:57:59 UTC (rev 399238)
@@ -4,8 +4,8 @@
 pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
-pkgver=10.5.6
-pkgrel=3
+pkgver=10.5.7
+pkgrel=1
 arch=('x86_64')
 license=('GPL')
 url='https://mariadb.org/'
@@ -18,12 +18,10 @@
 # rsync source via https and hope it does not hurt them too much.
 # https://mariadb.com/kb/en/library/mirror-sites-for-mariadb/
 source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc}
-        '0001-arch-specific.patch'
-        '0002-use-uname-n.patch')
-sha256sums=('ff05dd69e9f6992caf1053242db704f04eda6f9accbcc98b74edfaf6013c45c4'
+        '0001-arch-specific.patch')
+sha256sums=('c06748da7f707b62990b1a7086ed80e68eed396dd3682253130bddbbfacc9039'
             'SKIP'
-            '3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460'
-            '0605142beb6ee2e72957696f2e5b10d3084c6423bc17207fb73cd71306cae8d9')
+            '3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460')
 
 prepare() {
   cd $pkgbase-$pkgver/
@@ -33,9 +31,6 @@
   #  * force preloading jemalloc for memory management
   #  * make systemd-tmpfiles create MYSQL_DATADIR
   patch -Np1 < ../0001-arch-specific.patch
-
-  # MDEV-23589: Portability: use `uname -n` instead of `hostname`
-  patch -Np1 < ../0002-use-uname-n.patch
 }
 
 build() {