From ab9603b004ef2bfd1c3450b915320b45a07f58c8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 25 May 2020 13:01:17 +0100
Subject: [PATCH 01/16] adns_str* etc.: Permit calling on adns_s_* values (not
 _max_)

This is useful because otherwise an application may not use these
values for its own errors, if that might result in them being passed
to the adns_strerror etc.

No code change: the table already has all the values.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/adns.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/adns.h b/src/adns.h
index b8072ee..ba44b06 100644
--- a/src/adns.h
+++ b/src/adns.h
@@ -1089,7 +1089,9 @@ const char *adns_errtypeabbrev(adns_status st);
  *
  * If you call these functions with status values not actually
  * returned from other functions in the same adns library, the
- * returned information may be NULL.
+ * returned information may be NULL.  (You are also guaranteed
+ * that the return value will not be NULL for values in the
+ * adns_status enum, *except* for adns_s_max_XXXX.)
  */
 
 #ifdef __cplusplus
-- 
2.30.2


From 489381f9e19e486dd28d2a59631f6cbbfd670db0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 8 Jun 2020 17:12:41 +0100
Subject: [PATCH 02/16] Support DESTDIR=/some/absolute/path on `make install'

You must have done `make' *without* DESTDIR, first.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 common.make.in | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/common.make.in b/common.make.in
index 46add1c..5e0e80b 100644
--- a/common.make.in
+++ b/common.make.in
@@ -45,11 +45,22 @@ MKSHLIB_1=	@MKSHLIB_1@
 MKSHLIB_2=	@MKSHLIB_2@
 MKSHLIB_3=	@MKSHLIB_3@
 
-prefix=		@prefix@
-exec_prefix=	@exec_prefix@
-bindir=		@bindir@
-libdir=		@libdir@
-includedir=	@includedir@
+prefix		:= @prefix@
+exec_prefix	:= @exec_prefix@
+bindir		:= @bindir@
+libdir		:= @libdir@
+includedir	:= @includedir@
+
+ifneq ($(DESTDIR),)
+# autoconf likes to define some of these in terms of each other
+# so if we want to add a prefix to each one we have to do it this way:
+destdir_prefix=$(DESTDIR)/
+prefix		:= ${destdir_prefix}${prefix}
+exec_prefix	:= ${destdir_prefix}${exec_prefix}
+bindir		:= ${destdir_prefix}${bindir}
+libdir		:= ${destdir_prefix}${libdir}
+includedir	:= ${destdir_prefix}${includedir}
+endif
 
 AC_INSTALL=	@INSTALL@
 ifeq ($(AC_INSTALL),./install-sh -c)
-- 
2.30.2


