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

diff --git a/changelog b/changelog
index 8c9a3ac..1d94160 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,50 @@
+
+
+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
 
-  Bugfixes:
+  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