mariadb: Update from 10.4.13 to 10.5.4

Also try enabling lz4 compression support (see #5524).

packages/mariadb/build.sh

@@ -1,10 +1,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_VERSION=2:10.4.13
+TERMUX_PKG_VERSION=2:10.5.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=45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df
+TERMUX_PKG_SHA256=26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72
-TERMUX_PKG_DEPENDS="libc++, libiconv, liblzma, ncurses, libedit, openssl, pcre, libcrypt, libandroid-support, libandroid-glob, zlib"
+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=$PREFIX --datadir=$PREFIX/var/lib/mysql 2>&1')
@@ -16,7 +16,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCAT_EXECUTABLE=$(which cat)
 -DGIT_EXECUTABLE=$(which git)
 -DGSSAPI_FOUND=NO
--DGRN_WITH_LZ4=no
+-DGRN_WITH_LZ4=ON
 -DENABLED_LOCAL_INFILE=ON
 -DHAVE_UCONTEXT_H=False
 -DIMPORT_EXECUTABLES=$TERMUX_PKG_HOSTBUILD_DIR/import_executables.cmake
@@ -40,12 +40,13 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_JEMALLOC=OFF
 -DWITH_MARIABACKUP=OFF
 -DWITH_PCRE=system
+-DWITH_LZ4=system
 -DWITH_READLINE=OFF
 -DWITH_SSL=system
 -DWITH_WSREP=False
 -DWITH_ZLIB=system
 -DWITH_INNODB_BZIP2=OFF
--DWITH_INNODB_LZ4=OFF
+-DWITH_INNODB_LZ4=ON
 -DWITH_INNODB_LZMA=ON
 -DWITH_INNODB_LZO=OFF
 -DWITH_INNODB_SNAPPY=OFF

packages/mariadb/client-CMakeLists.txt.patch

@@ -1,23 +1,25 @@
-diff -uNr mariadb-10.4.6/client/CMakeLists.txt mariadb-10.4.6.mod/client/CMakeLists.txt
+diff -u -r ../mariadb-10.5.4/client/CMakeLists.txt ./client/CMakeLists.txt
---- mariadb-10.4.6/client/CMakeLists.txt	2019-06-18 01:00:31.000000000 +0300
+--- ../mariadb-10.5.4/client/CMakeLists.txt	2020-06-23 15:10:16.000000000 +0000
-+++ mariadb-10.4.6.mod/client/CMakeLists.txt	2019-07-24 17:53:17.771246533 +0300
++++ ./client/CMakeLists.txt	2020-08-08 22:15:12.186057790 +0000
-@@ -44,10 +44,6 @@
+@@ -44,12 +44,6 @@
-   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
+   SET_TARGET_PROPERTIES(mariadb PROPERTIES ENABLE_EXPORTS TRUE)
  ENDIF(UNIX)
  
--MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+-MYSQL_ADD_EXECUTABLE(mariadb-test mysqltest.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc COMPONENT Test)
--SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+-SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS ${PCRE2_DEBIAN_HACK}")
--TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
+-TARGET_LINK_LIBRARIES(mariadb-test  ${CLIENT_LIB} pcre2-posix pcre2-8)
--SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+-SET_TARGET_PROPERTIES(mariadb-test PROPERTIES ENABLE_EXPORTS TRUE)
+-
+-
+ MYSQL_ADD_EXECUTABLE(mariadb-check mysqlcheck.c)
+ TARGET_LINK_LIBRARIES(mariadb-check ${CLIENT_LIB})
  
-
+@@ -96,7 +90,7 @@
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+ SET_TARGET_PROPERTIES (mariadb-check mariadb-dump mariadb-import mariadb-upgrade mariadb-show mariadb-slap mariadb-plugin async_example
-@@ -92,7 +88,7 @@
- SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
  PROPERTIES HAS_CXX TRUE)
  
--FOREACH(t mysql mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
+-FOREACH(t mariadb mariadb-test mariadb-check mariadb-dump mariadb-import mariadb-upgrade mariadb-show mariadb-plugin mariadb-binlog
-+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
++FOREACH(t mariadb mariadb-check mariadb-dump mariadb-import mariadb-upgrade mariadb-show mariadb-plugin mariadb-binlog
-   mysqladmin mysqlslap async_example)
+   mariadb-admin mariadb-slap async_example)
    ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
  ENDFOREACH()

packages/mariadb/cmake-install_layout.cmake.patch

@@ -1,11 +1,11 @@
-diff -u -r ../mariadb-10.3.8/cmake/install_layout.cmake ./cmake/install_layout.cmake
+diff -u -r ../mariadb-10.5.4/cmake/install_layout.cmake ./cmake/install_layout.cmake
---- ../mariadb-10.3.8/cmake/install_layout.cmake	2018-07-02 09:34:08.000000000 +0200
+--- ../mariadb-10.5.4/cmake/install_layout.cmake	2020-06-23 15:10:16.000000000 +0000
-+++ ./cmake/install_layout.cmake	2018-07-22 23:28:13.863668234 +0200
++++ ./cmake/install_layout.cmake	2020-08-08 22:17:34.254546116 +0000
-@@ -172,7 +172,6 @@
+@@ -175,7 +175,6 @@
  SET(INSTALL_SBINDIR_DEB                 "sbin")
  SET(INSTALL_SCRIPTDIR_DEB               "bin")
  SET(INSTALL_SYSCONFDIR_DEB              "/etc")
--SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/conf.d")
+-SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/mariadb.conf.d")
  #
- SET(INSTALL_LIBDIR_DEB                  "lib")
+ SET(INSTALL_LIBDIR_DEB                  "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}")
  SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")

packages/mariadb/cmake-pcre.cmake.patch

@@ -1,14 +0,0 @@
-diff -u -r ../mariadb-10.2.10/cmake/pcre.cmake ./cmake/pcre.cmake
---- ../mariadb-10.2.10/cmake/pcre.cmake	2017-10-30 09:10:43.000000000 +0100
-+++ ./cmake/pcre.cmake	2017-11-07 04:56:54.904935897 +0100
-@@ -6,7 +6,9 @@
- MACRO (CHECK_PCRE)
-   IF(WITH_PCRE STREQUAL "system" OR WITH_PCRE STREQUAL "auto")
-     CHECK_LIBRARY_EXISTS(pcre pcre_stack_guard "" HAVE_PCRE_STACK_GUARD)
--    IF(NOT CMAKE_CROSSCOMPILING)
-+    IF(CMAKE_CROSSCOMPILING)
-+      SET(PCRE_STACK_SIZE_OK TRUE)
-+    ELSE()
-       SET(CMAKE_REQUIRED_LIBRARIES "pcre")
-       CHECK_C_SOURCE_RUNS("
-         #include <pcre.h>