[v9_9] prep 9.9.9b2

diff --git a/CHANGES b/CHANGES
index acf515dc2357fa43c8fe91e38c9eafa1191ffcb8..4dc3d87dc06ff00db28adbe21146321f7b719eae 100644 (file)
--- 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 6ffd83ea2e9eaa23e239af5c4b371e24a742758d..a58a444574ae068cd8af06efdd9e16a636a773f7 100644 (file)
--- 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 58bc9b4c348cc021f7579436132bf894a70f3951..feb9494286e1afc79140e790f16c68b4501d2fa8 100644 (file)
--- 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 a37acf935bdc111b5e44ff0166ffd32b7d210e28..21d494108f6014e62e70177c1d9a09a21b4f825d 100644 (file)
--- 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 8f51d1c96f80e367a297d7950f071dde65a45460..c36f18d48922adb946cc2a0e62fde91aea9ed2b7 100644 (file)
--- 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 888d3be89dc6effebeb1ca5fad11632abefd65bd..f893753a3d1f17d3bbd13089b04a5df6e941d2ec 100644 (file)
--- 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 83640ba56b2e14239e085c96bf27c5bfdb096b50..7de96ec52e869013e05040afdfab1be5f3a05137 100644 (file)
--- 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 c5db6bf239cc85562bf05d63b5861268c118ef0e..94905ef5efc6564a638c931f73909ab5d12156a9 100644 (file)
--- 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 92ec411a39b06f01f82bca8f4a3310e93da55032..9115980c4bca8ca056081203afbe3754aeb88abf 100644 (file)
--- 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 91e4d3024634c2071806db9801dfb11e109b3c4b..06e105ab21cdfabfb23969eeebcbd7fad216f992 100644 (file)
--- a/version
+++ b/version
@@ -7,5 +7,5 @@ MAJORVER=9
 MINORVER=9
 PATCHVER=9
 RELEASETYPE=b
-RELEASEVER=1
+RELEASEVER=2
 EXTENSIONS=