mariadb: Update to 10.6.7

packages/mariadb/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://mariadb.org
 TERMUX_PKG_DESCRIPTION="A drop-in replacement for mysql server"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2:10.6.5
+TERMUX_PKG_VERSION=2:10.6.7
 TERMUX_PKG_SRCURL=http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-${TERMUX_PKG_VERSION:2}/source/mariadb-${TERMUX_PKG_VERSION:2}.tar.gz
-TERMUX_PKG_SHA256=e0be040428d9a42a8bb4bd221b567ff2522cd6fa8906386273da4f03c5c20a8f
+TERMUX_PKG_SHA256=75ee0f1f865a765fc461ab165419417a719e308faba784b2c97ecbe9e4b4b2c5
 # MariaDB 10.6.x does not support OpenSSL 3.0:
 #   https://github.com/MariaDB/server/commit/c9beef43154a199bfcd9f71049c011a2ed77ca74
 #   https://jira.mariadb.org/browse/MDEV-25785
@@ -62,6 +62,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DOPENSSL_SSL_LIBRARY=$TERMUX_PREFIX/lib/openssl-1.1/libssl.so.1.1
 "
 TERMUX_PKG_HOSTBUILD=true
+TERMUX_CMAKE_BUILD="Unix Makefiles"
 TERMUX_PKG_CONFLICTS="mysql"
 
 TERMUX_PKG_RM_AFTER_INSTALL="

packages/mariadb/mariadb-10.6.x-no-openssl-3.0.patch

@@ -1,23 +0,0 @@
-From c9beef43154a199bfcd9f71049c011a2ed77ca74 Mon Sep 17 00:00:00 2001
-From: Sergei Golubchik <serg@mariadb.org>
-Date: Sat, 15 Jan 2022 17:33:28 +0100
-Subject: [PATCH] don't build with OpenSSL 3.0, it doesn't work before
- MDEV-25785
-
----
- cmake/ssl.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
-index 1b23882631169..707aa4a017f3e 100644
---- a/cmake/ssl.cmake
-+++ b/cmake/ssl.cmake
-@@ -127,7 +127,7 @@ MACRO (MYSQL_CHECK_SSL)
-     ENDIF()
-     FIND_PACKAGE(OpenSSL)
-     SET_PACKAGE_PROPERTIES(OpenSSL PROPERTIES TYPE RECOMMENDED)
--    IF(OPENSSL_FOUND)
-+    IF(OPENSSL_FOUND AND OPENSSL_VERSION AND OPENSSL_VERSION VERSION_LESS "3.0.0")
-       SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
-       SET(SSL_SOURCES "")
-       SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})

packages/mariadb/scripts-mysql_install_db.sh.patch

@@ -1,13 +1,17 @@
-diff -u -r ../mariadb-10.4.12/scripts/mysql_install_db.sh ./scripts/mysql_install_db.sh
---- ../mariadb-10.4.12/scripts/mysql_install_db.sh	2020-01-26 20:43:53.000000000 +0000
-+++ ./scripts/mysql_install_db.sh	2020-02-15 23:19:05.141979000 +0000
-@@ -466,42 +466,8 @@
+--- a/scripts/mysql_install_db.sh
++++ b/scripts/mysql_install_db.sh
+@@ -472,47 +472,8 @@
      fi
      chmod 700 "$dir"
    fi
 -  if test -n "$user"
 -  then
--    chown $user "$dir"
+-    if test -z "$group"
+-    then
+-      chown $user $dir
+-    else
+-      chown $user:$group $dir
+-    fi
 -    if test $? -ne 0
 -    then
 -      echo "Cannot change ownership of the database directories to the '$user'"
@@ -41,6 +45,6 @@ diff -u -r ../mariadb-10.4.12/scripts/mysql_install_db.sh ./scripts/mysql_instal
 -  args="$args --user=$user"
 -fi
 -
- if test -f "$ldata/mysql/user.frm"
+ if test -n "$group"
  then
-     echo "mysql.user table already exists!"
+   args="$args --group=$group"