[v9_10] prep 9.10.4b3

diff --git a/CHANGES b/CHANGES
index e349d1c24bcb327b6a11a9965b650cdf7c906adf..af8bf1b8d399606268790560ead5d98d9fc2d8eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+       --- 9.10.4b3 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 0ab44dab032b70ff8b3eca6fcaf70bd790cfad40..539550fd99669e496dcdcc756328b1786b4a21ad 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-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2011-2014, 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 0a5e44733395cbe079706981403783c6a90fc696..155d08e59ba17d22a04698234537c0b4170f23ab 100644 (file)
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -6,5 +6,5 @@
 # 9.9-sub: 130-139, 150-159
 # 9.10: 140-149, 160-169
 LIBINTERFACE = 164
-LIBREVISION = 1
+LIBREVISION = 2
 LIBAGE = 0

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index a947121685162101f93ea9258a9c1d38e6a28618..6dedc2cd0c037e9f8dc5b86e81df7227d5cb97ab 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/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c
index ddbf07a01c7f6f7bc8b5e1fccb6e036e0814a936..2596d26dfde2c9a211272aa04aea4565ecc6f875 100644 (file)
--- a/lib/dns/tests/rdata_test.c
+++ b/lib/dns/tests/rdata_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2015  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2015, 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 89f703b5215dab3d64b34a6aa2fc2bd077f791db..5ba7027e6febcdb97e8fac7146e82b4fb5b7e3df 100644 (file)
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -6,5 +6,5 @@
 # 9.9-sub: 130-139
 # 9.10: 140-149, 160-169
 LIBINTERFACE = 161
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 1

diff --git a/util/copyrights b/util/copyrights
index 04331daea4de74391863cbcae2470dfc8a82543d..292c3b8acbfcc6d6dfae4e50e1c4031ab787c32d 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -868,7 +868,7 @@
 ./bin/tests/system/cacheclean/ns1/flushtest.db ZONE    2011
 ./bin/tests/system/cacheclean/ns1/named.conf   CONF-C  2001,2004,2005,2007,2011,2014
 ./bin/tests/system/cacheclean/ns2/named.conf   CONF-C  2001,2004,2005,2007,2011,2013,2014
-./bin/tests/system/cacheclean/tests.sh         SH      2001,2004,2007,2011,2012,2013,2014
+./bin/tests/system/cacheclean/tests.sh         SH      2001,2004,2007,2011,2012,2013,2014,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
@@ -1029,13 +1029,6 @@
 ./bin/tests/system/database/ns1/named.conf2    CONF-C  2011,2013
 ./bin/tests/system/database/setup.sh           SH      2011,2012
 ./bin/tests/system/database/tests.sh           SH      2011,2012
-./bin/tests/system/delv/clean.sh               SH      2014
-./bin/tests/system/delv/ns1/named.conf         CONF-C  2014
-./bin/tests/system/delv/ns1/root.db            ZONE    2014
-./bin/tests/system/delv/ns2/example.db         ZONE    2014
-./bin/tests/system/delv/ns2/named.conf         CONF-C  2014
-./bin/tests/system/delv/ns3/named.conf         CONF-C  2014
-./bin/tests/system/delv/tests.sh               SH      2014
 ./bin/tests/system/dialup/ns1/example.db       ZONE    2000,2001,2004,2007
 ./bin/tests/system/dialup/ns1/named.conf       CONF-C  2000,2001,2004,2007
 ./bin/tests/system/dialup/ns1/root.db          ZONE    2000,2001,2004,2007
@@ -3092,7 +3085,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,2012,2013,2015
+./lib/dns/cache.c                              C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2015,2016
 ./lib/dns/callbacks.c                          C       1999,2000,2001,2004,2005,2007,2011,2012,2015
 ./lib/dns/client.c                             C       2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/clientinfo.c                         C       2011
@@ -3138,7 +3131,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,2014,2015
-./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,2013
 ./lib/dns/include/dns/dispatch.h               C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014
@@ -3345,7 +3338,7 @@
 ./lib/dns/rdata/generic/nxt_30.h               C       1999,2000,2001,2002,2004,2005,2007
 ./lib/dns/rdata/generic/openpgpkey_61.c                C       2014,2015
 ./lib/dns/rdata/generic/openpgpkey_61.h                C       2014
-./lib/dns/rdata/generic/opt_41.c               C       1998,1999,2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015
+./lib/dns/rdata/generic/opt_41.c               C       1998,1999,2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015,2016
 ./lib/dns/rdata/generic/opt_41.h               C       1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/proforma.c             C       1998,1999,2000,2001,2002,2004,2007,2009,2015
 ./lib/dns/rdata/generic/proforma.h             C       1998,1999,2000,2001,2004,2005,2007
@@ -3442,7 +3435,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
@@ -3458,7 +3451,7 @@
 ./lib/dns/tests/private_test.c                 C       2011,2012
 ./lib/dns/tests/rbt_serialize_test.c           C       2014,2015
 ./lib/dns/tests/rbt_test.c                     C       2012,2013,2014,2015,2016
-./lib/dns/tests/rdata_test.c                   C       2012,2013,2015
+./lib/dns/tests/rdata_test.c                   C       2012,2013,2015,2016
 ./lib/dns/tests/rdataset_test.c                        C       2012
 ./lib/dns/tests/rdatasetstats_test.c           C       2012,2015
 ./lib/dns/tests/testdata/dbiterator/zone1.data ZONE    2011,2012
@@ -4496,7 +4489,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 20203f215d2df303f813223711585c9c572d6232..bc82fb27f5082944b7d421d151548a28ea75e23f 100644 (file)
--- a/version
+++ b/version
@@ -7,5 +7,5 @@ MAJORVER=9
 MINORVER=10
 PATCHVER=4
 RELEASETYPE=b
-RELEASEVER=2
+RELEASEVER=3
 EXTENSIONS=