diff --git a/packages/dnsutils/build.sh b/packages/dnsutils/build.sh index 30ace3518..c34d0f23a 100644 --- a/packages/dnsutils/build.sh +++ b/packages/dnsutils/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.isc.org/downloads/bind/ TERMUX_PKG_DESCRIPTION="Clients provided with BIND" -TERMUX_PKG_VERSION=9.11.1-P3 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SHA256=52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4 +TERMUX_PKG_VERSION=9.12.2-P1 +TERMUX_PKG_SHA256=9c4b55c2b8a2052ce488ebaeca1b715721d1a6cbffd7da3634c41287b86954a4 TERMUX_PKG_SRCURL="ftp://ftp.isc.org/isc/bind9/${TERMUX_PKG_VERSION}/bind-${TERMUX_PKG_VERSION}.tar.gz" TERMUX_PKG_DEPENDS="openssl, readline, resolv-conf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -15,6 +14,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-openssl=$TERMUX_PREFIX --with-randomdev=/dev/random --with-readline=-lreadline +--with-eddsa=no " termux_step_pre_configure () { @@ -36,7 +36,7 @@ termux_step_make () { make -C lib/isccc make -C lib/isccfg make -C lib/bind9 - make -C lib/lwres + make -C lib/irs make -C bin/dig make -C bin/nsupdate } @@ -47,7 +47,7 @@ termux_step_make_install () { make -C lib/isccc install make -C lib/isccfg install make -C lib/bind9 install - make -C lib/lwres install + make -C lib/irs install make -C bin/dig install make -C bin/nsupdate install } diff --git a/packages/dnsutils/lib-lwres-man-Makefile.in.patch b/packages/dnsutils/lib-lwres-man-Makefile.in.patch deleted file mode 100644 index 66fefd96a..000000000 --- a/packages/dnsutils/lib-lwres-man-Makefile.in.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff -u -r ../bind-9.11.1-P3/lib/lwres/man/Makefile.in ./lib/lwres/man/Makefile.in ---- ../bind-9.11.1-P3/lib/lwres/man/Makefile.in 2017-07-07 17:01:52.000000000 +0200 -+++ ./lib/lwres/man/Makefile.in 2017-07-26 13:13:17.575587105 +0200 -@@ -92,141 +92,141 @@ - install:: installdirs - for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man3; done - rm -f ${man3}/lwres_addr_parse.3 -- @LN@ ${man3}/lwres_resutil.3 ${man3}/lwres_addr_parse.3 -+ @LN@ -s ${man3}/lwres_resutil.3 ${man3}/lwres_addr_parse.3 - rm -f ${man3}/lwres_buffer_add.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_add.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_add.3 - rm -f ${man3}/lwres_buffer_back.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_back.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_back.3 - rm -f ${man3}/lwres_buffer_clear.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_clear.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_clear.3 - rm -f ${man3}/lwres_buffer_first.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_first.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_first.3 - rm -f ${man3}/lwres_buffer_forward.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_forward.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_forward.3 - rm -f ${man3}/lwres_buffer_getmem.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getmem.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getmem.3 - rm -f ${man3}/lwres_buffer_getuint16.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getuint16.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getuint16.3 - rm -f ${man3}/lwres_buffer_getuint32.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getuint32.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getuint32.3 - rm -f ${man3}/lwres_buffer_getuint8.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getuint8.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_getuint8.3 - rm -f ${man3}/lwres_buffer_init.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_init.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_init.3 - rm -f ${man3}/lwres_buffer_invalidate.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_invalidate.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_invalidate.3 - rm -f ${man3}/lwres_buffer_putmem.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putmem.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putmem.3 - rm -f ${man3}/lwres_buffer_putuint16.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putuint16.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putuint16.3 - rm -f ${man3}/lwres_buffer_putuint32.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putuint32.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putuint32.3 - rm -f ${man3}/lwres_buffer_putuint8.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putuint8.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_putuint8.3 - rm -f ${man3}/lwres_buffer_subtract.3 -- @LN@ ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_subtract.3 -+ @LN@ -s ${man3}/lwres_buffer.3 ${man3}/lwres_buffer_subtract.3 - rm -f ${man3}/lwres_conf_clear.3 -- @LN@ ${man3}/lwres_config.3 ${man3}/lwres_conf_clear.3 -+ @LN@ -s ${man3}/lwres_config.3 ${man3}/lwres_conf_clear.3 - rm -f ${man3}/lwres_conf_get.3 -- @LN@ ${man3}/lwres_config.3 ${man3}/lwres_conf_get.3 -+ @LN@ -s ${man3}/lwres_config.3 ${man3}/lwres_conf_get.3 - rm -f ${man3}/lwres_conf_init.3 -- @LN@ ${man3}/lwres_config.3 ${man3}/lwres_conf_init.3 -+ @LN@ -s ${man3}/lwres_config.3 ${man3}/lwres_conf_init.3 - rm -f ${man3}/lwres_conf_parse.3 -- @LN@ ${man3}/lwres_config.3 ${man3}/lwres_conf_parse.3 -+ @LN@ -s ${man3}/lwres_config.3 ${man3}/lwres_conf_parse.3 - rm -f ${man3}/lwres_conf_print.3 -- @LN@ ${man3}/lwres_config.3 ${man3}/lwres_conf_print.3 -+ @LN@ -s ${man3}/lwres_config.3 ${man3}/lwres_conf_print.3 - rm -f ${man3}/lwres_context_allocmem.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_allocmem.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_allocmem.3 - rm -f ${man3}/lwres_context_create.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_create.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_create.3 - rm -f ${man3}/lwres_context_destroy.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_destroy.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_destroy.3 - rm -f ${man3}/lwres_context_freemem.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_freemem.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_freemem.3 - rm -f ${man3}/lwres_context_initserial.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_initserial.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_initserial.3 - rm -f ${man3}/lwres_context_nextserial.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_nextserial.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_nextserial.3 - rm -f ${man3}/lwres_context_sendrecv.3 -- @LN@ ${man3}/lwres_context.3 ${man3}/lwres_context_sendrecv.3 -+ @LN@ -s ${man3}/lwres_context.3 ${man3}/lwres_context_sendrecv.3 - rm -f ${man3}/lwres_endhostent.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_endhostent.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_endhostent.3 - rm -f ${man3}/lwres_endhostent_r.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_endhostent_r.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_endhostent_r.3 - rm -f ${man3}/lwres_freeaddrinfo.3 -- @LN@ ${man3}/lwres_getaddrinfo.3 ${man3}/lwres_freeaddrinfo.3 -+ @LN@ -s ${man3}/lwres_getaddrinfo.3 ${man3}/lwres_freeaddrinfo.3 - rm -f ${man3}/lwres_freehostent.3 -- @LN@ ${man3}/lwres_getipnode.3 ${man3}/lwres_freehostent.3 -+ @LN@ -s ${man3}/lwres_getipnode.3 ${man3}/lwres_freehostent.3 - rm -f ${man3}/lwres_gabnrequest_free.3 -- @LN@ ${man3}/lwres_gabn.3 ${man3}/lwres_gabnrequest_free.3 -+ @LN@ -s ${man3}/lwres_gabn.3 ${man3}/lwres_gabnrequest_free.3 - rm -f ${man3}/lwres_gabnrequest_parse.3 -- @LN@ ${man3}/lwres_gabn.3 ${man3}/lwres_gabnrequest_parse.3 -+ @LN@ -s ${man3}/lwres_gabn.3 ${man3}/lwres_gabnrequest_parse.3 - rm -f ${man3}/lwres_gabnrequest_render.3 -- @LN@ ${man3}/lwres_gabn.3 ${man3}/lwres_gabnrequest_render.3 -+ @LN@ -s ${man3}/lwres_gabn.3 ${man3}/lwres_gabnrequest_render.3 - rm -f ${man3}/lwres_gabnresponse_free.3 -- @LN@ ${man3}/lwres_gabn.3 ${man3}/lwres_gabnresponse_free.3 -+ @LN@ -s ${man3}/lwres_gabn.3 ${man3}/lwres_gabnresponse_free.3 - rm -f ${man3}/lwres_gabnresponse_parse.3 -- @LN@ ${man3}/lwres_gabn.3 ${man3}/lwres_gabnresponse_parse.3 -+ @LN@ -s ${man3}/lwres_gabn.3 ${man3}/lwres_gabnresponse_parse.3 - rm -f ${man3}/lwres_gabnresponse_render.3 -- @LN@ ${man3}/lwres_gabn.3 ${man3}/lwres_gabnresponse_render.3 -+ @LN@ -s ${man3}/lwres_gabn.3 ${man3}/lwres_gabnresponse_render.3 - rm -f ${man3}/lwres_getaddrsbyname.3 -- @LN@ ${man3}/lwres_resutil.3 ${man3}/lwres_getaddrsbyname.3 -+ @LN@ -s ${man3}/lwres_resutil.3 ${man3}/lwres_getaddrsbyname.3 - rm -f ${man3}/lwres_gethostbyaddr.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyaddr.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyaddr.3 - rm -f ${man3}/lwres_gethostbyaddr_r.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyaddr_r.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyaddr_r.3 - rm -f ${man3}/lwres_gethostbyname.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyname.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyname.3 - rm -f ${man3}/lwres_gethostbyname2.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyname2.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyname2.3 - rm -f ${man3}/lwres_gethostbyname_r.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyname_r.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostbyname_r.3 - rm -f ${man3}/lwres_gethostent_r.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostent_r.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_gethostent_r.3 - rm -f ${man3}/lwres_getipnodebyaddr.3 -- @LN@ ${man3}/lwres_getipnode.3 ${man3}/lwres_getipnodebyaddr.3 -+ @LN@ -s ${man3}/lwres_getipnode.3 ${man3}/lwres_getipnodebyaddr.3 - rm -f ${man3}/lwres_getipnodebyname.3 -- @LN@ ${man3}/lwres_getipnode.3 ${man3}/lwres_getipnodebyname.3 -+ @LN@ -s ${man3}/lwres_getipnode.3 ${man3}/lwres_getipnodebyname.3 - rm -f ${man3}/lwres_getnamebyaddr.3 -- @LN@ ${man3}/lwres_resutil.3 ${man3}/lwres_getnamebyaddr.3 -+ @LN@ -s ${man3}/lwres_resutil.3 ${man3}/lwres_getnamebyaddr.3 - rm -f ${man3}/lwres_gnbarequest_free.3 -- @LN@ ${man3}/lwres_gnba.3 ${man3}/lwres_gnbarequest_free.3 -+ @LN@ -s ${man3}/lwres_gnba.3 ${man3}/lwres_gnbarequest_free.3 - rm -f ${man3}/lwres_gnbarequest_parse.3 -- @LN@ ${man3}/lwres_gnba.3 ${man3}/lwres_gnbarequest_parse.3 -+ @LN@ -s ${man3}/lwres_gnba.3 ${man3}/lwres_gnbarequest_parse.3 - rm -f ${man3}/lwres_gnbarequest_render.3 -- @LN@ ${man3}/lwres_gnba.3 ${man3}/lwres_gnbarequest_render.3 -+ @LN@ -s ${man3}/lwres_gnba.3 ${man3}/lwres_gnbarequest_render.3 - rm -f ${man3}/lwres_gnbaresponse_free.3 -- @LN@ ${man3}/lwres_gnba.3 ${man3}/lwres_gnbaresponse_free.3 -+ @LN@ -s ${man3}/lwres_gnba.3 ${man3}/lwres_gnbaresponse_free.3 - rm -f ${man3}/lwres_gnbaresponse_parse.3 -- @LN@ ${man3}/lwres_gnba.3 ${man3}/lwres_gnbaresponse_parse.3 -+ @LN@ -s ${man3}/lwres_gnba.3 ${man3}/lwres_gnbaresponse_parse.3 - rm -f ${man3}/lwres_gnbaresponse_render.3 -- @LN@ ${man3}/lwres_gnba.3 ${man3}/lwres_gnbaresponse_render.3 -+ @LN@ -s ${man3}/lwres_gnba.3 ${man3}/lwres_gnbaresponse_render.3 - rm -f ${man3}/lwres_herror.3 -- @LN@ ${man3}/lwres_hstrerror.3 ${man3}/lwres_herror.3 -+ @LN@ -s ${man3}/lwres_hstrerror.3 ${man3}/lwres_herror.3 - rm -f ${man3}/lwres_lwpacket_parseheader.3 -- @LN@ ${man3}/lwres_packet.3 ${man3}/lwres_lwpacket_parseheader.3 -+ @LN@ -s ${man3}/lwres_packet.3 ${man3}/lwres_lwpacket_parseheader.3 - rm -f ${man3}/lwres_lwpacket_renderheader.3 -- @LN@ ${man3}/lwres_packet.3 ${man3}/lwres_lwpacket_renderheader.3 -+ @LN@ -s ${man3}/lwres_packet.3 ${man3}/lwres_lwpacket_renderheader.3 - rm -f ${man3}/lwres_net_ntop.3 -- @LN@ ${man3}/lwres_inetntop.3 ${man3}/lwres_net_ntop.3 -+ @LN@ -s ${man3}/lwres_inetntop.3 ${man3}/lwres_net_ntop.3 - rm -f ${man3}/lwres_nooprequest_free.3 -- @LN@ ${man3}/lwres_noop.3 ${man3}/lwres_nooprequest_free.3 -+ @LN@ -s ${man3}/lwres_noop.3 ${man3}/lwres_nooprequest_free.3 - rm -f ${man3}/lwres_nooprequest_parse.3 -- @LN@ ${man3}/lwres_noop.3 ${man3}/lwres_nooprequest_parse.3 -+ @LN@ -s ${man3}/lwres_noop.3 ${man3}/lwres_nooprequest_parse.3 - rm -f ${man3}/lwres_nooprequest_render.3 -- @LN@ ${man3}/lwres_noop.3 ${man3}/lwres_nooprequest_render.3 -+ @LN@ -s ${man3}/lwres_noop.3 ${man3}/lwres_nooprequest_render.3 - rm -f ${man3}/lwres_noopresponse_free.3 -- @LN@ ${man3}/lwres_noop.3 ${man3}/lwres_noopresponse_free.3 -+ @LN@ -s ${man3}/lwres_noop.3 ${man3}/lwres_noopresponse_free.3 - rm -f ${man3}/lwres_noopresponse_parse.3 -- @LN@ ${man3}/lwres_noop.3 ${man3}/lwres_noopresponse_parse.3 -+ @LN@ -s ${man3}/lwres_noop.3 ${man3}/lwres_noopresponse_parse.3 - rm -f ${man3}/lwres_noopresponse_render.3 -- @LN@ ${man3}/lwres_noop.3 ${man3}/lwres_noopresponse_render.3 -+ @LN@ -s ${man3}/lwres_noop.3 ${man3}/lwres_noopresponse_render.3 - rm -f ${man3}/lwres_sethostent.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_sethostent.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_sethostent.3 - rm -f ${man3}/lwres_sethostent_r.3 -- @LN@ ${man3}/lwres_gethostent.3 ${man3}/lwres_sethostent_r.3 -+ @LN@ -s ${man3}/lwres_gethostent.3 ${man3}/lwres_sethostent_r.3 - rm -f ${man3}/lwres_string_parse.3 -- @LN@ ${man3}/lwres_resutil.3 ${man3}/lwres_string_parse.3 -+ @LN@ -s ${man3}/lwres_resutil.3 ${man3}/lwres_string_parse.3 - - uninstall:: - for m in ${MANPAGES}; do rm -f ${man3}/$$m ; done diff --git a/packages/dnsutils/lwres-fix-hardcoded-paths.patch b/packages/dnsutils/lwres-fix-hardcoded-paths.patch deleted file mode 100644 index c4a72e53b..000000000 --- a/packages/dnsutils/lwres-fix-hardcoded-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr bind-9.11.1-P3/lib/lwres/include/lwres/lwres.h bind-9.11.1-P3.mod/lib/lwres/include/lwres/lwres.h ---- bind-9.11.1-P3/lib/lwres/include/lwres/lwres.h 2017-07-07 18:01:52.000000000 +0300 -+++ bind-9.11.1-P3.mod/lib/lwres/include/lwres/lwres.h 2017-10-04 16:48:56.466109542 +0300 -@@ -74,7 +74,7 @@ - #define LWRES_UDP_PORT 921 /*%< UDP Port Number */ - #define LWRES_RECVLENGTH 16384 /*%< Maximum Packet Length */ - #define LWRES_ADDR_MAXLEN 16 /*%< changing this breaks ABI */ --#define LWRES_RESOLV_CONF "/etc/resolv.conf" /*%< Location of resolv.conf */ -+#define LWRES_RESOLV_CONF "@TERMUX_PREFIX@/etc/resolv.conf" /*%< Location of resolv.conf */ - - /*% DNSSEC is not required (input). Only relevant to rrset queries. */ - #define LWRES_FLAG_TRUSTNOTREQUIRED 0x00000001U