From 166a72459bb4d5e7ac9af88144121e81f6d8398f Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sun, 13 Nov 2022 20:48:40 +0900 Subject: [PATCH] inetutils: Bump to 2.4 --- packages/inetutils/build.sh | 9 +++++---- packages/inetutils/configure-pthreads-no-weak.patch | 12 ------------ 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 packages/inetutils/configure-pthreads-no-weak.patch diff --git a/packages/inetutils/build.sh b/packages/inetutils/build.sh index acef4c1989..751c8f0910 100644 --- a/packages/inetutils/build.sh +++ b/packages/inetutils/build.sh @@ -2,11 +2,11 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/inetutils/ TERMUX_PKG_DESCRIPTION="Collection of common network programs" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.3 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=2.4 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/inetutils/inetutils-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=0b01bb08e29623c4e3b940f233c961451d9af8c5066301add76a52a95d51772c -TERMUX_PKG_DEPENDS="libandroid-glob, readline" +TERMUX_PKG_SHA256=1789d6b1b1a57dfe2a7ab7b533ee9f5dfd9cbf5b59bb1bb3c2612ed08d0f68b2 +TERMUX_PKG_DEPENDS="readline" +TERMUX_PKG_BUILD_DEPENDS="libandroid-glob" TERMUX_PKG_SUGGESTS="whois" TERMUX_PKG_RM_AFTER_INSTALL="bin/whois share/man/man1/whois.1" # These are old cruft / not suited for android @@ -25,6 +25,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-traceroute --disable-uucpd ac_cv_lib_crypt_crypt=no +gl_cv_have_weak=no " termux_step_pre_configure() { diff --git a/packages/inetutils/configure-pthreads-no-weak.patch b/packages/inetutils/configure-pthreads-no-weak.patch deleted file mode 100644 index e1c6533273..0000000000 --- a/packages/inetutils/configure-pthreads-no-weak.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr inetutils-2.3/configure inetutils-2.3.mod/configure ---- inetutils-2.3/configure 2022-07-08 09:14:46.000000000 +0100 -+++ inetutils-2.3.mod/configure 2022-07-22 22:00:47.478678000 +0100 -@@ -20452,7 +20452,7 @@ - else - if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then - --printf "%s\n" "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h -+#printf "%s\n" "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h - - LIBTHREAD= LTLIBTHREAD= - else