From b3b3f9064cc75c770af710a1a4d8b4640e31ffad Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Sun, 18 Feb 2018 23:30:15 +0000 Subject: [PATCH 1/3] newcopyrights --- util/copyrights | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/copyrights b/util/copyrights index 0db67afd36..ff45e46b56 100644 --- a/util/copyrights +++ b/util/copyrights @@ -2695,7 +2695,7 @@ ./contrib/dlz/bin/.gitignore X 2014 ./contrib/dlz/bin/dlzbdb/Makefile.in X 2005,2007,2009,2011,2012,2015,2016,2017 ./contrib/dlz/bin/dlzbdb/dlzbdb.c X 2005,2016 -./contrib/dlz/config.dlz.in X 2005,2006,2008,2010,2011,2014,2016,2017 +./contrib/dlz/config.dlz.in X 2005,2006,2008,2010,2011,2014,2016,2017,2018 ./contrib/dlz/drivers/.gitignore X 2012 ./contrib/dlz/drivers/dlz_bdb_driver.c X 2005,2008,2010,2011,2012,2016,2017 ./contrib/dlz/drivers/dlz_bdbhpt_driver.c X 2005,2010,2011,2012,2016,2017 @@ -3364,7 +3364,7 @@ ./lib/dns/include/dns/dns64.h C 2010,2014,2016 ./lib/dns/include/dns/dnsrps.h C 2017 ./lib/dns/include/dns/dnssec.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016 -./lib/dns/include/dns/dnstap.h C 2015,2016,2017 +./lib/dns/include/dns/dnstap.h C 2015,2016,2017,2018 ./lib/dns/include/dns/ds.h C 2002,2004,2005,2006,2007,2010,2012,2014,2016 ./lib/dns/include/dns/dsdigest.h C 2012,2016 ./lib/dns/include/dns/dyndb.h C 2015,2016 From 72326f7701b19fc3057b5f9bdc3b5422c9b0a3f0 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Sun, 18 Feb 2018 23:47:45 +0000 Subject: [PATCH 2/3] update copyright notice / whitespace --- bin/dig/dighost.c | 2 +- bin/dig/host.c | 2 +- bin/dig/include/dig/dig.h | 2 +- bin/dig/nslookup.c | 2 +- lib/dns/include/dns/dnstap.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index e02f301018..98c9ce3dea 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000-2018 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/bin/dig/host.c b/bin/dig/host.c index 950f9a1e56..4c54c0e40c 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2007, 2009-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000-2007, 2009-2018 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index c132efd5d9..3f4c736b59 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2009, 2011-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000-2009, 2011-2018 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 66232bf06a..a47d64dcc4 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2000-2018 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h index 38e1e0449a..416f6b71cb 100644 --- a/lib/dns/include/dns/dnstap.h +++ b/lib/dns/include/dns/dnstap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this From d7733df695f3492793ff8fa3c1863788cb61784e Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Mon, 19 Feb 2018 01:09:05 +0000 Subject: [PATCH 3/3] regen master --- configure | 30 ++++++------------------------ doc/arm/Bv9ARM.ch08.html | 13 +++++++++++-- doc/arm/notes.html | 13 +++++++++++-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 9f637eeb7b..7a53165026 100755 --- a/configure +++ b/configure @@ -23535,23 +23535,11 @@ done then use_dlz_mysql=$d mysql_include=$d/include/mysql - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi break elif test -f $d/include/mysql.h then use_dlz_mysql=$d mysql_include=$d/include - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi break fi done @@ -23562,21 +23550,9 @@ then if test -f $d/include/mysql/mysql.h then mysql_include=$d/include/mysql - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi elif test -f $d/include/mysql.h then mysql_include=$d/include - if test -d $d/lib/mysql - then - mysql_lib=$d/lib/mysql - else - mysql_lib=$d/lib - fi fi fi @@ -23616,6 +23592,12 @@ $as_echo "no" >&6; } $as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; } ;; *) + if test -d "$use_dlz_mysql/lib/mysql" + then + mysql_lib="$use_dlz_mysql/lib/mysql" + else + mysql_lib="$use_dlz_mysql/lib" + fi CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL" for i in dlz_mysql_driver diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html index 269746e4ae..c7fa64c955 100644 --- a/doc/arm/Bv9ARM.ch08.html +++ b/doc/arm/Bv9ARM.ch08.html @@ -129,14 +129,23 @@

Feature Changes

-
  • +
      +

    • Zone types primary and secondary are now available as synonyms for master and slave, respectively, in named.conf.

      -
    +
    • +
  • +

    + named will now log a warning if the old + root DNSSEC key is explicitly configured and has not been updated. + [RT #43670] +

    +
    • +
diff --git a/doc/arm/notes.html b/doc/arm/notes.html index 00e4c747ce..e74dc165d0 100644 --- a/doc/arm/notes.html +++ b/doc/arm/notes.html @@ -91,14 +91,23 @@

Feature Changes

-
  • +
      +

    • Zone types primary and secondary are now available as synonyms for master and slave, respectively, in named.conf.

      -
    +
    • +
  • +

    + named will now log a warning if the old + root DNSSEC key is explicitly configured and has not been updated. + [RT #43670] +

    +
    • +