Update adns to 1.4.

Inspired by PR#43126 from Wen Heping.
While here, set LICENSE and TEST_TARGET.

adns (1.4); urgency=low

  Improvements for multithreaded programs:
  * New documentation comment in adns.h explaining thread guarantees
    (or lack of them), replaces `single-threaded' note at the top.
  * Fix string conversion of adns_r_addr not to use a static buffer
    (function csp_addr) so as to make thread promise true.
  * Make an internal variable const-correct (expectdomain in pa_ptr).

 -- Ian Jackson <ian@davenant.greenend.org.uk>  Tue, 17 Oct 2006 17:05:08 +0100

adns (1.3); urgency=low

  Portability fixes:
  * Cast ptrdiff_t to int for %.*s length in adnsheloex and adnslogres,
    as is required.  (Report from Jim Meyering.)
  * In configure.in, quote macro name argument to define() to
    suppress spurious autoconf error.  (Report from Mihai Ibanescu.)
  * Use autoconf's values for {bin,lib,include}dir rather than inventing
    our own from @exec_prefix@, making configure --libdir work.
    (Patch from Mihai Ibanescu.)
  * Remove spurious `_' from {bin,lib,include}dir Makefile variables.
    (Report from Mihai Ibanescu.)
  * Do away with `mismatch' variable in parse.c:adns__findrr_anychk so that
    overzealous GCC cannot complain about members of eo_fls being
    uninitialised.  (Report from Jim Meyering.)

 -- Ian Jackson <ian@davenant.greenend.org.uk>  Tue,  6 Jun 2006 20:22:30 +0100

adns (1.2); urgency=medium

  New features:
  * Support for SRV RRs.
  * Support for unknown RR types (according to RFC3597) via adns_r_unknown.
  * Allow `;'-comments in resolv.conf (report from Colin Charles).
  * New adnsheloex client courtesy of Tony Finch.
  * New adns_init_logfn etc. for having logging use a callback function.

  Bugfixes:
  * Fix error in prototype in definition of adns__parse_domain.
  * Add missing ENOTSOCK to hcommon.c.m4 (was already in hcommon.c!)

  Portability fixes prompted by Bernd Eckenfels, the Debian maintainer:
  * Correct type of various printf arguments: ptrdiff_t != int.
  * Do not print size of leaked blocks of memory (this causes
    a spurious regression test failure on some platforms).
  * Provide adns_if_none and adns_qf_none (which will help with compilers
    which complain about plain `0' being passed where an enum is wanted).
  * adnstest converts some errno values to EFOOBAR: all of the ones
    mentioned in adns.h, at least.  This makes the regression test
    more portable (fixes problem noticed by Bernd Eckenfels).
  * Add -Wno-pointer-sign if GCC has that option.

  Documentation improvements:
  * Add documentation comment by definition of adns_r_ptr_raw type enum.
  * Document in adns.h EINVAL from adns_init meaning bad configuration.
  * Include several new references to related programs to README.html.
  * Redacted the TODO list.
  * New LICENCE.WAIVERS file for GPL-incompatility workarounds.
  * Clarified GPL-vs-LGPL: a bit less hostile and a bit more mercenary.
  * Copyright notices updated.

  Packaging changes:
  * Update MINOR to 2 and DISTVERSION and ADNS_VERSION_STRING to 1.2.
  * Reran autoconf/autoheader (autoconf Debian 2.13-54).
  * Create $(bin_dir) and $(lib_dir) on `make install', and also
    make a libadns.so.1 -> libadns.so.1.<minor> link.  (Suggestions
    and patch from Nix of esperi.org.uk.)
  * Add .PHONY: install to Makefile, to help people with demented fs's.
  * Darwin listed in INSTALL.

  Minor test harness improvements:
  * Hgettimeofday calls Tensurerecordfile (was Tensureinput/outputfile).
  * Add bind(2) and listen(2) wrappers (for epithet, but harmless in adns).

 -- Ian Jackson <ian@davenant.greenend.org.uk>  Sat,  8 Apr 2006 15:41:28 +0100

10 files changed, 54 insertions, 63 deletions

diff --git a/net/adns/Makefile b/net/adns/Makefile
index 3f0c066b201..52f77ff554a 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2008/06/12 02:14:38 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/04/17 12:43:03 obache Exp $
 #
 
-DISTNAME=	adns-1.1
-PKGREVISION=	2
+DISTNAME=	adns-1.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~ian/adns/ftp/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.chiark.greenend.org.uk/~ian/adns/
 COMMENT=	Asynchronous-capable DNS client library and utilities
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -16,9 +16,11 @@ USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
+# libtoolize patch to static library target.
 CONFIGURE_ARGS+=	--disable-dynamic
-AUTO_MKDIRS=			yes
 
 INSTALL_MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX}
 
