From f0bbd467bf46f73cf71df8b105b170c08a2e032a Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Thu, 8 Sep 2022 17:00:56 +0000 Subject: [PATCH] upgpkg(main/mariadb): update to 10.9.2 --- packages/mariadb/build.sh | 4 ++-- .../mariadb/support-files-mysql.server.sh.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 packages/mariadb/support-files-mysql.server.sh.patch diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 16e61fd0fe..adf76958fa 100644 --- a/packages/mariadb/build.sh +++ b/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.8.4 +TERMUX_PKG_VERSION=2:10.9.2 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=65ec60ca36588ecd11cd8c3fc0ce35e1d603029e12378cf88baa865fd0891166 +TERMUX_PKG_SHA256=5f45ff75e043966555a95fbdb8f092e60ce2a6c47ba59d144db46e138e922f48 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" diff --git a/packages/mariadb/support-files-mysql.server.sh.patch b/packages/mariadb/support-files-mysql.server.sh.patch new file mode 100644 index 0000000000..0212d8cccb --- /dev/null +++ b/packages/mariadb/support-files-mysql.server.sh.patch @@ -0,0 +1,15 @@ +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 + } + + #