From da13b99e0857995424617ea6a0cba3058e146a78 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 23 Jan 2013 23:08:32 +0000 Subject: [PATCH 1/3] regenerate --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 4d3a34d43b..f73433cef4 100755 --- a/configure +++ b/configure @@ -19434,6 +19434,9 @@ $as_echo "#define ATF_TEST 1" >>confdefs.h STD_CINCLUDES="$STD_CINCLUDES -I$atf/include" ATFBIN="$atf/bin" ATFLIBS="-L$atf/lib -latf-c" + if test "$want_openssl_hash" = yes; then + ATFLIBS="-L$atf/lib -latf-c $DNS_CRYPTO_LIBS" + fi UNITTESTS=tests fi From f761c1754f007ff7eceb0d603c82a7a2166342be Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 23 Jan 2013 23:30:11 +0000 Subject: [PATCH 2/3] newcopyrights --- util/copyrights | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/util/copyrights b/util/copyrights index 54823c5d40..d0c2f30852 100644 --- a/util/copyrights +++ b/util/copyrights @@ -108,14 +108,14 @@ ./bin/dnssec/dnssec-settime.docbook SGML 2009,2010,2011 ./bin/dnssec/dnssec-settime.html HTML DOCBOOK ./bin/dnssec/dnssec-signzone.8 MAN DOCBOOK -./bin/dnssec/dnssec-signzone.c C.NAI 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 +./bin/dnssec/dnssec-signzone.c C.NAI 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013 ./bin/dnssec/dnssec-signzone.docbook SGML 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011 ./bin/dnssec/dnssec-signzone.html HTML DOCBOOK ./bin/dnssec/dnssec-verify.8 MAN 2012 ./bin/dnssec/dnssec-verify.c C 2012 ./bin/dnssec/dnssec-verify.docbook SGML 2012 ./bin/dnssec/dnssec-verify.html HTML DOCBOOK -./bin/dnssec/dnssectool.c C 2000,2001,2003,2004,2005,2007,2009,2010,2011,2012 +./bin/dnssec/dnssectool.c C 2000,2001,2003,2004,2005,2007,2009,2010,2011,2012,2013 ./bin/dnssec/dnssectool.h C 2000,2001,2003,2004,2007,2008,2009,2010,2011,2012 ./bin/dnssec/win32/dnssectool.dsp X 2006,2009 ./bin/dnssec/win32/dnssectool.dsw X 2006,2009 @@ -201,7 +201,7 @@ ./bin/named/named.conf.5 MAN DOCBOOK ./bin/named/named.conf.docbook SGML 2004,2005,2006,2007,2008,2009,2010,2011 ./bin/named/named.conf.html HTML DOCBOOK -./bin/named/named.docbook SGML 2000,2001,2003,2004,2005,2006,2007,2008,2009,2011 +./bin/named/named.docbook SGML 2000,2001,2003,2004,2005,2006,2007,2008,2009,2011,2013 ./bin/named/named.html HTML DOCBOOK ./bin/named/notify.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007 ./bin/named/query.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013 @@ -1420,8 +1420,8 @@ ./bin/tests/system/verify/.gitignore X 2012 ./bin/tests/system/verify/clean.sh SH 2012 ./bin/tests/system/verify/setup.sh SH 2012 -./bin/tests/system/verify/tests.sh SH 2012 -./bin/tests/system/verify/zones/genzones.sh SH 2012 +./bin/tests/system/verify/tests.sh SH 2012,2013 +./bin/tests/system/verify/zones/genzones.sh SH 2012,2013 ./bin/tests/system/verify/zones/unsigned.db ZONE 2012 ./bin/tests/system/views/clean.sh SH 2000,2001,2004,2005,2007,2012 ./bin/tests/system/views/ns1/named.conf CONF-C 2000,2001,2004,2007 @@ -1459,20 +1459,21 @@ ./bin/tests/system/xfer/ans5/unknownkey X 2011 ./bin/tests/system/xfer/ans5/unsigned X 2011 ./bin/tests/system/xfer/ans5/wrongkey X 2011 -./bin/tests/system/xfer/clean.sh SH 2000,2001,2004,2007,2011,2012 +./bin/tests/system/xfer/clean.sh SH 2000,2001,2004,2007,2011,2012,2013 ./bin/tests/system/xfer/dig1.good X 2000,2001,2003,2004,2009,2011,2012,2013 ./bin/tests/system/xfer/dig2.good X 2000,2001,2003,2004,2009,2011,2012,2013 ./bin/tests/system/xfer/ns1/named.conf CONF-C 2000,2001,2004,2007,2011 ./bin/tests/system/xfer/ns1/root.db ZONE 2000,2001,2004,2007 -./bin/tests/system/xfer/ns2/named.conf CONF-C 2000,2001,2004,2005,2007 +./bin/tests/system/xfer/ns2/named.conf CONF-C 2000,2001,2004,2005,2007,2013 +./bin/tests/system/xfer/ns2/slave.db.in ZONE 2013 ./bin/tests/system/xfer/ns3/named.conf CONF-C 2000,2001,2004,2007,2011 ./bin/tests/system/xfer/ns4/named.conf.base CONF-C 2011 ./bin/tests/system/xfer/ns4/root.db.in ZONE 2011 ./bin/tests/system/xfer/ns6/named.conf CONF-C 2011 ./bin/tests/system/xfer/ns7/named.conf CONF-C 2011 ./bin/tests/system/xfer/prereq.sh SH 2011,2012 -./bin/tests/system/xfer/setup.sh SH 2001,2002,2004,2007,2011,2012 -./bin/tests/system/xfer/tests.sh SH 2000,2001,2004,2005,2007,2011,2012 +./bin/tests/system/xfer/setup.sh SH 2001,2002,2004,2007,2011,2012,2013 +./bin/tests/system/xfer/tests.sh SH 2000,2001,2004,2005,2007,2011,2012,2013 ./bin/tests/system/xferquota/clean.sh SH 2000,2001,2004,2007,2012 ./bin/tests/system/xferquota/ns1/changing1.db ZONE 2000,2001,2004,2007 ./bin/tests/system/xferquota/ns1/changing2.db ZONE 2000,2001,2004,2007 From c3e768f1fb46d9b73cefc758e1b8c4484f3711e7 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 23 Jan 2013 23:45:39 +0000 Subject: [PATCH 3/3] update copyright notice --- bin/dnssec/dnssec-signzone.c | 2 +- bin/dnssec/dnssectool.c | 2 +- bin/named/named.docbook | 3 ++- bin/tests/system/verify/tests.sh | 2 +- bin/tests/system/verify/zones/genzones.sh | 2 +- bin/tests/system/xfer/clean.sh | 2 +- bin/tests/system/xfer/ns2/named.conf | 2 +- bin/tests/system/xfer/ns2/slave.db.in | 14 ++++++++++++++ bin/tests/system/xfer/setup.sh | 2 +- bin/tests/system/xfer/tests.sh | 2 +- 10 files changed, 24 insertions(+), 9 deletions(-) diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 47976495d7..83456a7db7 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 1c75c0db05..7c8c6ce225 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/named/named.docbook b/bin/named/named.docbook index 128ca57283..1f08e196e0 100644 --- a/bin/named/named.docbook +++ b/bin/named/named.docbook @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []>