Trunk to 1.6.14

diff --git a/Changelog b/Changelog
index 93e53931d84927f4b597f393dbbbdd09f0964910..244bc76aecb6d04476d50a84ed292bd77bb1b591 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+1.6.14
+
 1.6.13 2012-05-21
        * New -S option for ldns-verify-zone to chase signatures online.
        * New -k option for ldns-verify-zone to validate using a trusted key.

diff --git a/configure.ac b/configure.ac
index 500e8e67415089b3911633b98d3a7ee68432dba2..eea81a2cdcff13acc84b1c9af6f1e441619aba56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4)
 # must be numbers. ac_defun because of later processing.
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[6])
-m4_define([VERSION_MICRO],[13])
+m4_define([VERSION_MICRO],[14])
 AC_INIT(ldns, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), libdns@nlnetlabs.nl, libdns)
 AC_CONFIG_SRCDIR([packet.c])
 # needed to build correct soname

diff --git a/drill/configure.ac b/drill/configure.ac
index afd5c63803b3462e3687619556cbbac1fe5f9835..716ef8df325dd6949d1b7fe55c456a7fe3eb81d1 100644 (file)
--- a/drill/configure.ac
+++ b/drill/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(ldns, 1.6.13, libdns@nlnetlabs.nl,libdns)
+AC_INIT(ldns, 1.6.14, libdns@nlnetlabs.nl,libdns)
 AC_CONFIG_SRCDIR([drill.c])
 sinclude(../acx_nlnetlabs.m4)
 

diff --git a/examples/configure.ac b/examples/configure.ac
index 67345dac7cd24098054327f546bb3a5f8a422c11..ed333b33d6f4338f21b91c16c511320fae472aca 100644 (file)
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(ldns, 1.6.13, libdns@nlnetlabs.nl,libdns)
+AC_INIT(ldns, 1.6.14, libdns@nlnetlabs.nl,libdns)
 AC_CONFIG_SRCDIR([ldns-read-zone.c])
 sinclude(../acx_nlnetlabs.m4)
 

diff --git a/examples/nsd-test/configure.ac b/examples/nsd-test/configure.ac
index 4622dee7cf14f446d9f627945b5eb005728f3278..f1d7fa1a5f6fe2a03ecdb17d134972fed705840c 100644 (file)
--- a/examples/nsd-test/configure.ac
+++ b/examples/nsd-test/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(ldns, 1.6.13, libdns@nlnetlabs.nl,libdns)
+AC_INIT(ldns, 1.6.14, libdns@nlnetlabs.nl,libdns)
 AC_CONFIG_SRCDIR([nsd-ldnsd.c])
 
 OURCPPFLAGS='-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D__BSD_VISIBLE'

diff --git a/lua/configure.ac b/lua/configure.ac
index 54b0fae46c6bd49ad26b5d245ad014a606718970..d76f31fe3514f72e1f477a90fc34300c4a23d843 100644 (file)
--- a/lua/configure.ac
+++ b/lua/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(ldns-tests, 1.6.13, libdns@nlnetlabs.nl, ldns-tests-1.0)
+AC_INIT(ldns-tests, 1.6.14, libdns@nlnetlabs.nl, ldns-tests-1.0)
 AC_CONFIG_SRCDIR([../ldns/config.h])
 
 AC_AIX

diff --git a/pcat/configure.ac b/pcat/configure.ac
index 79c953b5935ac0724f5a8d2b5c9c94150b22ca55..7ecf7ae69e83b0c6f08c033e43fd2913372852ea 100644 (file)
--- a/pcat/configure.ac
+++ b/pcat/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(pcat, 1.6.13, libdns@nlnetlabs.nl,pcat)
+AC_INIT(pcat, 1.6.14, libdns@nlnetlabs.nl,pcat)
 AC_CONFIG_SRCDIR([pcat.c])
 
 OURCPPFLAGS=''