diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index b0ed6e88d0..8bc44eb706 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb -PKG_VERSION:=10.6.10 +PKG_VERSION:=10.6.15 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source -PKG_HASH:=6ad9fa86f0c85c8eeafad2643549d5ff5dd2872002964e754752de91863aa3b7 +PKG_HASH:=b2f6bdba17ead4d91c4d254fafc34a728ac6b027dd1d7178bc26758dce694335 PKG_MAINTAINER:=Michal Hrusecky 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 24838f5a45..2bae23f9d4 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 -@@ -425,7 +425,7 @@ fi +@@ -427,7 +427,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 35dcee947e..9673eba0bb 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 -@@ -364,6 +364,14 @@ then +@@ -366,6 +366,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" -@@ -489,7 +497,9 @@ do +@@ -491,7 +499,9 @@ do fi done @@ -26,7 +26,7 @@ then if test -z "$srcdir" -a "$in_rpm" -eq 0 then -@@ -510,6 +520,10 @@ then +@@ -512,6 +522,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)