From 529734f9fc995bd37a1e97748912e7ec2fadcc02 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Thu, 24 Mar 2016 12:34:33 -0700 Subject: [PATCH] [v9_9] prep 9.9.9b2 --- CHANGES | 2 ++ bin/tests/system/cacheclean/tests.sh | 2 +- lib/dns/api | 2 +- lib/dns/cache.c | 2 +- lib/dns/include/dns/dbiterator.h | 4 ++-- lib/dns/tests/dbiterator_test.c | 2 +- lib/isc/api | 2 +- util/copyrights | 10 +++++----- util/kit.sh | 2 +- version | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index acf515dc23..4dc3d87dc0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + --- 9.9.9b2 released --- + 4342. [bug] 'rndc flushtree' could fail to clean the tree if there wasn't a node at the specified name. [RT #41846] diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh index 6ffd83ea2e..a58a444574 100644 --- a/bin/tests/system/cacheclean/tests.sh +++ b/bin/tests/system/cacheclean/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2011-2013, 2016 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/api b/lib/dns/api index 58bc9b4c34..feb9494286 100644 --- a/lib/dns/api +++ b/lib/dns/api @@ -7,5 +7,5 @@ # 9.10: 140-149 # 9.11: 160-169 LIBINTERFACE = 171 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 diff --git a/lib/dns/cache.c b/lib/dns/cache.c index a37acf935b..21d494108f 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2011, 2013, 2015 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011, 2013, 2015, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h index 8f51d1c96f..c36f18d489 100644 --- a/lib/dns/include/dns/dbiterator.h +++ b/lib/dns/include/dns/dbiterator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -288,7 +288,7 @@ dns_dbiterator_setcleanmode(dns_dbiterator_t *iterator, isc_boolean_t mode); * Indicate that the given iterator is/is not cleaning the DB. * * Notes: - *\li When 'mode' is ISC_TRUE, + *\li When 'mode' is ISC_TRUE, * * Requires: *\li 'iterator' is a valid iterator. diff --git a/lib/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c index 888d3be89d..f893753a3d 100644 --- a/lib/dns/tests/dbiterator_test.c +++ b/lib/dns/tests/dbiterator_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2011, 2012, 2016 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/lib/isc/api b/lib/isc/api index 83640ba56b..7de96ec52e 100644 --- a/lib/isc/api +++ b/lib/isc/api @@ -5,5 +5,5 @@ # 9.9: 90-109 # 9.9-sub: 130-139 LIBINTERFACE = 107 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 1 diff --git a/util/copyrights b/util/copyrights index c5db6bf239..94905ef5ef 100644 --- a/util/copyrights +++ b/util/copyrights @@ -830,7 +830,7 @@ ./bin/tests/system/cacheclean/ns1/flushtest.db ZONE 2011 ./bin/tests/system/cacheclean/ns1/named.conf CONF-C 2001,2004,2005,2007,2011 ./bin/tests/system/cacheclean/ns2/named.conf CONF-C 2001,2004,2005,2007,2011 -./bin/tests/system/cacheclean/tests.sh SH 2001,2004,2007,2011,2012,2013 +./bin/tests/system/cacheclean/tests.sh SH 2001,2004,2007,2011,2012,2013,2016 ./bin/tests/system/case/clean.sh SH 2013,2014,2015 ./bin/tests/system/case/ns1/example.db ZONE 2013 ./bin/tests/system/case/ns1/named.conf CONF-C 2013 @@ -2788,7 +2788,7 @@ ./lib/dns/adb.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 ./lib/dns/api X 1999,2000,2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./lib/dns/byaddr.c C 2000,2001,2002,2003,2004,2005,2007,2009,2013 -./lib/dns/cache.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2013,2015 +./lib/dns/cache.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2013,2015,2016 ./lib/dns/callbacks.c C 1999,2000,2001,2004,2005,2007,2011,2015 ./lib/dns/client.c C 2009,2010,2011,2012,2013,2015 ./lib/dns/clientinfo.c C 2011 @@ -2831,7 +2831,7 @@ ./lib/dns/include/dns/clientinfo.h C 2011 ./lib/dns/include/dns/compress.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009 ./lib/dns/include/dns/db.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013 -./lib/dns/include/dns/dbiterator.h C 1999,2000,2001,2004,2005,2006,2007 +./lib/dns/include/dns/dbiterator.h C 1999,2000,2001,2004,2005,2006,2007,2016 ./lib/dns/include/dns/dbtable.h C 1999,2000,2001,2004,2005,2006,2007 ./lib/dns/include/dns/diff.h C 2000,2001,2004,2005,2006,2007,2008,2009,2010 ./lib/dns/include/dns/dispatch.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2014 @@ -3126,7 +3126,7 @@ ./lib/dns/tests/Makefile.in MAKE 2011,2012,2013,2014,2015 ./lib/dns/tests/db_test.c C 2013,2015 ./lib/dns/tests/dbdiff_test.c C 2011,2012 -./lib/dns/tests/dbiterator_test.c C 2011,2012 +./lib/dns/tests/dbiterator_test.c C 2011,2012,2016 ./lib/dns/tests/dbversion_test.c C 2011,2012,2014,2015 ./lib/dns/tests/dh_test.c C 2014 ./lib/dns/tests/dispatch_test.c C 2012,2014 @@ -4128,7 +4128,7 @@ ./util/commit-arm.sh SH 2012 ./util/copyrights X 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./util/file_year.sh SH 2012 -./util/kit.sh SH 2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015 +./util/kit.sh SH 2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016 ./util/mandoc2docbook.pl PERL 2001,2004,2007,2012 ./util/mdnbuildtest.sh SH 2000,2001,2004,2007,2012 ./util/memleak.pl PERL 1999,2000,2001,2004,2007,2012 diff --git a/util/kit.sh b/util/kit.sh index 92ec411a39..9115980c4b 100644 --- a/util/kit.sh +++ b/util/kit.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007-2010, 2012-2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007-2010, 2012-2016 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/version b/version index 91e4d30246..06e105ab21 100644 --- a/version +++ b/version @@ -7,5 +7,5 @@ MAJORVER=9 MINORVER=9 PATCHVER=9 RELEASETYPE=b -RELEASEVER=1 +RELEASEVER=2 EXTENSIONS=