adns: Update to 1.6.0

adns (1.6.0) UPSTREAM; urgency=medium

  Bugfixes:
  * adnshost: Support --reverse in -f mode input stream
  * timeout robustness against clock skew: track query start time and
    duration.  Clock instability may now only cause spurious timeouts
    rather than indefinite hangs or even assertion failures.

  New features:
  * adnshost: Offer ability to set adns checkc flags
  * adnslogres: Honour --checkc-freq (if it comes first)
  * adnsresfilter: Honour --checkc-freq and --checkc-entex
  * time handling: Support use of CLOCK_MONOTONIC via an init flag.
  * adns_str* etc.: Improve robustness; more allowable inputs values.

  Build system improvements:
  * clean targets: Delete $(TARGETS) too!
  * Remove all m4 output files from the distributed source tree.
  * Support DESTDIR=/some/absolute/path on `make install'.
  * Provide autogen.sh.
  * Rerun autoheader and autoconf (2.69).

  Internal changes:
  * adnshost: adh-opts.c: Whitespace adjustments to option table

  Tests:
  * New tests for fixes in 1.5.3.
  * Fixes to test harness to avoid false positives during fuzzing.
  * Other changes to support use with AFL.
  * Many supporting improvements and refactorings.
  * Fix skipped tests ($$ reference in Makefile)


 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 11 Jun 2020 15:49:39 +0100

adns (1.5.2) UPSTREAM; urgency=medium

  * Important security fixes:
     CVE-2017-9103 CVE-2017-9104 CVE-2017-9105 CVE-2017-9109:
	Vulnerable applications: all adns callers.
        Exploitable by: the local recursive resolver.
	Likely worst case: Remote code execution.
     CVE-2017-9106:
	Vulnerable applications: those that make SOA queries.
        Exploitable by: upstream DNS data sources.
	Likely worst case: DoS (crash of the adns-using application)
     CVE-2017-9107:
	Vulnerable applications: those that use adns_qf_quoteok_query.
        Exploitable by: sources of query domain names.
	Likely worst case: DoS (crash of the adns-using application)
     CVE-2017-9108:
	Vulnerable applications: adnshost.
        Exploitable by: code responsible for framing the input.
        Likely worst case: DoS (adnshost crashes at EOF).
    All found by AFL 2.35b.  Thanks to the University of Cambridge
    Department of Applied Mathematics for computing facilities.

  Bugfixes:
  * Do not include spurious external symbol `data' (fixes GCC10 build).
  * If server sends TC flag over TCP, bail rather than retrying.
  * Do not crash on certain strange resolv.conf contents.
  * Fix various crashes if a global system failure occurs, or
    adns_finish is called with outstanding queries.
  * Correct a parsing error message very slightly.
  * DNS packet parsing: Slight fix when packet is truncated.
  * Fix ABI compatibility in string conversion of certain RR types.
  * internal.h: Use `unsigned' for nextid; fixes theoretical C UB.

  Portability fix:
  * common.make.in: add -Wno-unused-value.  Fixes build with GCC9.

  Internal changes:
  * Additional comments describing some internal code restrions.
  * Robustness assert() against malfunctioning write() system call.

 -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 11 Jun 2020 15:48:12 +0100

3 files changed, 11 insertions, 31 deletions

diff --git a/net/adns/Makefile b/net/adns/Makefile
index 270df13d490..46c8f4ec177 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.25 2020/01/26 17:31:48 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2021/02/11 11:25:51 nia Exp $
 #
 
-DISTNAME=	adns-1.5.1
+DISTNAME=	adns-1.6.0
 CATEGORIES=	net
-MASTER_SITES=	http://www.chiark.greenend.org.uk/~ian/adns/ftp/
+MASTER_SITES=	https://www.chiark.greenend.org.uk/~ian/adns/ftp/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.chiark.greenend.org.uk/~ian/adns/
 COMMENT=	Asynchronous-capable DNS client library and utilities
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gm4
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
 # libtoolize patch to static library target.
 CONFIGURE_ARGS+=	--disable-dynamic
 
-INSTALL_MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+=	libdir=${DESTDIR}${PREFIX}/lib
 
 TEST_TARGET=		check
 
diff --git a/net/adns/distinfo b/net/adns/distinfo
index 876d22b78fc..a5a3c20e7c5 100644
--- a/net/adns/distinfo
+++ b/net/adns/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.18 2016/08/16 13:34:52 mef Exp $
+$NetBSD: distinfo,v 1.19 2021/02/11 11:25:51 nia Exp $
 
-SHA1 (adns-1.5.1.tar.gz) = 95ef1af9198aa2ea5c23b30c0f45d3c561e856b8
-RMD160 (adns-1.5.1.tar.gz) = 1247903d0fb02f34ea402a75f46c34e8a8190f68
-SHA512 (adns-1.5.1.tar.gz) = f7bf8ff2b8faa1d7be0b27c732714240a27d6dfd7f70af8ae364e5de382427a79c484099f73f85eb1c77fb1a9845884e2f63d5831bc34a6212f206b24e7e1574
-Size (adns-1.5.1.tar.gz) = 319774 bytes
+SHA1 (adns-1.6.0.tar.gz) = aa8f1d0c5357fc71ad7f2ed145cd81db7af02848
+RMD160 (adns-1.6.0.tar.gz) = bfed1dc9adec78f73b34b6d02ee986eb43ef2e7f
+SHA512 (adns-1.6.0.tar.gz) = d28d27123a2c9f873a60f9f1fd76ba60c795dc703ff52a6649f8f7ead12a5c74eb71b0a158168dfe9bb1eaf9b7d21f96ef303eb07fd9ad37fd73c38ed853d8de
+Size (adns-1.6.0.tar.gz) = 323474 bytes
 SHA1 (patch-aa) = 047eaeec04126c74a36f04f69d54ffedde0a2002
 SHA1 (patch-ab) = 551451955e92fac6962b405908adc2afb603082d
 SHA1 (patch-ac) = 6660ff4248eea59bb54e88aebf87c7430fbae102
 SHA1 (patch-ad) = 0a2632c7984ac30dff61cafc51631449e41399f2
-SHA1 (patch-af) = 10a4868a0f3ec8901e50cf9df7309722ca07bed9
 SHA1 (patch-ag) = 916492f0b7ffa5508a8c8531c0daab24f6004136
diff --git a/net/adns/patches/patch-af b/net/adns/patches/patch-af
deleted file mode 100644
index a7d91b4007d..00000000000
--- a/net/adns/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2015/01/29 09:47:03 mef Exp $
-
-date: 2006-02-07 12:48:44 +0900;  author: minskim;  state: Exp;
-Do not define a variable in a header file included by multiple .c files.
-This makes the package build on Darwin.  Patch from DarwinPorts.
-
-The modified header file is used internally, and never installed.  So
-no visible changes to dependent packages.
-
---- src/internal.h.orig	2014-10-26 20:45:58.000000000 +0900
-+++ src/internal.h	2015-01-29 18:35:21.000000000 +0900
-@@ -246,7 +246,7 @@ union maxalign {
-   void *p;
-   void (*fp)(void);
-   union maxalign *up;
--} data;
-+};
- 
- struct adns__query {
-   adns_state ads;