diff --git a/CHANGES b/CHANGES index 2377abcc1c..991ad92bee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + --- 9.7.2rc1 released --- + 2943. [func] Add support to load new keys into managed zones without signing immediately with "rndc loadkeys". Add support to link keys with "dnssec-keygen -S" diff --git a/lib/bind9/api b/lib/bind9/api index b0b7496ce1..d345908b3c 100644 --- a/lib/bind9/api +++ b/lib/bind9/api @@ -1,3 +1,3 @@ LIBINTERFACE = 60 -LIBREVISION = 3 +LIBREVISION = 4 LIBAGE = 0 diff --git a/lib/dns/api b/lib/dns/api index b88cdba116..d8aa0d4fd4 100644 --- a/lib/dns/api +++ b/lib/dns/api @@ -1,3 +1,3 @@ -LIBINTERFACE = 67 +LIBINTERFACE = 68 LIBREVISION = 0 LIBAGE = 0 diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def index 87ead548b7..65ffeff817 100644 --- a/lib/dns/win32/libdns.def +++ b/lib/dns/win32/libdns.def @@ -738,6 +738,7 @@ dns_zone_flush dns_zone_forcereload dns_zone_forwardupdate dns_zone_fulldumptostream +dns_zone_getadded dns_zone_getchecknames dns_zone_getclass dns_zone_getdb @@ -795,6 +796,7 @@ dns_zone_refresh dns_zone_rekey dns_zone_replacedb dns_zone_setacache +dns_zone_setadded dns_zone_setalsonotify dns_zone_setaltxfrsource4 dns_zone_setaltxfrsource6 diff --git a/lib/isc/api b/lib/isc/api index 692a5f9cc8..ddd8d2fd28 100644 --- a/lib/isc/api +++ b/lib/isc/api @@ -1,3 +1,3 @@ -LIBINTERFACE = 61 -LIBREVISION = 6 -LIBAGE = 1 +LIBINTERFACE = 62 +LIBREVISION = 0 +LIBAGE = 0 diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def index 509eef5e81..1316ffe104 100644 --- a/lib/isc/win32/libisc.def +++ b/lib/isc/win32/libisc.def @@ -58,6 +58,7 @@ isc__mem_getname isc__mem_getquota isc__mem_gettag isc__mem_inuse +isc__mem_isovermem isc__mem_ondestroy isc__mem_references isc__mem_setdestroycheck diff --git a/lib/isccfg/api b/lib/isccfg/api index 5146f4d5d9..ddd8d2fd28 100644 --- a/lib/isccfg/api +++ b/lib/isccfg/api @@ -1,3 +1,3 @@ -LIBINTERFACE = 61 +LIBINTERFACE = 62 LIBREVISION = 0 -LIBAGE = 1 +LIBAGE = 0 diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def index 3afe090c48..0e7260e0ee 100644 --- a/lib/isccfg/win32/libisccfg.def +++ b/lib/isccfg/win32/libisccfg.def @@ -4,7 +4,8 @@ LIBRARY libisccfg EXPORTS cfg_acl_fromconfig -cfg_aclconfctx_destroy +cfg_aclconfctx_clear +cfg_aclconfctx_clone cfg_aclconfctx_init cfg_list_first cfg_list_next @@ -36,6 +37,7 @@ cfg_obj_line cfg_obj_log cfg_parse_buffer cfg_parse_file +cfg_parser_attach cfg_parser_create cfg_parser_destroy cfg_parser_setcallback diff --git a/lib/lwres/api b/lib/lwres/api index 3252b3bfa0..25708f02bf 100644 --- a/lib/lwres/api +++ b/lib/lwres/api @@ -1,3 +1,3 @@ LIBINTERFACE = 60 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 diff --git a/version b/version index c49240d3b8..b68186b9cd 100644 --- a/version +++ b/version @@ -1,4 +1,4 @@ -# $Id: version,v 1.51.2.6 2010/07/12 17:00:00 each Exp $ +# $Id: version,v 1.51.2.7 2010/08/17 00:51:32 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=7 PATCHVER=2 -RELEASETYPE=b +RELEASETYPE=rc RELEASEVER=1 diff --git a/win32utils/updatelibxml2.pl b/win32utils/updatelibxml2.pl index bb8ba0f79d..dd6daeb9c7 100644 --- a/win32utils/updatelibxml2.pl +++ b/win32utils/updatelibxml2.pl @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: updatelibxml2.pl,v 1.3 2009/07/19 04:50:15 each Exp $ +# $Id: updatelibxml2.pl,v 1.3.126.1 2010/08/17 00:51:33 marka Exp $ # updatelibxml2.pl # This script locates the latest version of libxml2 in the grandparent @@ -65,6 +65,8 @@ $path = "..\\..\\"; "../bin/nsupdate/win32/nsupdate.mak", "../bin/rndc/win32/rndc.dsp", "../bin/rndc/win32/rndc.mak", + "../bin/tools/win32/journalprint.dsp", + "../bin/tools/win32/journalprint.mak", "../lib/bind9/win32/libbind9.dsp", "../lib/bind9/win32/libbind9.mak", "../lib/dns/win32/libdns.dsp",