diff --git a/CHANGES b/CHANGES index e4afe8a4c7..4cb0f7e9a3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ + --- 9.10.4b2 released --- + 4332. [bug] Windows SIT -> COOKIE configuration support was accidentally back ported to 9.10 breaking existing configurations. [RT #41905] diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in index 879c2019c0..f0dd668ace 100644 --- a/bin/tests/system/dnssec/ns2/example.db.in +++ b/bin/tests/system/dnssec/ns2/example.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2004, 2007-2014 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2004, 2007-2014, 2016 Internet Systems Consortium, Inc. ("ISC") ; Copyright (C) 2000-2002 Internet Software Consortium. ; ; Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh index 187cbba566..4ff450397f 100644 --- a/bin/tests/system/dnssec/ns2/sign.sh +++ b/bin/tests/system/dnssec/ns2/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2006-2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006-2012, 2014-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/bin/tests/system/dnssec/ns3/managed-future.example.db.in b/bin/tests/system/dnssec/ns3/managed-future.example.db.in index 83ac20e8ea..568c24a65d 100644 --- a/bin/tests/system/dnssec/ns3/managed-future.example.db.in +++ b/bin/tests/system/dnssec/ns3/managed-future.example.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 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/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf index 095c04329a..375c6884dc 100644 --- a/bin/tests/system/dnssec/ns3/named.conf +++ b/bin/tests/system/dnssec/ns3/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006-2014, 2016 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh index ecf732778f..d74c428740 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2006-2015 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006-2016 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 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 b41167632a..0a5e447333 100644 --- 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 = 0 +LIBREVISION = 1 LIBAGE = 0 diff --git a/util/copyrights b/util/copyrights index bd304fbb54..825da48ee6 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1171,13 +1171,13 @@ ./bin/tests/system/dnssec/ns2/child.optout.example.db ZONE 2006,2008 ./bin/tests/system/dnssec/ns2/dlv.db.in ZONE 2004,2007 ./bin/tests/system/dnssec/ns2/dst.example.db.in ZONE 2004,2007 -./bin/tests/system/dnssec/ns2/example.db.in ZONE 2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014 +./bin/tests/system/dnssec/ns2/example.db.in ZONE 2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2016 ./bin/tests/system/dnssec/ns2/in-addr.arpa.db.in ZONE 2014 ./bin/tests/system/dnssec/ns2/insecure.secure.example.db ZONE 2000,2001,2004,2007,2013 ./bin/tests/system/dnssec/ns2/named.conf CONF-C 2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015 ./bin/tests/system/dnssec/ns2/private.secure.example.db.in ZONE 2000,2001,2004,2007 ./bin/tests/system/dnssec/ns2/rfc2335.example.db X 2004 -./bin/tests/system/dnssec/ns2/sign.sh SH 2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015 +./bin/tests/system/dnssec/ns2/sign.sh SH 2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016 ./bin/tests/system/dnssec/ns2/single-nsec3.db.in ZONE 2010 ./bin/tests/system/dnssec/ns3/auto-nsec.example.db.in ZONE 2011 ./bin/tests/system/dnssec/ns3/auto-nsec3.example.db.in ZONE 2011 @@ -1196,8 +1196,9 @@ ./bin/tests/system/dnssec/ns3/keyless.example.db.in ZONE 2001,2002,2004,2007 ./bin/tests/system/dnssec/ns3/kskonly.example.db.in ZONE 2010 ./bin/tests/system/dnssec/ns3/lower.example.db.in ZONE 2012 +./bin/tests/system/dnssec/ns3/managed-future.example.db.in ZONE 2016 ./bin/tests/system/dnssec/ns3/multiple.example.db.in ZONE 2006,2008 -./bin/tests/system/dnssec/ns3/named.conf CONF-C 2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014 +./bin/tests/system/dnssec/ns3/named.conf CONF-C 2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016 ./bin/tests/system/dnssec/ns3/nosign.example.db.in ZONE 2011 ./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in ZONE 2006,2008 ./bin/tests/system/dnssec/ns3/nsec3.example.db.in ZONE 2006,2008 @@ -1217,7 +1218,7 @@ ./bin/tests/system/dnssec/ns3/siginterval.example.db.in ZONE 2013 ./bin/tests/system/dnssec/ns3/siginterval1.conf CONF-C 2013 ./bin/tests/system/dnssec/ns3/siginterval2.conf CONF-C 2013 -./bin/tests/system/dnssec/ns3/sign.sh SH 2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 +./bin/tests/system/dnssec/ns3/sign.sh SH 2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 ./bin/tests/system/dnssec/ns3/split-dnssec.example.db.in ZONE 2011 ./bin/tests/system/dnssec/ns3/split-smart.example.db.in ZONE 2011 ./bin/tests/system/dnssec/ns3/ttlpatch.example.db.in ZONE 2011 diff --git a/version b/version index 322f42cbc2..20203f215d 100644 --- a/version +++ b/version @@ -7,5 +7,5 @@ MAJORVER=9 MINORVER=10 PATCHVER=4 RELEASETYPE=b -RELEASEVER=1 +RELEASEVER=2 EXTENSIONS=