From f48783520f4ac169dfda75f32ed88672fe6ed033 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Jun 2020 16:08:55 +0100
Subject: [PATCH 03/16] Docuemntation: No longer update NEWS

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 NEWS              | 5 +++++
 RELEASE-CHECKLIST | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 18130c2..ce0e44e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+For later changes, please see the file `changelog' in the
+source code toplevel.
+
+
+
 Changes in adns 1.5.2, since adns 1.5.1, are:
 
  Important security fixes, and other bugfixes.  See changelog.
diff --git a/RELEASE-CHECKLIST b/RELEASE-CHECKLIST
index cdd3461..e38d55c 100755
--- a/RELEASE-CHECKLIST
+++ b/RELEASE-CHECKLIST
@@ -3,7 +3,6 @@
 #
 #  * Maybe rerun autoconf
 #  * Ensure changelog reflects changes
-#  * Ensure NEWS reflects changes
 #  * Maybe update copyright dates
 #  * Maybe update MAJOR and/or MINOR in common.make.in
 #  * Update DISTVERSION in Makefile.in
-- 
2.30.2


From 20c5e56b36869bc62b449d1926179e8defddedee Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Jun 2020 16:10:43 +0100
Subject: [PATCH 04/16] Provide autogen.sh

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 autogen.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100755 autogen.sh

diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..14efa37
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+autoheader
+autoconf
-- 
2.30.2


From 79783ffbd6c3e94ee8ae7de21ad02f2f87781cf6 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Jun 2020 16:10:56 +0100
Subject: [PATCH 05/16] Rerun autoheader and autoconf 2.69

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 configure       | 14 ++++++++-
 src/config.h.in | 84 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 825233c..b229e68 100755
--- a/configure
+++ b/configure
@@ -664,6 +664,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -735,6 +736,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -987,6 +989,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1124,7 +1135,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1277,6 +1288,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
diff --git a/src/config.h.in b/src/config.h.in
index bd36686..ddc3462 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,4 +1,29 @@
-/* src/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* src/config.h.in.  Generated from configure.in by autoheader.  */
+/*
+ * acconfig.h
+ * input file for autoheader/autoconf/configure: extra stuff for config.h
+ */
+/*
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+ *    Copyright (C) 2014  Mark Wooding
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3, or (at your option)
+ *  any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software Foundation.
+ */
 
 /* Define if inline functions a la GCC are available.  */
 #undef HAVE_INLINE
@@ -18,15 +43,64 @@
 /* Define if we want to include rpc/types.h.  Crap BSDs put INADDR_LOOPBACK there. */
 #undef HAVEUSE_RPCTYPES_H
 
-/* Define if you have the poll function.  */
-#undef HAVE_POLL
 
-/* Define if you have the nsl library (-lnsl).  */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
-/* Define if you have the socket library (-lsocket).  */
+/* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Use the definitions: */
 
 #ifndef HAVE_INLINE
-- 
2.30.2


From ccaa00188308fa3f21820f52c5d4cdf8346d1ccf Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Jun 2020 15:47:17 +0100
Subject: [PATCH 06/16] changelog: Document changes in 1.6.0 and finalise
 version number

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Makefile.in     |  2 +-
 changelog       | 35 +++++++++++++++++++++++++++++++++++
 client/client.h |  2 +-
 common.make.in  |  2 +-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0889ad9..976a159 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,7 @@ include		./common.make
 
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
 # possibly library soname (MAJOR and MINOR in common.make.in).
-DISTVERSION=	1.5.2
+DISTVERSION=	1.6.0
 
 srcdir=		@srcdir@
 VPATH=		@srcdir@
diff --git a/changelog b/changelog
index a0cfb25..aa09bd0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,38 @@
+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:
diff --git a/client/client.h b/client/client.h
index 5d9c271..908d54a 100644
--- a/client/client.h
+++ b/client/client.h
@@ -27,7 +27,7 @@
 #ifndef CLIENT_H_INCLUDED
 #define CLIENT_H_INCLUDED
 
-#define ADNS_VERSION_STRING "1.5.2"
+#define ADNS_VERSION_STRING "1.6.0"
 
 #define COPYRIGHT_MESSAGE \
  "Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson\n" \
diff --git a/common.make.in b/common.make.in
index 5e0e80b..d5188d9 100644
--- a/common.make.in
+++ b/common.make.in
@@ -22,7 +22,7 @@
 #  along with this program; if not, write to the Free Software Foundation.
 
 MAJOR=		1
-MINOR=		5
+MINOR=		6
 SHLIBFILE=	@SHLIBFILE@
 SHLIBSONAME=	@SHLIBSONAME@
 SHLIBFORLINK=	@SHLIBFORLINK@
-- 
2.30.2


From 3b7d6c90d1a5d6b3bf6762acd1646ca7e65cc89e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 20:12:14 +0100
Subject: [PATCH 07/16] regress: Handle negative usec deltas

Fixes Debian #1065725
Fixes Ubuntu #2057735

Reported-by: Sebastian Ramacher <sramacher@debian.org>
---
 regress/hplayback.c.m4 | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index dd98f0e..7d0660e 100644
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -170,19 +170,25 @@ static int Perrno(const char *stuff) {
 
 static void P_updatetime(void) {
   int chars;
-  unsigned long sec, usec;
+  unsigned long sec;
+  long usec;
 
   if (!adns__vbuf_ensure(&vb2,1000)) Tnomem();
   fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
   chars= -1;
-  sscanf(vb2.buf," +%lu.%lu%n",&sec,&usec,&chars);
+  sscanf(vb2.buf," +%lu.%ld%n",&sec,&usec,&chars);
   if (chars==-1) Psyntax("update time invalid");
   currenttime.tv_sec+= sec;
-  currenttime.tv_usec+= usec;
-  if (currenttime.tv_usec > 1000000) {
+  usec = (long)currenttime.tv_usec + usec;
+  while (usec < 0) {
+    currenttime.tv_sec--;
+    usec += 1000000;
+  }
+  while (usec > 1000000) {
     currenttime.tv_sec++;
-    currenttime.tv_usec -= 1000000;
+    usec -= 1000000;
   }
+  currenttime.tv_usec = usec;
   if (vb2.buf[chars] != hm_squote\nhm_squote) Psyntax("not newline after update time");
 }
 
-- 
2.30.2


From 305b2d3817d5499ad1693b56e901ac69f5109b33 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 20:19:43 +0100
Subject: [PATCH 08/16] regress: Add missing dependency on hsyscalls.h

Fixes GNU #51329

Reported-by: Sergei Trofimovich
---
 regress/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 993c1af..b654f90 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -123,10 +123,10 @@ adnshost_fuzz:	$(ADH_OBJS) hplayback.o hfuzz.o $(HARNLOBJS)
 adnshost_fuzzraw: $(ADH_OBJS) hfuzzraw.o hfuzz.o $(HARNLOBJS)
 		$(LINK_CMD)
 
-%_d.o:		$(srcdir)/../src/%.c hredirect.h
+%_d.o:		$(srcdir)/../src/%.c hredirect.h hsyscalls.h
 		$(CC) $(CFLAGS) $(HCPPFLAGS) -c -g -o $@ $<
 
-%_c.o:		$(srcdir)/../client/%.c hredirect.h
+%_c.o:		$(srcdir)/../client/%.c hredirect.h hsyscalls.h
 		$(CC) $(CFLAGS) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
 
 $(ALL_OBJS):	$(srcdir)/../src/adns.h $(srcdir)/../src/internal.h
-- 
2.30.2


From 953972e5a6196d65e08b4ecd845953b6687732a3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 20:22:25 +0100
Subject: [PATCH 09/16] README.html: Fix all URLs to use https

---
 README.html | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.html b/README.html
index d2048f1..94c6dee 100644
--- a/README.html
+++ b/README.html
@@ -11,7 +11,7 @@ library and utilities.</strong>
 <!--      Note: this file must contain portable HTML !            -->
 <!--                                                              -->
 <!--  It is served on the GNU site and also from my own system,   -->
-<!--  under the URL http://www.chiark.greenend.org.uk/adns/       -->
+<!--  under the URL https://www.chiark.greenend.org.uk/adns/       -->
 <!--  Please ensure that all links continine to be correct        -->
 <!--  both for www.gnu.org and chiark.                            -->
 <!--                                                              -->
@@ -87,7 +87,7 @@ which can be used easily in from the command line and from shell
 scripts to do simple lookups.  In a more advanced mode it can be used
 as a general-purpose DNS helper program for scripting languages which
 can invoke and communicate with subprocesses.  See the
-<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">adnshost
+<A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">adnshost
 usage message</A> for a summary of its capabilities.
 
 </ul>
@@ -96,7 +96,7 @@ usage message</A> for a summary of its capabilities.
 
 I'm afraid there is no manual yet.  However, competent C programmers
 should be able to use the library based on the
-<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">commented
+<A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">commented
 adns.h header file</A>, and the usage messages for the programs should
 be sufficient.
 
@@ -108,7 +108,7 @@ your project, and what you think of it.
 <p>
 
 Bug reports should be reported to the
-<a href="http://debbugs.gnu.org/">GNU Debbugs</a>.  Send an email
+<a href="https://debbugs.gnu.org/">GNU Debbugs</a>.  Send an email
 to <code>submit@debbugs.gnu.org</code> and at the top of your email,
 in a paragraph of its own, write the single line
 <pre>
@@ -131,7 +131,7 @@ will contain only announcements of important bugs, new versions, etc.
 <p>
 
 There are
-<A href="http://www.chiark.greenend.org.uk/mailman/listinfo">archives
+<A href="https://www.chiark.greenend.org.uk/mailman/listinfo">archives
 and subscription web pages</A>, or you can subscribe by sending mail
 containing the word `subscribe' to
 <code>adns-announce-REQUEST@chiark.greenend.org.uk</code> or