+TEST_TARGET=		check
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/adns/PLIST b/net/adns/PLIST
index 703b9b3aaf0..7df2b5710c8 100644
--- a/net/adns/PLIST
+++ b/net/adns/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:47 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/04/17 12:43:03 obache Exp $
+bin/adnsheloex
 bin/adnshost
 bin/adnslogres
 bin/adnsresfilter
diff --git a/net/adns/distinfo b/net/adns/distinfo
index d31072ab093..9dcf2d993ab 100644
--- a/net/adns/distinfo
+++ b/net/adns/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.14 2009/09/09 16:34:09 joerg Exp $
+$NetBSD: distinfo,v 1.15 2010/04/17 12:43:03 obache Exp $
 
-SHA1 (adns-1.1.tar.gz) = cd47dfc819b147b3275eaf6316f17f15be7187e5
-RMD160 (adns-1.1.tar.gz) = c6198f864afc40657dd94b7a94cf59a483ab7581
-Size (adns-1.1.tar.gz) = 211455 bytes
-SHA1 (patch-aa) = 7ac1403a5f3d5a69de3976c0931f41bfd512c277
-SHA1 (patch-ab) = a87f93cec91a04b875c98bd2fb586b346fb3e74f
-SHA1 (patch-ac) = 2928cd6ccd224bc6d355e52b2f8dc149beaaff84
-SHA1 (patch-ad) = 5ce6a933673c82b2058ff67223057bbf18f5d8bb
-SHA1 (patch-ae) = fdcc3815b880538ef2c124c7ff3c0ac74b25a14f
-SHA1 (patch-af) = f1372fe9216161d423602318a812e7f06e0f0a92
-SHA1 (patch-ag) = ffe081833324dbd28b15408ee7ce4b3a232382e2
+SHA1 (adns-1.4.tar.gz) = 87283c3bcd09ceb2e605e91abedfb537a18f1884
+RMD160 (adns-1.4.tar.gz) = ccff2111bfa3eb99e28d355d48e9e17333f34394
+Size (adns-1.4.tar.gz) = 252668 bytes
+SHA1 (patch-aa) = 398086c7f693f342b090e336b679bc16b80ba035
+SHA1 (patch-ab) = 83ed4406342a36ba9c3d282e2a5b0101f783bb16
+SHA1 (patch-ac) = 007669d4b6626e3f89f9e23067244084f05f3dfe
+SHA1 (patch-ad) = 1f2484f8087fcbf140d22aa00943974b93bd3fbc
+SHA1 (patch-af) = 9e3f58b2d0f576e07f5d025cb696a295013ef53a
+SHA1 (patch-ag) = 1d9f9a97a63ea5e073c189071fb6420543d3892d
diff --git a/net/adns/patches/patch-aa b/net/adns/patches/patch-aa
index 661415ac709..a7371ac8c3e 100644
--- a/net/adns/patches/patch-aa
+++ b/net/adns/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2009/09/02 11:01:50 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/04/17 12:43:03 obache Exp $
 
---- client/Makefile.in.orig	Sat Sep 16 20:43:10 2000
+--- client/Makefile.in.orig	2006-05-10 10:58:02.000000000 +0000
 +++ client/Makefile.in
-@@ -31,7 +31,7 @@
+@@ -30,7 +30,7 @@ PROGRAMS=	adnslogres adnsheloex adnshost
  PROGRAMS_LOCAL=	fanftest adnstest
  PROGRAMS_ALL=	$(PROGRAMS) $(PROGRAMS_LOCAL)
  
