From: Willem Toorop Date: Fri, 3 Jan 2014 12:41:44 +0000 (+0100) Subject: Next release will be 1.6.17 X-Git-Tag: release-1.6.17rc1~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23a9dea47cc501f26fc9f65d8931532a49346077;p=thirdparty%2Fldns.git Next release will be 1.6.17 --- diff --git a/Changelog b/Changelog index 6383060b..f3749a89 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.7.0 +1.6.17 * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a zone to be an NSEC3 (or its RRSIG) covering an empty non terminal. * Add --disable-dane option to configure and check availability of the @@ -36,9 +36,6 @@ * ldns-verify-zone NSEC3 checking from quadratic to linear performance. Thanks NIC MX (nicmexico.mx) * ldns-dane setup new ssl session for each new connect to prevent hangs - * Bump version to 1.7.0 - * The version of shared library now has similar scheme as libunbound. - ldns 1.7.0 will have shared library version (SONAME) 2.0.0 * bugfix #521: drill trace continue on empty non-terminals with NSEC3 * bugfix #525: Fix documentation of ldns_resolver_set_retry * Remove unused LDNS_RDF_TYPE_TSIG and associated functions. diff --git a/Makefile.in b/Makefile.in index 73388c7a..7a1c2414 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,7 +2,7 @@ # See the file LICENSE for the license SHELL = @SHELL@ VERSION = @PACKAGE_VERSION@ -version_info = @LIBLDNS_CURRENT@:@LIBLDNS_REVISION@:@LIBLDNS_AGE@ +version_info = @VERSION_INFO@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/configure.ac b/configure.ac index d4a1df68..c98fecab 100644 --- a/configure.ac +++ b/configure.ac @@ -5,42 +5,15 @@ sinclude(acx_nlnetlabs.m4) # must be numbers. ac_defun because of later processing. m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[7]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MINOR],[6]) +m4_define([VERSION_MICRO],[17]) 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 AC_SUBST(LDNS_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(LDNS_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO]) - -LIBLDNS_CURRENT=2 -LIBLDNS_REVISION=0 -LIBLDNS_AGE=0 -# 1.6.16 had 1:6:16 -# 1.7.0 has 2:0:0 - -# Current -- the number of the binary API that we're implementing -# Revision -- which iteration of the implementation of the binary -# API are we supplying? -# Age -- How many previous binary API versions do we also -# support? -# -# If we release a new version that does not change the binary API, -# increment Revision. -# -# If we release a new version that changes the binary API, but does -# not break programs compiled against the old binary API, increment -# Current and Age. Set Revision to 0, since this is the first -# implementation of the new API. -# -# Otherwise, we're changing the binary API and breaking bakward -# compatibility with old binaries. Increment Current. Set Age to 0, -# since we're backward compatible with no previous APIs. Set Revision -# to 0 too. -AC_SUBST(LIBLDNS_CURRENT) -AC_SUBST(LIBLDNS_REVISION) -AC_SUBST(LIBLDNS_AGE) +AC_SUBST(VERSION_INFO, [VERSION_MAJOR:VERSION_MINOR:VERSION_MICRO]) AC_AIX LT_INIT diff --git a/contrib/DNS-LDNS b/contrib/DNS-LDNS index c9cd177f..f1705d6e 160000 --- a/contrib/DNS-LDNS +++ b/contrib/DNS-LDNS @@ -1 +1 @@ -Subproject commit c9cd177f878c680557c0f3583b75686f33961321 +Subproject commit f1705d6e7e6a653136e3d8fd2d8a1efc22d2f990 diff --git a/contrib/python/Changelog b/contrib/python/Changelog index 07e57ba9..3ed8df46 100644 --- a/contrib/python/Changelog +++ b/contrib/python/Changelog @@ -1,4 +1,4 @@ -1.7.0 +1.6.17 * Added ldns_rdf.data_as_bytearray(). The method returns a bytearray object containing rdf data. * Changed the behaviour of ldns_resolver.trusted_key() in order to prevent diff --git a/contrib/python/docs/source/conf.py b/contrib/python/docs/source/conf.py index 757c822e..468b827d 100644 --- a/contrib/python/docs/source/conf.py +++ b/contrib/python/docs/source/conf.py @@ -43,9 +43,9 @@ copyright = '2009-2013, Karel Slany, Zdenek Vasicek' # other places throughout the built documents. # # The short X.Y version. -version = '1.7' +version = '1.6' # The full version, including alpha/beta/rc tags. -release = '1.7.0' +release = '1.6.17' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/drill/configure.ac b/drill/configure.ac index a6673ac8..b7fe2aee 100644 --- 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.7.0, libdns@nlnetlabs.nl,libdns) +AC_INIT(ldns, 1.6.17, libdns@nlnetlabs.nl,libdns) AC_CONFIG_SRCDIR([drill.c]) sinclude(../acx_nlnetlabs.m4) diff --git a/examples/configure.ac b/examples/configure.ac index f692a4dc..e33983e7 100644 --- 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.7.0, libdns@nlnetlabs.nl,libdns) +AC_INIT(ldns, 1.6.17, libdns@nlnetlabs.nl,libdns) AC_CONFIG_SRCDIR([ldns-read-zone.c]) sinclude(../acx_nlnetlabs.m4) diff --git a/lua/configure.ac b/lua/configure.ac index c31ec46f..eb3bb8ea 100644 --- 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.7.0, libdns@nlnetlabs.nl, ldns-tests-1.0) +AC_INIT(ldns-tests, 1.6.17, 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 61c68f73..f9c7679b 100644 --- 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.7.0, libdns@nlnetlabs.nl,pcat) +AC_INIT(pcat, 1.6.17, libdns@nlnetlabs.nl,pcat) AC_CONFIG_SRCDIR([pcat.c]) OURCPPFLAGS=''