@@ -140,26 +140,26 @@ containing the word `subscribe' to
 <h2>Documentation</h2>
 
 <ul>
-<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">adns.h
+<li><A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt">adns.h
     API header file with documentation comments</A>
-<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">usage
+<li><A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt">usage
     message for adnshost</A>
 </ul>
 
 <h2>Download and source code</h2>
 
 <ul>
-<li>The <A href="http://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz">current
+<li>The <A href="https://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz">current
     release</A> as a gzipped tarfile.
-<li><A href="http://www.chiark.greenend.org.uk/~ian/adns/ftp/">Previous
+<li><A href="https://www.chiark.greenend.org.uk/~ian/adns/ftp/">Previous
     versions</A> and other files (including OpenPGP signatures).
-<li><A href="http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/">master
+<li><A href="https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/">master
     git (version control) repository browser</a>.
 </ul>
 
 adns is also available from the
-<A href="http://www.gnu.org/">GNU Project</A> FTP servers and their
-<A href="http://www.gnu.org/order/ftp.html">mirrors</A>.
+<A href="https://www.gnu.org/">GNU Project</A> FTP servers and their
+<A href="https://www.gnu.org/order/ftp.html">mirrors</A>.
 
 <h2>Installation note</h2>
 
@@ -175,13 +175,13 @@ replies to adns's queries.
 <h2>References and related projects</h2>
 
 <ul>
-<li><a href="http://code.google.com/p/adns-python">Python bindings</a>
+<li><a href="https://code.google.com/p/adns-python">Python bindings</a>
    by Andy Dustman.
-<!-- <li><a href="http://cryp.to/hsdns/">Haskell bindings</a>
+<!-- <li><a href="https://cryp.to/hsdns/">Haskell bindings</a>
    by Peter Simons. -->
-<li><a href="http://www.lysator.liu.se/liboop/">liboop event loop library</a>
+<li><a href="https://www.lysator.liu.se/liboop/">liboop event loop library</a>
    has a built-in binding for adns.
-<li><a href="http://adns.jgaa.com/">port to MS Visual Studio 6 C++</a>
+<li><a href="https://adns.jgaa.com/">port to MS Visual Studio 6 C++</a>
    by Jarle Aase.
 </ul>
 
@@ -204,14 +204,14 @@ This program and documentation is distributed in the hope that it will
 be useful, but <em>without any warranty</em>; without even the implied
 warranty of <em>merchantability</em> or <em>fitness for a particular
 purpose</em>.  See the
-<A href="http://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt">GNU
+<A href="https://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt">GNU
 General Public License</A> for more details.
 
 <p>
 
 You should have received a copy of the GNU General Public License
 along with <kbd>adns</kbd>, or one should be available above; if not,
-write to the <A href="http://www.fsf.org/">Free Software Foundation</A>
+write to the <A href="https://www.fsf.org/">Free Software Foundation</A>
 or email <code>ijackson@chiark.greenend.org.uk</code>.
 
 <p>
@@ -220,13 +220,13 @@ or email <code>ijackson@chiark.greenend.org.uk</code>.
 Ian Jackson / <tt>ijackson@chiark.greenend.org.uk</tt>.
 <p>
 
-<A href="http://www.gnu.org/">GNU home page</A>;
-<A href="http://www.chiark.greenend.org.uk/">chiark home page</A>;
+<A href="https://www.gnu.org/">GNU home page</A>;
+<A href="https://www.chiark.greenend.org.uk/">chiark home page</A>;
 <A href="/">site or mirror home page</A>
 <p>
 
 This web page is Copyright (C)1996-2005,2014-2016 Ian Jackson.  See the
-<A href="http://www.chiark.greenend.org.uk/~ian/sw-www-copy.html">Copyright/acknowledgements</A>.
+<A href="https://www.chiark.greenend.org.uk/~ian/sw-www-copy.html">Copyright/acknowledgements</A>.
 
 </body>
 </html>
-- 
2.30.2


From e624130b034d37509993684ba0d99e577cf028ed Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 22:09:11 +0100
Subject: [PATCH 10/16] README (from README.html): Fix all URLs to use https

---
 README | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/README b/README
index 26450aa..5b8bead 100644
--- a/README
+++ b/README
@@ -148,23 +148,23 @@ Copyright and licensing
 
 References
 
-   1. http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
-   2. http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
-   3. http://debbugs.gnu.org/
-   4. http://www.chiark.greenend.org.uk/mailman/listinfo
-   5. http://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
-   6. http://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
-   7. http://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz
-   8. http://www.chiark.greenend.org.uk/~ian/adns/ftp/
-   9. http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/
-  10. http://www.gnu.org/
-  11. http://www.gnu.org/order/ftp.html
-  12. http://code.google.com/p/adns-python
-  13. http://www.lysator.liu.se/liboop/
-  14. http://adns.jgaa.com/
-  15. http://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt
-  16. http://www.fsf.org/
-  17. http://www.gnu.org/
-  18. http://www.chiark.greenend.org.uk/
+   1. https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
+   2. https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
+   3. https://debbugs.gnu.org/
+   4. https://www.chiark.greenend.org.uk/mailman/listinfo
+   5. https://www.chiark.greenend.org.uk/~ian/adns/docs/adns.h.txt
+   6. https://www.chiark.greenend.org.uk/~ian/adns/docs/adnshost.txt
+   7. https://www.chiark.greenend.org.uk/~ian/adns/adns.tar.gz
+   8. https://www.chiark.greenend.org.uk/~ian/adns/ftp/
+   9. https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/adns.git/
+  10. https://www.gnu.org/
+  11. https://www.gnu.org/order/ftp.html
+  12. https://code.google.com/p/adns-python
+  13. https://www.lysator.liu.se/liboop/
+  14. https://adns.jgaa.com/
+  15. https://www.chiark.greenend.org.uk/~ian/adns/docs/COPYING.txt
+  16. https://www.fsf.org/
+  17. https://www.gnu.org/
+  18. https://www.chiark.greenend.org.uk/
   19. file:///
-  20. http://www.chiark.greenend.org.uk/~ian/sw-www-copy.html
+  20. https://www.chiark.greenend.org.uk/~ian/sw-www-copy.html
-- 
2.30.2


From ae0b4562aee0b1fd01c70a1ccf17e7093f69a3c0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 20:31:14 +0100
Subject: [PATCH 11/16] Ignore resolv.conf option `trust-ad`

I went through the resolv.conf(5) manpage and nothing else needs to be
ignored.  But, also, `trust-ad` wasn't listed?

Fixes Debian #1028112
---
 src/setup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/setup.c b/src/setup.c
index 3646968..772c727 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -348,6 +348,8 @@ static void ccf_options(adns_state ads, const char *fn,
 	/* adns normally does IPv6 if the application wants it; control
 	 * this with the adns_af: option if you like */
 	WORD_IS("inet6") ||
+	/* adns trusts the resolver anyway */
+	WORD_IS("trust-ad") ||
 	/* adns does not do edns0 and this is not a problem */
 	WORD_IS("edns0"))
       continue;
-- 
2.30.2


From e1849e2848fa6a35990f9b7759997da81b93dc25 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sun, 5 May 2024 21:49:37 +0100
Subject: [PATCH 12/16] build system: Support DESTDIR

---
 Makefile.in         | 8 ++++----
 client/Makefile.in  | 4 ++--
 common.make.in      | 2 +-
 dynamic/Makefile.in | 6 +++---
 src/Makefile.in     | 6 ++++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 976a159..7fbac7e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,10 +75,10 @@ adnshost.txt: all
 
 web-install: adnshost.txt
 	test -e $(WEBDIR) || mkdir $(WEBDIR)
-	$(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/
-	$(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
-	$(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
-	$(INSTALL_DATA) adnshost.txt $(WEBDIR)/
+	$(INSTALL_DATA) $(srcdir)/README.html $(DESTDIR)$(WEBDIR)/
+	$(INSTALL_DATA) $(srcdir)/src/adns.h $(DESTDIR)$(WEBDIR)/adns.h.txt
+	$(INSTALL_DATA) COPYING $(DESTDIR)$(WEBDIR)/COPYING.txt
+	$(INSTALL_DATA) adnshost.txt $(DESTDIR)$(WEBDIR)/
 
 check:			all
 	$(MAKE) -C regress check
diff --git a/client/Makefile.in b/client/Makefile.in
index 6264482..144eafd 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -58,9 +58,9 @@ ALL_OBJS=	$(ADH_OBJS) $(TARG_OBJS)
 all:		$(TARGETS)
 
 install:	$(TARG_INSTALL)
-		mkdir -p $(bindir)
+		$(INSTALL_DIR) $(DESTDIR)$(bindir)
 		set -xe; for f in $(TARG_INSTALL); \
-			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
+			do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; done
 
 uninstall:
 		for f in $(TARGETS); do rm -f $(bindir)/$$f; done
diff --git a/common.make.in b/common.make.in
index d5188d9..e50eb85 100644
--- a/common.make.in
+++ b/common.make.in
@@ -71,4 +71,4 @@ endif
 
 INSTALL_PROGRAM=	$(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=		$(INSTALL) -m 644
-
+INSTALL_DIR=		$(INSTALL) -d 755
diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 0083e1d..52662a7 100644
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -31,9 +31,9 @@ ALLOBJS=	$(addsuffix _p.o, $(basename $(LIBOBJS)))
 
 install:
 		mkdir -p $(libdir)
-		$(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
-		ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
-		ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
+		$(INSTALL_PROGRAM) $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBFILE)
+		ln -sf $(SHLIBFILE) $(DESTDIR)$(libdir)/$(SHLIBSONAME)
+		ln -sf $(SHLIBSONAME) $(DESTDIR)$(libdir)/$(SHLIBFORLINK)
 
 uninstall:
 		rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
diff --git a/src/Makefile.in b/src/Makefile.in
index a84807e..44ac07b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,8 +32,10 @@ DIRCFLAGS=	-I. -I$(srcdir)
 install:
 		mkdir -p $(libdir) $(includedir)
 		set -xe; for f in $(TARGETS); \
-			do $(INSTALL_DATA) $$f $(libdir)/$$f; done
-		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
+			do $(INSTALL_DIR) $(DESTDIR)$(libdir); \
+                           $(INSTALL_DATA) $$f $(DESTDIR)$(libdir)/$$f; done
+		$(INSTALL_DIR)  $(DESTDIR)$(includedir)
+		$(INSTALL_DATA) $(srcdir)/../src/adns.h $(DESTDIR)$(includedir)/adns.h
 
 uninstall:
 		for f in $(TARGETS); do rm -f $(libdir)/$$f; done
-- 
2.30.2


From c966bc66f2a8ffc93fdc2fe1e87ea3d25a044d8b Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 22:25:15 +0100
Subject: [PATCH 13/16] Shorten all per-file copyright notices

We don't want to be updating all these for contributors, copyright
years, etc!
---
 Makefile.in            |  8 ++------
 README                 |  5 ++---
 README.html            |  6 +++---
 acconfig.h             |  8 ++------
 aclocal.m4             |  8 ++------
 client/Makefile.in     |  8 ++------
 client/addrtext.c      |  8 ++------
 client/adh-main.c      |  8 ++------
 client/adh-opts.c      |  8 ++------
 client/adh-query.c     |  8 ++------
 client/adnsheloex.c    | 11 ++---------
 client/adnshost.h      |  8 ++------
 client/adnslogres.c    | 12 ++----------
 client/adnsresfilter.c |  8 ++------
 client/adnstest.c      |  8 ++------
 client/client.h        | 13 +++----------
 client/fanftest.c      | 12 ++----------
 common.make.in         |  8 ++------
 configure.in           |  8 ++------
 dynamic/Makefile.in    |  8 ++------
 regress/Makefile.in    |  8 ++------
 regress/addcases       |  8 ++------
 regress/checkall       |  8 ++------
 regress/harness.h.m4   |  8 ++------
 regress/hcommon.c.m4   |  8 ++------
 regress/hmacros.i4     |  8 ++------
 regress/hplayback.c.m4 |  8 ++------
 regress/hrecord.c.m4   |  8 ++------
 regress/hredirect.h.m4 |  8 ++------
 regress/hsyscalls.h.m4 |  8 ++------
 regress/hsyscalls.i4   |  8 ++------
 regress/m1test         |  8 ++------
 regress/r1test         |  8 ++------
 settings.make.in       |  8 ++------
 src/Makefile.in        |  8 ++------
 src/addrfam.c          |  8 ++------
 src/adns.make          |  8 ++------
 src/check.c            |  8 ++------
 src/config.h.in        |  8 ++------
 src/dlist.h            |  8 ++------
 src/event.c            |  8 ++------
 src/general.c          |  8 ++------
 src/internal.h         |  8 ++------
 src/parse.c            |  8 ++------
 src/poll.c             |  8 ++------
 src/query.c            |  8 ++------
 src/reply.c            |  8 ++------
 src/setup.c            |  8 ++------
 src/transmit.c         |  8 ++------
 src/tvarith.h          |  8 ++------
 src/types.c            |  8 ++------
 51 files changed, 104 insertions(+), 315 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7fbac7e..49cde3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,7 @@
 # Makefile[.in] - top-level Makefile
 #  
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/README b/README
index 5b8bead..da6108a 100644
--- a/README
+++ b/README
@@ -120,9 +120,8 @@ References and related projects
 
 Copyright and licensing
 
-   adns is Copyright 1997-2000,2003,2006,2014-2016,2020 Ian Jackson,
-   Copyright 2014 Mark Wooding, Copyright 1999-2000,2003,2006 Tony Finch,
-   and Copyright 1991 Massachusetts Institute of Technology.
+   adns is Copyright Ian Jackson and contributors. (See the file INSTALL
+   for a full list.)
 
    adns is free software; you can redistribute it and/or modify it under
    the terms of the GNU General Public License as published by the Free
diff --git a/README.html b/README.html
index 94c6dee..f0d4560 100644
--- a/README.html
+++ b/README.html
@@ -187,9 +187,9 @@ replies to adns's queries.
 
 <h2>Copyright and licensing</h2>
 
-<kbd>adns</kbd> is Copyright 1997-2000,2003,2006,2014-2016,2020 Ian
-Jackson, Copyright 2014 Mark Wooding, Copyright 1999-2000,2003,2006
-Tony Finch, and Copyright 1991 Massachusetts Institute of Technology.
+<kbd>adns</kbd> is
+Copyright Ian Jackson and contributors.
+(See the file INSTALL for a full list.)
 
 <p>
 
diff --git a/acconfig.h b/acconfig.h
index bf65d57..c5ea93e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,12 +3,8 @@
  * input file for autoheader/autoconf/configure: extra stuff for config.h
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/aclocal.m4 b/aclocal.m4
index c23a005..cb8d92f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,7 @@
 # aclocal.m4 - package-specific macros for autoconf
 #  
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/client/Makefile.in b/client/Makefile.in
index 144eafd..36c8b74 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,11 +1,7 @@
 # client/Makefile - client program(s) Makefile
 # 
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/client/addrtext.c b/client/addrtext.c
index 6f893b1..e02bb5a 100644
--- a/client/addrtext.c
+++ b/client/addrtext.c
@@ -21,12 +21,8 @@
  * - test program for address<->string conversion, not part of the library
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adh-main.c b/client/adh-main.c
index 0d1d57e..a2dc5fe 100644
--- a/client/adh-main.c
+++ b/client/adh-main.c
@@ -4,12 +4,8 @@
  *   main program and useful subroutines
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adh-opts.c b/client/adh-opts.c
index 590fce4..deea7d4 100644
--- a/client/adh-opts.c
+++ b/client/adh-opts.c
@@ -4,12 +4,8 @@
  *   option handling tables etc.
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adh-query.c b/client/adh-query.c
index f24c573..479fe3c 100644
--- a/client/adh-query.c
+++ b/client/adh-query.c
@@ -4,12 +4,8 @@
  *   make queries and print answers
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adnsheloex.c b/client/adnsheloex.c
index 93e3b91..3ac1cba 100644
--- a/client/adnsheloex.c
+++ b/client/adnsheloex.c
@@ -3,15 +3,8 @@
  * - look up the A record of hosts in an Exim log that failed HELO verification
  */
 /*
- *  This file is
- *   Copyright (C) 2004 Tony Finch <dot@dotat.at>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adnshost.h b/client/adnshost.h
index fd2d80d..35d7811 100644
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -3,12 +3,8 @@
  * - useful general-purpose resolver client program, header file
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adnslogres.c b/client/adnslogres.c
index 750a198..3ce05ff 100644
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -3,16 +3,8 @@
  * - a replacement for the Apache logresolve program using adns
  */
 /*
- *  This file is
- *   Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
- *   Copyright (C) 1999-2000,2020 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adnsresfilter.c b/client/adnsresfilter.c
index 2303f6f..038b3ad 100644
--- a/client/adnsresfilter.c
+++ b/client/adnsresfilter.c
@@ -3,12 +3,8 @@
  * - filter which does resolving, not part of the library
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/adnstest.c b/client/adnstest.c
index 2198ebc..0984399 100644
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -3,12 +3,8 @@
  * - simple test program, not part of the library
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/client/client.h b/client/client.h
index 908d54a..2b5e308 100644
--- a/client/client.h
+++ b/client/client.h
@@ -3,12 +3,8 @@
  * - useful declarations and definitions for adns client programs
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,10 +26,7 @@
 #define ADNS_VERSION_STRING "1.6.0"
 
 #define COPYRIGHT_MESSAGE \
- "Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson\n" \
- "Copyright (C) 2014  Mark Wooding\n" \
- "Copyright (C) 1999-2000,2003,2006  Tony Finch\n" \
- "Copyright (C) 1991 Massachusetts Institute of Technology\n" \
+ "Copyright Ian Jackson and contributors\n" \
  "This is free software; see the source for copying conditions.  There is NO\n" \
  "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
diff --git a/client/fanftest.c b/client/fanftest.c
index 2d9e6fb..d1cb2c7 100644
--- a/client/fanftest.c
+++ b/client/fanftest.c
@@ -3,16 +3,8 @@
  * - a small test program from Tony Finch
  */
 /*
- *  This file is
- *   Copyright (C) 1999 Tony Finch <dot@dotat.at>
- *   Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/common.make.in b/common.make.in
index e50eb85..5a5ba4d 100644
--- a/common.make.in
+++ b/common.make.in
@@ -1,12 +1,8 @@
 #  common.make[.in] - common configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/configure.in b/configure.in
index 2894cf9..b753a5b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,7 @@
 # configure.in - input to autoconf
 #  
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 52662a7..d9151bd 100644
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -1,11 +1,7 @@
 # dynamic/Makefile - dynamic library Makefile
 # 
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/regress/Makefile.in b/regress/Makefile.in
index b654f90..eb63a20 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,11 +1,7 @@
 # regress/Makefile[.in] - regression test Makefile
 # 
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/regress/addcases b/regress/addcases
index e4fc73d..ad41a48 100755
--- a/regress/addcases
+++ b/regress/addcases
@@ -1,12 +1,8 @@
 #!/bin/sh
 # usage: ./addcases <casename> ...
 #
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/regress/checkall b/regress/checkall
index 169e317..a6cb229 100755
--- a/regress/checkall
+++ b/regress/checkall
@@ -2,12 +2,8 @@
 # usage: checkall
 # runs all test cases
 #
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/regress/harness.h.m4 b/regress/harness.h.m4
index aa56184..1f24f22 100644
--- a/regress/harness.h.m4
+++ b/regress/harness.h.m4
@@ -2,12 +2,8 @@ m4_dnl harness.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - function and other declarations
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index 74811a7..3fd2a10 100644
--- a/regress/hcommon.c.m4
+++ b/regress/hcommon.c.m4
@@ -2,12 +2,8 @@ m4_dnl hcommon.c
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - routines used for both record and playback
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hmacros.i4 b/regress/hmacros.i4
index 3119f27..8aaf7a6 100644
--- a/regress/hmacros.i4
+++ b/regress/hmacros.i4
@@ -2,12 +2,8 @@ m4_dnl hmacros.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - common macros
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 7d0660e..7e688bf 100644
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -2,12 +2,8 @@ m4_dnl hplayback.c.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - playback routines
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hrecord.c.m4 b/regress/hrecord.c.m4
index c8a133e..94e6617 100644
--- a/regress/hrecord.c.m4
+++ b/regress/hrecord.c.m4
@@ -2,12 +2,8 @@ m4_dnl hrecord.c.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - recording routines
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hredirect.h.m4 b/regress/hredirect.h.m4
index a40783c..f2d5618 100644
--- a/regress/hredirect.h.m4
+++ b/regress/hredirect.h.m4
@@ -2,12 +2,8 @@ m4_dnl hredirect.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - redefinitions of system calls
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hsyscalls.h.m4 b/regress/hsyscalls.h.m4
index 9e622ec..53c5ef6 100644
--- a/regress/hsyscalls.h.m4
+++ b/regress/hsyscalls.h.m4
@@ -2,12 +2,8 @@ m4_dnl hsyscalls.h.m4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - prototypes of redefinitions of system calls
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/hsyscalls.i4 b/regress/hsyscalls.i4
index dbc584f..852cc93 100644
--- a/regress/hsyscalls.i4
+++ b/regress/hsyscalls.i4
@@ -2,12 +2,8 @@ m4_dnl hsyscalls.i4
 m4_dnl (part of complex test harness, not of the library)
 m4_dnl - list of syscalls to override/log and their args
 
-m4_dnl  This file is part of adns, which is
-m4_dnl    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-m4_dnl    Copyright (C) 2014  Mark Wooding
-m4_dnl    Copyright (C) 1999-2000,2003,2006  Tony Finch
-m4_dnl    Copyright (C) 1991 Massachusetts Institute of Technology
-m4_dnl  (See the file INSTALL for full details.)
+m4_dnl  This file is part of adns, which is Copyright Ian Jackson
+m4_dnl  and contributors (see the file INSTALL for full details).
 m4_dnl  
 m4_dnl  This program is free software; you can redistribute it and/or modify
 m4_dnl  it under the terms of the GNU General Public License as published by
diff --git a/regress/m1test b/regress/m1test
index 5f928f1..37fab25 100755
--- a/regress/m1test
+++ b/regress/m1test
@@ -2,12 +2,8 @@
 # usage: m1test <name> <initfile> [<initflags>] <queryargs>'
 # test recording script
 #
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/regress/r1test b/regress/r1test
index 7d5a4d8..f61089a 100755
--- a/regress/r1test
+++ b/regress/r1test
@@ -2,12 +2,8 @@
 # usage: r1test <testcasename>
 # test execution script, for running one test
 #
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/settings.make.in b/settings.make.in
index 4f8379a..dfba4ea 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,12 +1,8 @@
 # settings.make[.in] - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/src/Makefile.in b/src/Makefile.in
index 44ac07b..5592579 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,11 +1,7 @@
 # src/Makefile[.in] - library main Makefile
 # 
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/src/addrfam.c b/src/addrfam.c
index f114d74..dece6e3 100644
--- a/src/addrfam.c
+++ b/src/addrfam.c
@@ -3,12 +3,8 @@
  * - address-family specific code
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/adns.make b/src/adns.make
index 210be5d..64a42f2 100644
--- a/src/adns.make
+++ b/src/adns.make
@@ -1,11 +1,7 @@
 # src/adns.make - library definitions, including list of object files
 # 
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/src/check.c b/src/check.c
index f5e1a9e..ead1249 100644
--- a/src/check.c
+++ b/src/check.c
@@ -3,12 +3,8 @@
  * - consistency checks
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/config.h.in b/src/config.h.in
index ddc3462..e48c7ea 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -4,12 +4,8 @@
  * input file for autoheader/autoconf/configure: extra stuff for config.h
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/dlist.h b/src/dlist.h
index 7ffa22e..0efb310 100644
--- a/src/dlist.h
+++ b/src/dlist.h
@@ -3,12 +3,8 @@
  * - macros for handling doubly linked lists
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/event.c b/src/event.c
index c326c28..14c9ee9 100644
--- a/src/event.c
+++ b/src/event.c
@@ -5,12 +5,8 @@
  * - user-visible check/wait and event-loop-related functions
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/general.c b/src/general.c
index cfe07bd..183c487 100644
--- a/src/general.c
+++ b/src/general.c
@@ -4,12 +4,8 @@
  * - vbuf handling
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/internal.h b/src/internal.h
index c03a77b..083f429 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -5,12 +5,8 @@
  * - comments regarding library data structures
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/parse.c b/src/parse.c
index 2eb68e4..3652b32 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -3,12 +3,8 @@
  * - parsing assistance functions (mainly for domains inside datagrams)
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/poll.c b/src/poll.c
index 6484b34..54d7a2f 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -3,12 +3,8 @@
  * - wrappers for poll(2)
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/query.c b/src/query.c
index 82adbdd..7d537d5 100644
--- a/src/query.c
+++ b/src/query.c
@@ -5,12 +5,8 @@
  * - query submission and cancellation (user-visible and internal)
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/reply.c b/src/reply.c
index caf5c05..e538674 100644
--- a/src/reply.c
+++ b/src/reply.c
@@ -3,12 +3,8 @@
  * - main handling and parsing routine for received datagrams
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/setup.c b/src/setup.c
index 772c727..a10cbf8 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -4,12 +4,8 @@
  * - management of global state
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/transmit.c b/src/transmit.c
index bf2f8c6..f18f8d8 100644
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,12 +4,8 @@
  * - send queries
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/tvarith.h b/src/tvarith.h
index 8dd7896..eb9be9b 100644
--- a/src/tvarith.h
+++ b/src/tvarith.h
@@ -3,12 +3,8 @@
  * - static inline functions for doing arithmetic on timevals
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/types.c b/src/types.c
index 428dbfa..d79f4a0 100644
--- a/src/types.c
+++ b/src/types.c
@@ -3,12 +3,8 @@
  * - RR-type-specific code, and the machinery to call it
  */
 /*
- *  This file is part of adns, which is
- *    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
- *    Copyright (C) 2014  Mark Wooding
- *    Copyright (C) 1999-2000,2003,2006  Tony Finch
- *    Copyright (C) 1991 Massachusetts Institute of Technology
- *  (See the file INSTALL for full details.)
+ *  This file is part of adns, which is Copyright Ian Jackson
+ *  and contributors (see the file INSTALL for full details).
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
-- 
2.30.2


From 8d8702d78f70313f7fd4809253078872ef5a8b0a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 22:32:39 +0100
Subject: [PATCH 14/16] INSTALL: Add missing credit and copyright year

---
 INSTALL | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index c360d89..1b99d03 100644
--- a/INSTALL
+++ b/INSTALL
@@ -101,7 +101,8 @@ This file, INSTALL, contains installation instructions and other
 details for adns.
 
 adns is
- Copyright (C) 1997-2000,2003,2006,2014-2016,2020 Ian Jackson
+ Copyright (C) 1997-2000,2003,2006,2014-2016,2020,2024 Ian Jackson
+ Copyright (C) 2024 Sergey Poznyakoff
  Copyright (C) 2014 Mark Wooding
  Copyright (C) 1999-2000,2003,2006 Tony Finch <dot@dotat.at>         [1]
  Copyright (C) 1991 Massachusetts Institute of Technology            [2]
-- 
2.30.2


From a412d8930791ce8e73f184f3f537d7f6b97b7283 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 22:39:12 +0100
Subject: [PATCH 15/16] Set version to 1.6.1 and document changes

---
 Makefile.in     |  2 +-
 changelog       | 19 +++++++++++++++++++
 client/client.h |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 49cde3e..bc1a0b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ include		./common.make
 
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
 # possibly library soname (MAJOR and MINOR in common.make.in).
-DISTVERSION=	1.6.0
+DISTVERSION=	1.6.1
 
 srcdir=		@srcdir@
 VPATH=		@srcdir@
diff --git a/changelog b/changelog
index aa09bd0..d4c72b7 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,22 @@
+adns (1.6.1) UPSTREAM; urgency=low
+
+  Minor bugfix:
+  * Suppress warning about `trust-ad` in resolv.conf.  Debian #1028112.
+
+  Build system:
+  * Honour DESTDIR, avoiding need for prefix= workaround.
+    [Contribution from Sergey Poznyakoff]
+  * regression tests: Add missing dependency on hsyscalls.i.
+    GNU #51329.  [Report from Sergei Trofimovich]
+  * regression tests: build with 64-bit time_t on 32-bit systems.
+    Debian #1065725, Ubuntu Launchpad #2057735.
+    [Report from Sebastian Ramacher]
+
+  Documentation:
+  * Fix all http: URLs in docs to be https: instead.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 05 May 2024 22:39:28 +0100
+
 adns (1.6.0) UPSTREAM; urgency=medium
 
   Bugfixes:
diff --git a/client/client.h b/client/client.h
index 2b5e308..76d0219 100644
--- a/client/client.h
+++ b/client/client.h
@@ -23,7 +23,7 @@
 #ifndef CLIENT_H_INCLUDED
 #define CLIENT_H_INCLUDED
 
-#define ADNS_VERSION_STRING "1.6.0"
+#define ADNS_VERSION_STRING "1.6.1"
 
 #define COPYRIGHT_MESSAGE \
  "Copyright Ian Jackson and contributors\n" \
-- 
2.30.2


From 961a6b281cd7871701519adc001959b7995730b0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 May 2024 22:47:54 +0100
Subject: [PATCH 16/16] Fix typo in changelog entry for 1.6.1

---
 changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog b/changelog
index d4c72b7..b48004e 100644
--- a/changelog
+++ b/changelog
@@ -6,7 +6,7 @@ adns (1.6.1) UPSTREAM; urgency=low
   Build system:
   * Honour DESTDIR, avoiding need for prefix= workaround.
     [Contribution from Sergey Poznyakoff]
-  * regression tests: Add missing dependency on hsyscalls.i.
+  * regression tests: Add missing dependency on hsyscalls.h.
     GNU #51329.  [Report from Sergei Trofimovich]
   * regression tests: build with 64-bit time_t on 32-bit systems.
     Debian #1065725, Ubuntu Launchpad #2057735.
-- 
2.30.2