From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 19 Dec 2023 00:39:09 +0000 (-0800)
Subject: mariadb: update to 10.9.8
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=94fd89a609086e1a4f859a148f3c90add04f60bb;hp=1db5c5461778223c661ae9206f3c5d6929081b84;p=feed%2Fpackages.git

mariadb: update to 10.9.8

Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Tested-by: Michael Heimpold <mhei@heimpold.de>
---

diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile
index e47221e32a..31806c2b1e 100644
--- a/utils/mariadb/Makefile
+++ b/utils/mariadb/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mariadb
-PKG_VERSION:=10.9.3
-PKG_RELEASE:=4
+PKG_VERSION:=10.9.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source
 
-PKG_HASH:=9a1e229972fcccc8270e633f68d3fb824da151dcf4f53da1df8d947aca876bee
+PKG_HASH:=fcdc6f73882477c20310e795a02f746e54934aa7a8b368900bd45e78a5daf6ed
 PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING THIRDPARTY
diff --git a/utils/mariadb/patches/100-fix_hostname.patch b/utils/mariadb/patches/100-fix_hostname.patch
index 71bbc5c94c..40f4fb57ba 100644
--- a/utils/mariadb/patches/100-fix_hostname.patch
+++ b/utils/mariadb/patches/100-fix_hostname.patch
@@ -1,6 +1,6 @@
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -437,7 +437,7 @@ fi
+@@ -439,7 +439,7 @@ fi
  
  
  # Try to determine the hostname
diff --git a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
index b649ce0395..7e99322fda 100644
--- a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
+++ b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
@@ -1,6 +1,6 @@
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -369,6 +369,14 @@ then
+@@ -371,6 +371,14 @@ then
      exit 1
    fi
    plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
@@ -15,7 +15,7 @@
    pamtooldir=$plugindir
  # relative from where the script was run for a relocatable install
  elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mariadbd"
-@@ -501,7 +509,9 @@ do
+@@ -503,7 +511,9 @@ do
    fi
  done
  
@@ -26,7 +26,7 @@
  then
    if test -z "$srcdir" -a "$in_rpm" -eq 0
    then
-@@ -522,6 +532,10 @@ then
+@@ -524,6 +534,10 @@ then
          echo
      fi
    fi
diff --git a/utils/mariadb/patches/200-no-selinux.patch b/utils/mariadb/patches/200-no-selinux.patch
index da60406700..2b6cee945a 100644
--- a/utils/mariadb/patches/200-no-selinux.patch
+++ b/utils/mariadb/patches/200-no-selinux.patch
@@ -1,6 +1,6 @@
 --- a/support-files/CMakeLists.txt
 +++ b/support-files/CMakeLists.txt
-@@ -62,7 +62,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -66,7 +66,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
      INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT SupportFiles)
      FIND_PROGRAM(CHECKMODULE checkmodule)
diff --git a/utils/mariadb/patches/300-gcc-13-compatibility-fix.patch b/utils/mariadb/patches/300-gcc-13-compatibility-fix.patch
deleted file mode 100644
index 839e80802e..0000000000
--- a/utils/mariadb/patches/300-gcc-13-compatibility-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tpool/aio_liburing.cc
-+++ b/tpool/aio_liburing.cc
-@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include <algorithm>
- #include <vector>
- #include <thread>
-+#include <stdexcept>
- #include <mutex>
- 
- namespace