X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=changelog;h=1d9416086e9483fbddfbf90d5ad858d660da0a08;hp=fb40fbc001374b3bee2ec61dabc24b77e151824a;hb=dd8fd887124e0f804663a70b6e5297d0c475f25a;hpb=ad7e141244b810b3a68c69d86cbc3f4afc39ade0

diff --git a/changelog b/changelog
index fb40fbc..1d94160 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,51 @@
+
+
+THIS BRANCH IS NOW CLOSED
+
+  EVERYTHING HAS BEEN MERGED TO THE TRUNK
+   (at CVS tag mergepoint-logcallbackfn)
+
+  DO NOT EDIT
+  
+
+  * New adns_init_logfn etc. for having logging done with a callback
+    function.
+
+ --
+
+adns (1.2); urgency=medium
+
+  * Fix error in prototype in definition of adns__parse_domain.
+  * New LICENCE.WAIVERS file for GPL-incompatility workarounds.
+  * Clarified GPL-vs-LGPL: a bit less hostile and a bit more mercenary.
+  * Allow `;'-comments in resolv.conf (report from Colin Charles).    
+
+ --
+
+adns (1.1); urgency=medium
+
+  Major bugfixes:
+  * Do not spin if connect() fails immediately (!)
+  * Stop searching on a CNAME (even if it's broken).
+  * When search list runs out, _qf_owner sets owner to query domain.
+  * Fix bogus multiple updates to p in transmit.c (!)
+
+  Portability improvements:
+  * Fix up spurious #undef's in hredirect.h.
+  * Don't use <sys/select.h> any more, it was a mistake made in pre-1.0
+    (and there doesn't seem to be much explanation why).
+  * Understand and sort of check OpenBSD `lookup' resolv.conf directive.
+  * #include <stdlib.h> in internal.h (for abort etc).
+  * Always #include <sys/types.h> before <sys/socket.h> (for FreeBSD 4.6).
+
+  Cosmetic and documentation improvements:
+  * Added wishlist entry re configurable port no.
+  * Problem with SERVFAIL in TODO.
+  * README.html: mentioned Jarle Aase's Windows port, and other fixes.
+  * Some better source code formatting/wrapping.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Tue,  1 Jul 2003 22:55:29 +0100
+
 adns (1.0); urgency=medium
 
   Bugfixes:
@@ -10,7 +58,7 @@ adns (1.0); urgency=medium
   * adnshost, adnslogres, adnsresfilter have options for config override. 
   * adnsresfilter has --debug option.
   * Improvements to adnslogres (incl. new -c option) from Tony Finch.
-  * adnslogres has --help option.
+  * adnslogres has --help option, all utilities support --version.
   * Documentation improved somewhat, including new GPL-vs-LGPL file.
 
   Changes for non-BETA release:
@@ -36,7 +84,7 @@ adns (1.0); urgency=medium
   * Use `printf' instead of `echo -n'.
   * Add list of tested platforms in INSTALL file.
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Sun, 17 Sep 2000 15:15:58 +0100
 
 adns (0.9) BETA; urgency=high