upgpkg(main/mariadb): update to 10.8.4

packages/mariadb/build.sh

@@ -2,14 +2,10 @@ 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.7
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=2:10.8.4
 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=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
-TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl-1.1, pcre2, libcrypt, libandroid-support, libandroid-glob, zlib, liblz4"
+TERMUX_PKG_SHA256=65ec60ca36588ecd11cd8c3fc0ce35e1d603029e12378cf88baa865fd0891166
+TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre2, libcrypt, libandroid-support, libandroid-glob, zlib, liblz4"
 TERMUX_PKG_BREAKS="mariadb-dev"
 TERMUX_PKG_REPLACES="mariadb-dev"
 TERMUX_PKG_SERVICE_SCRIPT=("mysqld" "exec mysqld --basedir=$TERMUX_PREFIX --datadir=$TERMUX_PREFIX/var/lib/mysql 2>&1")
@@ -57,10 +53,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_INNODB_SNAPPY=OFF
 -DWITH_UNIT_TESTS=OFF
 -DINSTALL_SYSCONFDIR=$TERMUX_PREFIX/etc
--DOPENSSL_INCLUDE_DIR=$TERMUX_PREFIX/include/openssl-1.1
--DOPENSSL_LIBRARIES=$TERMUX_PREFIX/lib/openssl-1.1
--DOPENSSL_CRYPTO_LIBRARY=$TERMUX_PREFIX/lib/openssl-1.1/libcrypto.so.1.1
--DOPENSSL_SSL_LIBRARY=$TERMUX_PREFIX/lib/openssl-1.1/libssl.so.1.1
 "
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_CMAKE_BUILD="Unix Makefiles"
@@ -108,10 +100,6 @@ termux_step_pre_configure() {
 	fi
 	sed -i 's/^\s*END[(][)]/ENDIF()/g' $TERMUX_PKG_SRCDIR/libmariadb/cmake/ConnectorName.cmake
 
-	CFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CFLAGS"
-	CPPFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CPPFLAGS"
-	CXXFLAGS="-I$TERMUX_PREFIX/include/openssl-1.1 $CXXFLAGS"
-	LDFLAGS="-L$TERMUX_PREFIX/lib/openssl-1.1 -Wl,-rpath=$TERMUX_PREFIX/lib/openssl-1.1 $LDFLAGS"
 }
 
 termux_step_post_massage() {

packages/mariadb/client-mysql.cc.patch

@@ -1,25 +0,0 @@
-diff -u -r ../mariadb-10.1.22/client/mysql.cc ./client/mysql.cc
---- ../mariadb-10.1.22/client/mysql.cc	2017-03-11 20:08:54.000000000 +0100
-+++ ./client/mysql.cc	2017-04-07 03:12:08.091397345 +0200
-@@ -2676,9 +2676,9 @@
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
--  rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  rl_add_defun("magic-space", (rl_command_func_t*)&fake_magic_space, -1);
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2700,7 +2700,7 @@
- #if defined(USE_NEW_READLINE_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
--    return completion_matches((char *)text, (CPFunction *)new_command_generator);
-+    return completion_matches((char *)text, (rl_compentry_func_t *)new_command_generator);
- #endif
-   else
-     return (char**) 0;

packages/mariadb/cmake-readline.cmake.patch

@@ -1,12 +0,0 @@
-diff -u -r ../mariadb-10.1.22/cmake/readline.cmake ./cmake/readline.cmake
---- ../mariadb-10.1.22/cmake/readline.cmake	2017-03-11 20:08:54.000000000 +0100
-+++ ./cmake/readline.cmake	2017-04-07 02:43:58.242765383 +0200
-@@ -180,7 +180,7 @@
-     #include <readline.h>
-     int main(int argc, char **argv)
-     {
--      int res= (*rl_completion_entry_function)(0,0);
-+      char* res= (*rl_completion_entry_function)(0,0);
-       completion_matches(0,0);
-     }"
-     LIBEDIT_INTERFACE)

packages/mariadb/scripts-mysql_install_db.sh.patch

@@ -1,6 +1,7 @@
---- a/scripts/mysql_install_db.sh
-+++ b/scripts/mysql_install_db.sh
-@@ -472,47 +472,8 @@
+diff -uNr mariadb-10.8.4/scripts/mysql_install_db.sh mariadb-10.8.4.mod/scripts/mysql_install_db.sh
+--- mariadb-10.8.4/scripts/mysql_install_db.sh	2022-08-10 17:30:23.000000000 +0530
++++ mariadb-10.8.4.mod/scripts/mysql_install_db.sh	2022-08-22 14:51:13.609730054 +0530
+@@ -484,47 +484,8 @@
      fi
      chmod 700 "$dir"
    fi
@@ -45,6 +46,6 @@
 -  args="$args --user=$user"
 -fi
 -
- if test -n "$group"
- then
-   args="$args --group=$group"
+ #To be enabled if/when we enable --group as an option to mysqld
+ #if test -n "$group"
+ #then