From 2d85fae4e55339e332256f17ff45c22f6970cebe Mon Sep 17 00:00:00 2001 From: Aditya Alok Date: Fri, 24 Jan 2025 02:10:15 +0530 Subject: [PATCH] bump(main/dnsutils): 9.20.4 Signed-off-by: Aditya Alok --- packages/dnsutils/build.sh | 56 ++++--------------- packages/dnsutils/fix-underlinking.patch | 66 ----------------------- packages/dnsutils/lib-irs-context.c.patch | 18 ------- 3 files changed, 10 insertions(+), 130 deletions(-) delete mode 100644 packages/dnsutils/fix-underlinking.patch delete mode 100644 packages/dnsutils/lib-irs-context.c.patch diff --git a/packages/dnsutils/build.sh b/packages/dnsutils/build.sh index 76e8f81fdf022c1..af6488cf13ed76f 100644 --- a/packages/dnsutils/build.sh +++ b/packages/dnsutils/build.sh @@ -2,65 +2,29 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/ TERMUX_PKG_DESCRIPTION="Clients provided with BIND" TERMUX_PKG_LICENSE="MPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=9.16.41 +TERMUX_PKG_VERSION=9.20.4 TERMUX_PKG_SRCURL="https://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.xz" -TERMUX_PKG_SHA256=71904366aa1e04e2075c79a8906b92af936e3bfa4d7e8df5fd964fcf9e94f45c -TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib, libuv" +TERMUX_PKG_SHA256=3a8e1a05e00e3e9bc02bdffded7862faf7726ba76ba997f42ab487777bd8210b +TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf, zlib, libuv, liburcu, libcap, libandroid-glob" TERMUX_PKG_BREAKS="dnsutils-dev" TERMUX_PKG_REPLACES="dnsutils-dev" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ---disable-linux-caps ---without-python ---with-ecdsa=no ---with-gost=no ---with-gssapi=no ---with-libjson=no ---with-libtool ---with-libxml2=no ---with-openssl=$TERMUX_PREFIX ---with-randomdev=/dev/random ---with-readline=-lreadline ---with-eddsa=no ax_cv_have_func_attribute_constructor=yes ax_cv_have_func_attribute_destructor=yes +lt_cv_prog_compiler_pic_works=yes +--disable-static " termux_step_pre_configure() { - export BUILD_AR=ar - export BUILD_CC=gcc - export BUILD_CFLAGS= - export BUILD_CPPFLAGS= - export BUILD_LDFLAGS= - export BUILD_RANLIB= - _RESOLV_CONF=$TERMUX_PREFIX/etc/resolv.conf CFLAGS+=" $CPPFLAGS -DRESOLV_CONF=\\\"$_RESOLV_CONF\\\"" + LDFLAGS+=" -landroid-glob" } -termux_step_make() { - make -C lib/isc - make -C lib/dns - make -C lib/ns - make -C lib/isccc - make -C lib/isccfg - make -C lib/bind9 - make -C lib/irs - make -C bin/dig - make -C bin/delv - make -C bin/nsupdate -} - -termux_step_make_install() { - make -C lib/isc install - make -C lib/dns install - make -C lib/ns install - make -C lib/isccc install - make -C lib/isccfg install - make -C lib/bind9 install - make -C lib/irs install - make -C bin/dig install - make -C bin/delv install - make -C bin/nsupdate install +termux_step_post_configure() { + # Android linker is unable to driectly reslove versoined libraries. + # This will create a symlink to versoined library via `libname.so`. + sed -i 's|library_names_spec=.*|library_names_spec="\\\$libname\\\$release\\\$shared_ext \\\$libname\\\$shared_ext"|g' ./libtool } diff --git a/packages/dnsutils/fix-underlinking.patch b/packages/dnsutils/fix-underlinking.patch deleted file mode 100644 index 5b01e32724473a8..000000000000000 --- a/packages/dnsutils/fix-underlinking.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/lib/bind9/Makefile.in -+++ b/lib/bind9/Makefile.in -@@ -33,7 +33,7 @@ - ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ - DNSDEPLIBS = ../../lib/dns/libdns.@A@ - --LIBS = @LIBS@ -+LIBS = ${OPENSSL_LIBS} ${LIBUV_LIBS} @LIBS@ - - SUBDIRS = include - ---- a/lib/dns/Makefile.in -+++ b/lib/dns/Makefile.in -@@ -42,7 +42,7 @@ - - ISCDEPLIBS = ../../lib/isc/libisc.@A@ - --LIBS = ${FSTRM_LIBS} ${MAXMINDDB_LIBS} ${LMDB_LIBS} ${PROTOBUF_C_LIBS} @LIBS@ -+LIBS = ${FSTRM_LIBS} ${MAXMINDDB_LIBS} ${LMDB_LIBS} ${PROTOBUF_C_LIBS} ${OPENSSL_LIBS} ${LIBUV_LIBS} @LIBS@ - - # Alphabetically - ---- a/lib/irs/Makefile.in -+++ b/lib/irs/Makefile.in -@@ -37,7 +37,7 @@ - - ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ - --LIBS = @LIBS@ -+LIBS = ${OPENSSL_LIBS} ${LIBUV_LIBS} @LIBS@ - - # Alphabetically - OBJS = context.@O@ \ ---- a/lib/isccc/Makefile.in -+++ b/lib/isccc/Makefile.in -@@ -30,7 +30,7 @@ - ISCDEPLIBS = ../../lib/isc/libisc.@A@ - ISCCCDEPLIBS = libisccc.@A@ - --LIBS = @LIBS@ -+LIBS = ${OPENSSL_LIBS} ${LIBUV_LIBS} @LIBS@ - - SUBDIRS = include - ---- a/lib/isccfg/Makefile.in -+++ b/lib/isccfg/Makefile.in -@@ -29,7 +29,7 @@ - ISCDEPLIBS = ../../lib/isc/libisc.@A@ - ISCCFGDEPLIBS = libisccfg.@A@ - --LIBS = @LIBS@ -+LIBS = ${OPENSSL_LIBS} ${LIBUV_LIBS} @LIBS@ - - SUBDIRS = include - TESTDIRS = @UNITTESTS@ ---- a/lib/ns/Makefile.in -+++ b/lib/ns/Makefile.in -@@ -35,7 +35,7 @@ - - DNSDEPLIBS = ../../lib/dns/libdns.@A@ - --LIBS = @LIBS@ -+LIBS = ${OPENSSL_LIBS} ${LIBUV_LIBS} @LIBS@ - - # Alphabetically - OBJS = client.@O@ hooks.@O@ interfacemgr.@O@ lib.@O@ \ diff --git a/packages/dnsutils/lib-irs-context.c.patch b/packages/dnsutils/lib-irs-context.c.patch deleted file mode 100644 index 33d80b0e099180d..000000000000000 --- a/packages/dnsutils/lib-irs-context.c.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uNr bind-9.16.1/lib/irs/context.c bind-9.16.1.mod/lib/irs/context.c ---- bind-9.16.1/lib/irs/context.c 2020-03-11 18:46:53.000000000 +0200 -+++ bind-9.16.1.mod/lib/irs/context.c 2020-03-19 22:01:16.984465631 +0200 -@@ -34,12 +34,12 @@ - - #ifndef RESOLV_CONF - /*% location of resolve.conf */ --#define RESOLV_CONF "/etc/resolv.conf" -+#define RESOLV_CONF "@TERMUX_PREFIX@/etc/resolv.conf" - #endif /* ifndef RESOLV_CONF */ - - #ifndef DNS_CONF - /*% location of dns.conf */ --#define DNS_CONF "/etc/dns.conf" -+#define DNS_CONF "@TERMUX_PREFIX@/etc/dns.conf" - #endif /* ifndef DNS_CONF */ - - ISC_THREAD_LOCAL irs_context_t *irs_context = NULL;