Termux/termux-packages
1
0
Fork 0
mirror of https://github.com/termux/termux-packages synced 2024-06-30 09:47:08 +00:00
Code Issues Releases Wiki Activity

bump(main/mariadb): 11.2.3 (#19191)

Browse Source
This commit is contained in:
Jia Yuan Lo 2024-02-10 23:05:09 +08:00 committed by GitHub
parent 7c9cc4cecf
commit 894f99f5b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 121 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mariadb/CMakeLists.txt.patch
View File

@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,7 +446,6 @@ IF(NOT WITHOUT_SERVER)
@@ -465,7 +465,6 @@
OPTION (WITH_EMBEDDED_SERVER "Compile MariaDB with embedded server" OFF)
IF(WITH_EMBEDDED_SERVER)
ADD_SUBDIRECTORY(libmysqld)
@ -8,7 +8,7 @@
ADD_SUBDIRECTORY(unittest/embedded)
ENDIF(WITH_EMBEDDED_SERVER)
IF(NOT WIN32)
@@ -575,7 +574,6 @@ IF(NOT WITHOUT_SERVER)
@@ -597,7 +596,6 @@
mariadb-plugin
mariadb-show
mariadb-slap

14
packages/mariadb/build.sh
View File

@ -2,15 +2,17 @@ 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:11.1.2"
TERMUX_PKG_VERSION="2:11.2.3"
TERMUX_PKG_SRCURL=https://mirror.netcologne.de/mariadb/mariadb-${TERMUX_PKG_VERSION#*:}/source/mariadb-${TERMUX_PKG_VERSION#*:}.tar.gz
TERMUX_PKG_SHA256=19a9e980e57fa332931f643b48ad7390528c889ff6ea8b0e16fd306aa3088238
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_SHA256=14a0bba0c2847eb3f69a4637f55798f8abe10904cd1dd22899c9b0a39c43e35f
TERMUX_PKG_DEPENDS="libandroid-support, libc++, libcrypt, libedit, liblz4, liblzma, ncurses, openssl, pcre2, zlib"
TERMUX_PKG_BREAKS="mariadb-dev"
TERMUX_PKG_CONFLICTS="mysql"
TERMUX_PKG_REPLACES="mariadb-dev"
TERMUX_PKG_SERVICE_SCRIPT=("mysqld" "exec mysqld --basedir=$TERMUX_PREFIX --datadir=$TERMUX_PREFIX/var/lib/mysql 2>&1")
TERMUX_PKG_HOSTBUILD=true
TERMUX_CMAKE_BUILD="Unix Makefiles"
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DBISON_EXECUTABLE=$(command -v bison)
-DGETCONF=$(command -v getconf)
@ -58,10 +60,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DMASK_LONGDOUBLE_EXITCODE=1
-DINSTALL_SYSCONFDIR=$TERMUX_PREFIX/etc
"
TERMUX_PKG_HOSTBUILD=true
TERMUX_CMAKE_BUILD="Unix Makefiles"
TERMUX_PKG_CONFLICTS="mysql"
TERMUX_PKG_RM_AFTER_INSTALL="
bin/mysqltest*
share/man/man1/mysql-test-run.pl.1

7
packages/mariadb/client-CMakeLists.txt.patch
View File

@ -1,6 +1,5 @@
diff -u -r ../mariadb-10.5.4/client/CMakeLists.txt ./client/CMakeLists.txt
--- ../mariadb-10.5.4/client/CMakeLists.txt 2020-06-23 15:10:16.000000000 +0000
+++ ./client/CMakeLists.txt 2020-08-08 22:15:12.186057790 +0000
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -44,12 +44,6 @@
SET_TARGET_PROPERTIES(mariadb PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
@ -14,7 +13,7 @@ diff -u -r ../mariadb-10.5.4/client/CMakeLists.txt ./client/CMakeLists.txt
MYSQL_ADD_EXECUTABLE(mariadb-check mysqlcheck.c)
TARGET_LINK_LIBRARIES(mariadb-check ${CLIENT_LIB})
@@ -96,7 +90,7 @@
@@ -95,7 +89,7 @@
SET_TARGET_PROPERTIES (mariadb-check mariadb-dump mariadb-import mariadb-upgrade mariadb-show mariadb-slap mariadb-plugin async_example
PROPERTIES HAS_CXX TRUE)

7
packages/mariadb/cmake-install_layout.cmake.patch
View File

@ -1,7 +1,6 @@
diff -u -r ../mariadb-10.5.4/cmake/install_layout.cmake ./cmake/install_layout.cmake
--- ../mariadb-10.5.4/cmake/install_layout.cmake 2020-06-23 15:10:16.000000000 +0000
+++ ./cmake/install_layout.cmake 2020-08-08 22:17:34.254546116 +0000
@@ -175,7 +175,6 @@
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -173,7 +173,6 @@
SET(INSTALL_SBINDIR_DEB "sbin")
SET(INSTALL_SCRIPTDIR_DEB "bin")
SET(INSTALL_SYSCONFDIR_DEB "/etc")

2
packages/mariadb/configure.cmake.patch
View File

@ -2,7 +2,7 @@ https://github.com/termux/termux-packages/issues/15852
--- a/configure.cmake
+++ b/configure.cmake
@@ -578,6 +578,7 @@
@@ -577,6 +577,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>

59
packages/mariadb/etc-my.cnf.patch
View File

@ -1,59 +0,0 @@
diff -u -r ./support-files/mysql-multi.server.sh ../src.orig/support-files/mysql-multi.server.sh
--- ./support-files/mysql-multi.server.sh 2017-10-30 08:10:49.000000000 +0000
+++ ../src.orig/support-files/mysql-multi.server.sh 2017-12-09 20:12:10.456623540 +0000
@@ -77,8 +77,8 @@
then
print_defaults="@bindir@/mysql_print_defaults"
else
- # Try to find basedir in /etc/my.cnf
- conf=/etc/my.cnf
+ # Try to find basedir in @TERMUX_PREFIX@/etc/my.cnf
+ conf=@TERMUX_PREFIX@/etc/my.cnf
print_defaults=
if test -r $conf
then
diff -u -r ./support-files/mysql.server.sh ../src.orig/support-files/mysql.server.sh
--- ./support-files/mysql.server.sh 2017-10-30 08:10:49.000000000 +0000
+++ ../src.orig/support-files/mysql.server.sh 2017-12-09 20:12:10.460623538 +0000
@@ -159,8 +159,8 @@
if test -x "$bindir/my_print_defaults"; then
print_defaults="$bindir/my_print_defaults"
else
- # Try to find basedir in /etc/my.cnf
- conf=/etc/my.cnf
+ # Try to find basedir in @TERMUX_PREFIX@/etc/my.cnf
+ conf=@TERMUX_PREFIX@/etc/my.cnf
print_defaults=
if test -r $conf
then
diff -u -r ./support-files/policy/apparmor/usr.sbin.mysqld ../src.orig/support-files/policy/apparmor/usr.sbin.mysqld
--- ./support-files/policy/apparmor/usr.sbin.mysqld 2017-10-30 08:10:49.000000000 +0000
+++ ../src.orig/support-files/policy/apparmor/usr.sbin.mysqld 2017-12-09 20:12:10.432623549 +0000
@@ -29,7 +29,7 @@
/etc/hosts.deny r,
/etc/ld.so.cache r,
/etc/mtab r,
- /etc/my.cnf r,
+ @TERMUX_PREFIX@/etc/my.cnf r,
/etc/mysql/*.cnf r,
/etc/mysql/*.pem r,
/etc/mysql/conf.d/ r,
@@ -81,7 +81,7 @@
/bin/which rix,
/dev/tty rw,
/etc/ld.so.cache r,
- /etc/my.cnf r,
+ @TERMUX_PREFIX@/etc/my.cnf r,
/proc/ r,
/proc/*/cmdline r,
/proc/*/fd/ r,
diff -u -r ./support-files/rpm/my.cnf ../src.orig/support-files/rpm/my.cnf
--- ./support-files/rpm/my.cnf 2017-10-30 08:10:49.000000000 +0000
+++ ../src.orig/support-files/rpm/my.cnf 2017-12-09 20:12:10.440623546 +0000
@@ -7,5 +7,5 @@
#
# include all files from the config directory
#
-!includedir /etc/my.cnf.d
+!includedir @TERMUX_PREFIX@/etc/my.cnf.d

14
packages/mariadb/i686-no-asm-goto.patch
View File

@ -3,21 +3,9 @@
__asm__ goto("lock btsl $31, %0\t\njnc %l1" : : "m" (n_pending)
^
```
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -1490,7 +1490,7 @@
#if (defined __clang_major__ && __clang_major__ < 10) || defined __APPLE_CC__
/* Only clang-10 introduced support for asm goto */
return n_pending.fetch_or(STOPPING, std::memory_order_relaxed) & STOPPING;
-#elif defined __GNUC__ && (defined __i386__ || defined __x86_64__)
+#elif defined __GNUC__ && ((defined __i386__ && !defined __ANDROID__) || defined __x86_64__)
static_assert(STOPPING == 1U << 31, "compatibility");
__asm__ goto("lock btsl $31, %0\t\njnc %l1" : : "m" (n_pending)
: "cc", "memory" : not_stopped);
--- a/storage/innobase/sync/srw_lock.cc
+++ b/storage/innobase/sync/srw_lock.cc
@@ -271,7 +271,7 @@
@@ -276,7 +276,7 @@
/* Only clang-10 introduced support for asm goto */
#elif defined __APPLE__
/* At least some versions of Apple Xcode do not support asm goto */

7
packages/mariadb/libmariadb-mariadb_config-mariadb_config.c.patch
View File

@ -1,7 +1,6 @@
diff -uNr mariadb-10.6.5.orig/libmariadb/mariadb_config/mariadb_config.c.in mariadb-10.6.5/libmariadb/mariadb_config/mariadb_config.c.in
--- mariadb-10.6.5.orig/libmariadb/mariadb_config/mariadb_config.c.in 2021-11-05 21:03:32.000000000 +0100
+++ mariadb-10.6.5/libmariadb/mariadb_config/mariadb_config.c.in 2021-11-17 13:46:21.744760378 +0100
@@ -210,7 +210,7 @@
--- a/libmariadb/mariadb_config/mariadb_config.c.in
+++ b/libmariadb/mariadb_config/mariadb_config.c.in
@@ -225,7 +225,7 @@
}
if (!p || !p[0])
{

11
packages/mariadb/my_rdtsc.h.patch
View File

@ -1,8 +1,7 @@
!!! FIX FOR https://github.com/termux/termux-packages/issues/4319 !!!
---------------------------------------------------------------------------------
diff -uNr mariadb-10.5.5/include/my_rdtsc.h mariadb-10.5.5.mod/include/my_rdtsc.h
--- mariadb-10.5.5/include/my_rdtsc.h 2020-08-07 15:57:35.000000000 +0300
+++ mariadb-10.5.5.mod/include/my_rdtsc.h 2020-08-29 23:55:38.206355189 +0300
https://github.com/termux/termux-packages/issues/4319
--- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h
@@ -26,7 +26,7 @@
# ifndef __has_builtin
# define __has_builtin(x) 0 /* Compatibility with non-clang compilers */
@ -12,7 +11,7 @@ diff -uNr mariadb-10.5.5/include/my_rdtsc.h mariadb-10.5.5.mod/include/my_rdtsc.
# elif defined _WIN32
# include <intrin.h>
# elif defined __i386__ || defined __x86_64__
@@ -128,7 +128,7 @@
@@ -152,7 +152,7 @@
*/
static inline ulonglong my_timer_cycles(void)
{

2
packages/mariadb/plugin-disks-information_schema_disks.cc.patch
View File

@ -1,6 +1,6 @@
--- a/plugin/disks/information_schema_disks.cc
+++ b/plugin/disks/information_schema_disks.cc
@@ -224,8 +224,10 @@ static int disks_fill_table(THD* pThd, T
@@ -222,8 +222,10 @@
#endif
// Try to keep to real storage by excluding
// read only mounts, and mount points that aren't directories

9
packages/mariadb/scripts-mysql_install_db.sh.patch
View File

@ -1,7 +1,6 @@
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 @@
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -492,47 +492,8 @@
fi
chmod 700 "$dir"
fi
@ -24,7 +23,7 @@ diff -uNr mariadb-10.8.4/scripts/mysql_install_db.sh mariadb-10.8.4.mod/scripts/
-if test -n "$user"
-then
- if test -z "$srcdir" -a "$in_rpm" -eq 0
- if test -z "$srcdir" -a "$in_rpm" -eq 0 -a -d "$pamtooldir/auth_pam_tool_dir"
- then
- chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
- chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"

15
packages/mariadb/support-files-mysql.server.sh.patch
View File

@ -1,15 +0,0 @@
diff -uNr mariadb-10.9.2/support-files/mysql.server.sh mariadb-10.9.2.mod/support-files/mysql.server.sh
--- mariadb-10.9.2/support-files/mysql.server.sh 2022-08-10 14:23:48.000000000 +0200
+++ mariadb-10.9.2.mod/support-files/mysql.server.sh 2022-09-07 17:44:33.263691615 +0200
@@ -185,11 +185,7 @@
user='@MYSQLD_USER@'
su_kill() {
- if test "$USER" = "$user"; then
kill $* >/dev/null 2>&1
- else
- su - $user -s /bin/sh -c "kill $*" >/dev/null 2>&1
- fi
}
#

67
packages/mariadb/support-files.patch Normal file
View File

@ -0,0 +1,67 @@
--- a/support-files/mysql-multi.server.sh
+++ b/support-files/mysql-multi.server.sh
@@ -77,8 +77,8 @@
then
print_defaults="@bindir@/mysql_print_defaults"
else
- # Try to find basedir in /etc/my.cnf
- conf=/etc/my.cnf
+ # Try to find basedir in @TERMUX_PREFIX@/etc/my.cnf
+ conf=@TERMUX_PREFIX@/etc/my.cnf
print_defaults=
if test -r $conf
then
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -160,8 +160,8 @@
if test -x "$bindir/my_print_defaults"; then
print_defaults="$bindir/my_print_defaults"
else
- # Try to find basedir in /etc/my.cnf
- conf=/etc/my.cnf
+ # Try to find basedir in @TERMUX_PREFIX@/etc/my.cnf
+ conf=@TERMUX_PREFIX@/etc/my.cnf
print_defaults=
if test -r $conf
then
@@ -185,11 +185,7 @@
user='@MYSQLD_USER@'
su_kill() {
- if test "$USER" = "$user"; then
kill $* >/dev/null 2>&1
- else
- su - $user -s /bin/sh -c "kill $*" >/dev/null 2>&1
- fi
}
#
--- a/support-files/policy/apparmor/usr.sbin.mysqld
+++ b/support-files/policy/apparmor/usr.sbin.mysqld
@@ -29,7 +29,7 @@
/etc/hosts.deny r,
/etc/ld.so.cache r,
/etc/mtab r,
- /etc/my.cnf r,
+ @TERMUX_PREFIX@/etc/my.cnf r,
/etc/mysql/*.cnf r,
/etc/mysql/*.pem r,
/etc/mysql/conf.d/ r,
@@ -81,7 +81,7 @@
/bin/which rix,
/dev/tty rw,
/etc/ld.so.cache r,
- /etc/my.cnf r,
+ @TERMUX_PREFIX@/etc/my.cnf r,
/proc/ r,
/proc/*/cmdline r,
/proc/*/fd/ r,
--- a/support-files/rpm/my.cnf
+++ b/support-files/rpm/my.cnf
@@ -7,5 +7,5 @@
#
# include *.cnf from the config directory
#
-!includedir /etc/my.cnf.d
+!includedir @TERMUX_PREFIX@/etc/my.cnf.d

25
packages/mariadb/tests-mysql_client_fw.c.patch Normal file
View File

@ -0,0 +1,25 @@
```
[ 61%] Building C object tests/CMakeFiles/mariadb-client-test.dir/mysql_client_test.c.o
In file included from /home/builder/.termux-build/mariadb/src/tests/mysql_client_test.c:38:
/home/builder/.termux-build/mariadb/src/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size
compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/builder/.termux-build/mariadb/src/include/my_global.h:384:38: note: expanded from macro 'compile_time_assert'
typedef char compile_time_assert[(X) ? 1 : -1] __attribute__((unused)); \
^~~~~~~~~~~~
1 error generated.
```
No idea why only 32bit Arm need this for compile to be successful
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -1430,7 +1430,7 @@
tests_to_run[i]= NULL;
}
-#ifdef _WIN32
+#if defined(_WIN32) || (defined(__ANDROID__) && defined(__arm__))
/* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
#else