diff --git a/packages/libpsl/build-fix.patch b/packages/libpsl/build-fix.patch deleted file mode 100644 index 92bc6cfcc..000000000 --- a/packages/libpsl/build-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9347024221f4a9d63f9dcafcda13362a7c8d92fe Mon Sep 17 00:00:00 2001 -From: Po-Chuan Hsieh -Date: Wed, 17 Apr 2019 13:25:48 +0000 -Subject: [PATCH] Fix build when configured with --with-psl-file - -The error message is as follows: -Making all in tests -make: don't know how to make ../list/public_suffix_list.dat. Stop - -make: stopped in /usr/ports/works/usr/ports/dns/libpsl/work/libpsl-libpsl-0.21.0/tests -*** Error code 1 - -Stop. ---- - tests/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 480b236..9c37ce3 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -33,9 +33,9 @@ TESTS = $(PSL_TESTS) - # dafsa.psl and dafsa_ascii.psl must be created before any test is executed - # check-local target works in parallel to the tests, so the test suite will likely fail - BUILT_SOURCES = psl.dafsa psl_ascii.dafsa --psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat -+psl.dafsa: $(PSL_FILE) - $(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa --psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat -+psl_ascii.dafsa: $(PSL_FILE) - $(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa - - clean-local: diff --git a/packages/libpsl/build.sh b/packages/libpsl/build.sh index 69539696d..a869a1a69 100644 --- a/packages/libpsl/build.sh +++ b/packages/libpsl/build.sh @@ -1,10 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/rockdaboot/libpsl TERMUX_PKG_DESCRIPTION="Public Suffix List library" TERMUX_PKG_LICENSE="MIT" -TERMUX_PKG_VERSION=0.21.0 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SRCURL=https://github.com/rockdaboot/libpsl/releases/download/libpsl-${TERMUX_PKG_VERSION}/libpsl-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12 +TERMUX_PKG_VERSION=0.21.1 +TERMUX_PKG_SRCURL=https://github.com/rockdaboot/libpsl/releases/download/${TERMUX_PKG_VERSION}/libpsl-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c TERMUX_PKG_DEPENDS="libidn2, libunistring" TERMUX_PKG_BREAKS="libpsl-dev" TERMUX_PKG_REPLACES="libpsl-dev" diff --git a/packages/mariadb/build.sh b/packages/mariadb/build.sh index 0c471964d..a68742df0 100644 --- a/packages/mariadb/build.sh +++ b/packages/mariadb/build.sh @@ -1,10 +1,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_VERSION=2:10.5.4 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=2:10.5.5 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=26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72 +TERMUX_PKG_SHA256=cf6b2c061754c07bbb1d20b29ae111bf2d098297c9b8c321b810638a179088a4 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"