From: Willem Toorop Date: Wed, 21 Aug 2013 14:20:36 +0000 (+0200) Subject: Decouple SONAME from version X-Git-Tag: release-1.6.17rc1~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f95aacb7d6e7a07c9195ae3d31fd8196f6b8ada;p=thirdparty%2Fldns.git Decouple SONAME from version and bump version of ldns to 1.7.0 and the shared library to 2.0.0 using a similar scheme as with libunbound --- diff --git a/Changelog b/Changelog index ebc0374e..0c185b5e 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.6.17 +1.7.0 * 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 @@ -37,9 +37,12 @@ Thanks NIC MX (nicmexico.mx) * ldns-dane setup new ssl session for each new connect to prevent hangs * Parsing from and to wire and presentation format for draft rr types - should be explicitely enabled with the --enable-draft-rrtypes option + must be explicitely enabled with the --enable-draft-rrtypes option to conifigure. This applies to: NINFO, RKEY, CDS, EUI48, EUI64, URI and TA + * 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 1.6.16 2012-11-13 * Fix Makefile to build pyldns with BSD make diff --git a/Makefile.in b/Makefile.in index e5036f2a..36f9e670 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 = @LIBTOOL_VERSION_INFO@ +version_info = @LIBLDNS_CURRENT@:@LIBLDNS_REVISION@:@LIBLDNS_AGE@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/configure.ac b/configure.ac index ac6def36..c909306c 100644 --- a/configure.ac +++ b/configure.ac @@ -5,16 +5,43 @@ 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],[17]) +m4_define([VERSION_MINOR],[7]) +m4_define([VERSION_MICRO],[0]) 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(LIBTOOL_VERSION_INFO, VERSION_MAJOR:VERSION_MINOR:VERSION_MICRO) 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_AIX LT_INIT AC_CONFIG_MACRO_DIR([m4]) diff --git a/drill/configure.ac b/drill/configure.ac index b7fe2aee..a6673ac8 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.6.17, libdns@nlnetlabs.nl,libdns) +AC_INIT(ldns, 1.7.0, libdns@nlnetlabs.nl,libdns) AC_CONFIG_SRCDIR([drill.c]) sinclude(../acx_nlnetlabs.m4) diff --git a/examples/configure.ac b/examples/configure.ac index adc55692..0f46f34d 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.6.17, libdns@nlnetlabs.nl,libdns) +AC_INIT(ldns, 1.7.0, 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 eb3bb8ea..c31ec46f 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.6.17, libdns@nlnetlabs.nl, ldns-tests-1.0) +AC_INIT(ldns-tests, 1.7.0, 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 f9c7679b..61c68f73 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.6.17, libdns@nlnetlabs.nl,pcat) +AC_INIT(pcat, 1.7.0, libdns@nlnetlabs.nl,pcat) AC_CONFIG_SRCDIR([pcat.c]) OURCPPFLAGS=''