@@ -11,15 +11,15 @@ $NetBSD: patch-aa,v 1.2 2009/09/02 11:01:50 joerg Exp $
  
  ifeq ($(ENABLE_DYNAMIC),elf)
  DYNAMIC_DEP=	$(srcdir)/../dynamic/$(SHLIBFILE)
-@@ -60,13 +60,13 @@
- 
+@@ -60,13 +60,13 @@ all:		$(TARGETS)
  install:	$(TARG_INSTALL)
+ 		mkdir -p $(bindir)
  		set -xe; for f in $(TARG_INSTALL); \
--			do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
-+			do ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+-			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
++			do ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
  
  uninstall:
- 		for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
+ 		for f in $(TARGETS); do rm -f $(bindir)/$$f; done
  
  adnshost:	$(ADH_OBJS) $(DYNAMIC_DEP)
 -		$(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.2 2009/09/02 11:01:50 joerg Exp $
  
  adnshost_s:	$(ADH_OBJS) $(STATIC_LIB)
  		$(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ $(ALL_OBJS):		$(ADNSDIR)/adns.h $(ADNSDI
  adnsresfilter.o:	$(ADNSDIR)/tvarith.h
  
  %:		%.o $(DYNAMIC_DEP)
diff --git a/net/adns/patches/patch-ab b/net/adns/patches/patch-ab
index 233a5f0023f..f09879f161b 100644
--- a/net/adns/patches/patch-ab
+++ b/net/adns/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2009/09/09 16:34:09 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2010/04/17 12:43:03 obache Exp $
 
---- src/Makefile.in.orig	Sat Sep 16 20:24:24 2000
+--- src/Makefile.in.orig	2006-05-10 10:58:03.000000000 +0000
 +++ src/Makefile.in
-@@ -24,13 +24,13 @@
+@@ -23,14 +23,14 @@
  srcdir=		@srcdir@
  VPATH=		@srcdir@
  
@@ -12,13 +12,14 @@ $NetBSD: patch-ab,v 1.3 2009/09/09 16:34:09 joerg Exp $
  include		adns.make
  
  install:
+ 		mkdir -p $(libdir) $(includedir)
  		set -xe; for f in $(TARGETS); \
--			do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
-+			do ${LIBTOOL} --mode=install $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
- 		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h
+-			do $(INSTALL_DATA) $$f $(libdir)/$$f; done
++			do ${LIBTOOL} --mode=install $(INSTALL_DATA) $$f $(libdir)/$$f; done
+ 		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
  
  uninstall:
-@@ -39,10 +39,10 @@
+@@ -39,10 +39,10 @@ uninstall:
  
  ALLOBJS=	$(LIBOBJS)
  
diff --git a/net/adns/patches/patch-ac b/net/adns/patches/patch-ac
index b7b61840492..6d03d70befe 100644
--- a/net/adns/patches/patch-ac
+++ b/net/adns/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2005/03/12 06:05:33 tv Exp $
+$NetBSD: patch-ac,v 1.5 2010/04/17 12:43:03 obache Exp $
 
---- client/adnslogres.c.orig	2000-09-17 10:09:02.000000000 -0400
+--- client/adnslogres.c.orig	2006-05-09 19:37:58.000000000 +0000
 +++ client/adnslogres.c
-@@ -186,9 +186,11 @@ static void proclog(FILE *inf, FILE *out
+@@ -188,9 +188,11 @@ static void proclog(FILE *inf, FILE *out
  	msg("%d in queue; checking %.*s", len,
- 	    head->rest-head->addr, guard_null(head->addr));
+ 	    (int)(head->rest-head->addr), guard_null(head->addr));
        if (eof || len >= maxpending) {
 +#ifdef HAVE_POLL
  	if (opts & OPT_POLL)
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.4 2005/03/12 06:05:33 tv Exp $
  	  err= adns_wait(adns, &head->query, &answer, NULL);
        } else {
  	err= adns_check(adns, &head->query, &answer, NULL);
-@@ -223,7 +225,9 @@ static void printhelp(FILE *file) {
+@@ -225,7 +227,9 @@ static void printhelp(FILE *file) {
    fputs("usage: adnslogres [<options>] [<logfile>]\n"
  	"       adnslogres --version|--help\n"
  	"options: -c <concurrency>  set max number of outstanding queries\n"
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.4 2005/03/12 06:05:33 tv Exp $
  	"         -d                turn on debugging\n"
  	"         -C <config>       use instead of contents of resolv.conf\n",
  	stdout);
-@@ -268,9 +272,11 @@ int main(int argc, char *argv[]) {
+@@ -270,9 +274,11 @@ int main(int argc, char *argv[]) {
      case 'd':
        opts|= OPT_DEBUG;
        break;
diff --git a/net/adns/patches/patch-ad b/net/adns/patches/patch-ad
index 9248023f8d7..456767bb110 100644
--- a/net/adns/patches/patch-ad
+++ b/net/adns/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/03/12 06:05:33 tv Exp $
+$NetBSD: patch-ad,v 1.2 2010/04/17 12:43:03 obache Exp $
 
---- client/adnstest.c.orig	2000-09-16 20:24:24.000000000 -0400
+--- client/adnstest.c.orig	2006-04-08 14:36:57.000000000 +0000
 +++ client/adnstest.c
-@@ -59,7 +59,7 @@ static void quitnow(int rc) {
+@@ -58,7 +58,7 @@ static void quitnow(int rc) {
    exit(rc);
  }
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2005/03/12 06:05:33 tv Exp $
  #undef poll
  int poll(struct pollfd *ufds, int nfds, int timeout) {
    fputs("poll(2) not supported on this system\n",stderr);
-@@ -292,9 +292,12 @@ int main(int argc, char *const *argv) {
+@@ -302,9 +302,12 @@ int main(int argc, char *const *argv) {
        mc= 0;
      }
  
diff --git a/net/adns/patches/patch-ae b/net/adns/patches/patch-ae
deleted file mode 100644
index 7846ec70a88..00000000000
--- a/net/adns/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/13 16:08:54 joerg Exp $
-
---- src/parse.c.orig	2005-12-13 16:03:36.000000000 +0000
-+++ src/parse.c
-@@ -113,7 +113,7 @@ adns_status adns__findlabel_next(findlab
- }
- 
- adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,
--			       vbuf *vb, adns_queryflags flags,
-+			       vbuf *vb, parsedomain_flags flags,
- 			       const byte *dgram, int dglen, int *cbyte_io,
- 			       int max) {
-   findlabel_state fls;
diff --git a/net/adns/patches/patch-af b/net/adns/patches/patch-af
index 788f4f9e881..865e6658790 100644
--- a/net/adns/patches/patch-af
+++ b/net/adns/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2006/02/07 03:48:44 minskim Exp $
+$NetBSD: patch-af,v 1.2 2010/04/17 12:43:03 obache Exp $
 
---- src/internal.h.orig	2003-06-22 06:58:15.000000000 -0700
+--- src/internal.h.orig	2006-04-08 14:36:57.000000000 +0000
 +++ src/internal.h
-@@ -160,7 +160,7 @@ union maxalign {
+@@ -185,7 +185,7 @@ union maxalign {
    void *p;
    void (*fp)(void);
    union maxalign *up;
diff --git a/net/adns/patches/patch-ag b/net/adns/patches/patch-ag
index 18396b5664f..996ce5d7a46 100644
--- a/net/adns/patches/patch-ag
+++ b/net/adns/patches/patch-ag
@@ -1,10 +1,11 @@
-$NetBSD: patch-ag,v 1.1 2006/02/07 03:54:25 minskim Exp $
+$NetBSD: patch-ag,v 1.2 2010/04/17 12:43:03 obache Exp $
 
---- Makefile.in.orig	2003-07-01 14:59:38.000000000 -0700
+--- Makefile.in.orig	2006-10-17 16:15:19.000000000 +0000
 +++ Makefile.in
-@@ -75,3 +75,5 @@ README:			README.html
- 
+@@ -75,4 +75,6 @@ README:			README.html
  TAGS info dvi:
  	# do nothing
-+
+ 
 +.PHONY: install
++
+ .PHONY: install #people with case-insensitive filesystems lose otherwise!