diff --git a/debian/changelog b/debian/changelog
index c413b08fc..c9397ebcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1600,7 +1600,7 @@ bind9 (1:9.9.5.dfsg-1) experimental; urgency=low
[Martin Nagy]
* dynamic loading of database backends. See:
- http://pkgs.fedoraproject.org/cgit/bind.git/tree/bind-96-dyndb.patch.
+ http://pkgs.fedoraproject.org/cgit/bind.git/tree/bind-96-dyndb.patch.
Closes: #722669
[LaMont Jones]
@@ -1743,7 +1743,7 @@ bind9 (1:9.9.3.dfsg.P2-1) unstable; urgency=low
bind9 (1:9.9.2.dfsg.P1-3) experimental; urgency=low
[LaMont Jones]
-
+
* Merge 1:9.8.4.dfsg.P1-6
[Ben Hutchings]
@@ -1764,7 +1764,7 @@ bind9 (1:9.9.2.dfsg.P1-2ubuntu3) saucy; urgency=low
bind9 (1:9.9.2.dfsg.P1-2ubuntu2) raring; urgency=low
- * configure.in: detect libxml 2.9 as well as 2.[678] (LP: #1164475).
+ * configure.in: detect libxml 2.9 as well as 2.[678] (LP: #1164475).
* debian/control: add Build-Depends on dh-autoreconf.
* debian/rules: use dh_autoreconf and dh_autoreconf_clean.
@@ -1844,7 +1844,7 @@ bind9 (1:9.8.4.dfsg.P1-5) unstable; urgency=low
[Paul Vixie]
- * Include rpz/rrl patches from http://www.redbarn.org/dns/ratelimits.
+ * Include rpz/rrl patches from http://www.redbarn.org/dns/ratelimits.
Closes: #698641
-- LaMont Jones <lamont@debian.org> Wed, 30 Jan 2013 14:04:35 -0700
@@ -2058,7 +2058,7 @@ bind9 (1:9.8.1.dfsg.P1-3) unstable; urgency=low
* Default to run_resolvconf=false. LP: #933723
* Deliver named.conf.options on fresh install. Closes: #657042 LP: #920202
- * Do not deliver /usr/share/bind9/bind9-default.md5sum in the bind9 deb.
+ * Do not deliver /usr/share/bind9/bind9-default.md5sum in the bind9 deb.
Closes: #620007 LP: #681536
* Deliver and use /etc/apparmor.d/local/usr.sbin.named for local overrides.
LP: #929563
@@ -2319,7 +2319,7 @@ bind9 (1:9.7.1.dfsg-2) unstable; urgency=low
[Regid Ichira]
- * explicitly add nsupdate to dynamic updates in README.Debian.
+ * explicitly add nsupdate to dynamic updates in README.Debian.
Closes: #577398
[LaMont Jones]
@@ -2488,7 +2488,7 @@ bind9 (1:9.6.1.dfsg.P1-2) unstable; urgency=low
[LaMont Jones]
- * postinst: do not append a blank line to /etc/default/bind9.
+ * postinst: do not append a blank line to /etc/default/bind9.
Closes: #541469
* init.d stop needs to not error out. LP: #398033
* meta: fix build-depends. Closes: #539230
@@ -2499,7 +2499,7 @@ bind9 (1:9.6.1.dfsg.P1-1) unstable; urgency=low
[Internet Software Consortium, Inc]
- * A specially crafted update packet will cause named to exit.
+ * A specially crafted update packet will cause named to exit.
CVE-2009-0696, CERT VU#725188. Closes: #538975
[InterNIC]
@@ -2560,7 +2560,7 @@ bind9 (1:9.6.0.dfsg.P1-1) experimental; urgency=low
* Add min-cache-ttl and min-ncache-ttl keywords
[LaMont Jones]
-
+
* Fix merge errors from 9.6.0.dfsg.P1-0
-- LaMont Jones <lamont@debian.org> Fri, 20 Mar 2009 15:50:50 -0600
@@ -2580,7 +2580,7 @@ bind9 (1:9.6.0.dfsg.P1-0) experimental; urgency=low
[Sven Joachim]
- * meta: pass host and build into configure for hybrid build machines.
+ * meta: pass host and build into configure for hybrid build machines.
Closes: #515110
-- LaMont Jones <lamont@debian.org> Fri, 20 Mar 2009 11:54:55 -0600
@@ -2750,7 +2750,7 @@ bind9 (1:9.5.0.dfsg-5) unstable; urgency=low
[Internet Software Consortium, Inc]
* Randomize UDP query source ports to improve forgery resilience.
- (CVE-2008-1447)
+ (CVE-2008-1447)
[LaMont Jones]
@@ -2767,7 +2767,7 @@ bind9 (1:9.5.0.dfsg-4) unstable; urgency=low
[LaMont Jones]
- * control: fix dnsutils description to avoid list reformatting.
+ * control: fix dnsutils description to avoid list reformatting.
Closes: #480317
* lwresd: restart in postinst. Closes: #486481
* meta: merge the mess of single-lib packages back into one large one.
@@ -2795,7 +2795,7 @@ bind9 (1:9.4.2-11) unstable; urgency=low
* apparmor: add dnscvsutil package files
* lwresd Depends: adduser
- * control: fix dnsutils description to avoid list reformatting.
+ * control: fix dnsutils description to avoid list reformatting.
Closes: #480317
-- LaMont Jones <lamont@debian.org> Tue, 17 Jun 2008 21:30:12 -0600
@@ -2805,7 +2805,7 @@ bind9 (1:9.5.0.dfsg-3) unstable; urgency=low
[LaMont Jones]
* bind9utils Depends: libbind9-40. Closes: #486194
- * bind9 should not deliver manpages for nonexistant binaries.
+ * bind9 should not deliver manpages for nonexistant binaries.
Closes: #486196
[localization folks]
@@ -3108,7 +3108,7 @@ bind9 (1:9.4.1-P1-2) unstable; urgency=low
bind9 (1:9.4.1-P1-1) unstable; urgency=high
- * New upstream version, addresses CVE-2007-2926 and CVE-2007-2925
+ * New upstream version, addresses CVE-2007-2926 and CVE-2007-2925
-- Bdale Garbee <bdale@gag.com> Thu, 26 Jul 2007 16:41:50 -0600
@@ -3537,20 +3537,20 @@ bind9 (1:9.2.0-3) unstable; urgency=low
bind9 (1:9.2.0-2) unstable; urgency=medium
* change rc.d links to ensure daemon starts before and stops after other
- daemons that may fail if name service is not working (bug was filed
+ daemons that may fail if name service is not working (bug was filed
against 8.X bind packages, but is just as relevant here!)
* use rndc for daemon shutdown instead of start-stop-daemon, closes: #111935
- * add a postinst to dnsutils to remove any lingering diversions from old
+ * add a postinst to dnsutils to remove any lingering diversions from old
dnsutils packages, closes: #122227
- * not much point in delivering zone2ldap.1 since we aren't delivering
+ * not much point in delivering zone2ldap.1 since we aren't delivering
zone2ldap right now (though we might someday?), closes: #124058
* be more verbose with shared library descriptions, closes: #123426, #123428
- * 9.2.0 added a new rndc.key file that both named and rndc will read to
- obtain a shared key, and rndc-confgen will easily create this file with
+ * 9.2.0 added a new rndc.key file that both named and rndc will read to
+ obtain a shared key, and rndc-confgen will easily create this file with
a unique-per-system key. Modify named.conf and remove rndc.conf
- to take advantage of this mechanism and stop delivering a pre-determined
- static key to all Debian systems (which has been a mild security risk).
- Create the key in postinst if the key file doesn't already exist, and
+ to take advantage of this mechanism and stop delivering a pre-determined
+ static key to all Debian systems (which has been a mild security risk).
+ Create the key in postinst if the key file doesn't already exist, and
remove the file in postrm if purging.
Closes: #86718, #87208
@@ -3586,9 +3586,9 @@ bind9 (1:9.1.3-1) unstable; urgency=low
same time, closes: #90994
* the CHANGES file documents fixes since 9.1.1 that probably cured the
reported assertion failure. If it turns out that I'm wrong, the bug can
- be re-opened or a new one filed. I can't see any way to reproduce the bug
+ be re-opened or a new one filed. I can't see any way to reproduce the bug
in a test case here. Closes: #99352
- * have libbind-dev depend on the runtime library packages it delivers
+ * have libbind-dev depend on the runtime library packages it delivers
compile-time symlinks for, closes: #100898, #103855
* fix lwres man pages to source man3/* instead of * so all the page content
can actually be found, closes: #85450, #103865
@@ -3608,14 +3608,14 @@ bind9 (1:9.1.1-1) unstable; urgency=low
bind9 (1:9.1.0-3) unstable; urgency=low
- * merge patch from Zack Weinberg that solves compilation problem, and
+ * merge patch from Zack Weinberg that solves compilation problem, and
reduces the memory footprint of applications by making configure.in
smarter. Closes: #86776, #86910
* the bind-doc package includes all relevant documentation from the bind9
source tree, including HTML content in /usr/share/doc/bind9-doc/arm,
closes: #85718
* default named.conf and rndc.conf to not world-readable. This is an
- interim step towards addressing the concerns about security raised by
+ interim step towards addressing the concerns about security raised by
bugs 86718 and closes: #86836 A better long-term solution would be for
rndc.conf to allow includes, so that both named.conf and rndc.conf could
include a key file built on the fly during installation while themselves
@@ -3636,7 +3636,7 @@ bind9 (1:9.1.0-2) unstable; urgency=low
+ bind9: named.conf ships with 'key' and 'control' sections
+ bind9: correctly creates /var/cache/bind, closes: #85457
+ lwresd: lwresd is split off into its own package, closes: #85627
- * nsupdate is delivered by the dnsutils package, but the (wrong) man page
+ * nsupdate is delivered by the dnsutils package, but the (wrong) man page
was accidentally also included in the bind9 package, closes: #85717
* freshen config.sub and config.guess for ia64 and hppa support
@@ -3644,9 +3644,8 @@ bind9 (1:9.1.0-2) unstable; urgency=low
bind9 (1:9.1.0-1) unstable; urgency=low
- * Initial packaging of BIND 9.1.0. Must use epoch so that meta packages
+ * Initial packaging of BIND 9.1.0. Must use epoch so that meta packages
retain their sequencing from the bind 8 package version stream.
* snarf a couple of man pages from the 8.X tree for now
-- Bdale Garbee <bdale@gag.com> Thu, 1 Feb 2001 16:30:35 -0700
-
diff --git a/debian/control b/debian/control
index 7784d9fa3..932570d07 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian DNS Team <team+dns@tracker.debian.org>
Uploaders: Ondřej Surý <ondrej@debian.org>,
Bernhard Schmidt <berni@debian.org>
Build-Depends: bison,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
dh-apparmor,
dh-exec,
libcap2-dev [linux-any],
@@ -75,7 +75,6 @@ Package: bind9utils
Architecture: all
Depends: bind9-utils,
${misc:Depends}
-Priority: optional
Section: oldlibs
Description: Transitional package for bind9-utils
This is a transitional package. It can safely be removed.
@@ -120,7 +119,6 @@ Description: DNS Lookup Utility
Package: bind9-libs
Section: libs
-Priority: standard
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
@@ -136,7 +134,6 @@ Description: Shared Libraries used by BIND 9
Package: bind9-dev
Section: devel
-Priority: optional
Architecture: any
Multi-Arch: same
Depends: bind9-libs (= ${binary:Version}),
@@ -159,7 +156,6 @@ Package: dnsutils
Architecture: all
Depends: bind9-dnsutils,
${misc:Depends}
-Priority: optional
Section: oldlibs
Description: Transitional package for bind9-dnsutils
This is a transitional package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index cb8ab6154..e5b730876 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,26 +6,26 @@ Source: https://ftp.isc.org/isc/bind9/
Files: *
Copyright: 2004-2017 Internet Systems Consortium, Inc. ("ISC")
1996-2003 Internet Software Consortium
- 2013-2017 Farsight Security, Inc.
- 2012 Vadim Goncharov
- 2009-2012 John Eaglesham
- 2009-2015 Red Hat
- 2008 Damien Miller
- 2004, 2008 Nominet, Ltd.
- 2004 Masarykova universita
- 1997-2003 Kungliga Tekniska Högskolan
- 2002 Nuno M. Rodrigues.
- 2002 Stichting NLnet
- 2000-2002 Japan Network Information Center.
- 2001 Jake Burkholder
- 1996-2001 Nominum, Inc.
- 1995-2000 Network Associates, Inc.
- 2000 Aaron D. Gifford
- 1999-2000 Nortel Networks Corporation
- 1996 David Mazieres
- 1995-1998 WIDE Project
- 1993 Digital Equipment Corporation.
- 1985, 1987, 1989, 1990, 1993, 1994 The Regents of the University of California.
+ 2013-2017 Farsight Security, Inc.
+ 2012 Vadim Goncharov
+ 2009-2012 John Eaglesham
+ 2009-2015 Red Hat
+ 2008 Damien Miller
+ 2004, 2008 Nominet, Ltd.
+ 2004 Masarykova universita
+ 1997-2003 Kungliga Tekniska Högskolan
+ 2002 Nuno M. Rodrigues.
+ 2002 Stichting NLnet
+ 2000-2002 Japan Network Information Center.
+ 2001 Jake Burkholder
+ 1996-2001 Nominum, Inc.
+ 1995-2000 Network Associates, Inc.
+ 2000 Aaron D. Gifford
+ 1999-2000 Nortel Networks Corporation
+ 1996 David Mazieres
+ 1995-1998 WIDE Project
+ 1993 Digital Equipment Corporation.
+ 1985, 1987, 1989, 1990, 1993, 1994 The Regents of the University of California.
License: MPL-2.0 and ISC and BSD-2-clause and BSD-3-clause
Comment:
The BIND 9 project was originally distributed under permissive
@@ -41,7 +41,7 @@ Comment:
Files: lib/isc/hp.c lib/isc/include/isc/hp.h
Copyright: 2018-2020 Internet Systems Consortium, Inc. ("ISC")
- 2014-2016, Pedro Ramalhete, Andreia Correia
+ 2014-2016, Pedro Ramalhete, Andreia Correia
License: MPL-2.0 and BSD-3-clause
Comment:
This work is based on C++ code available from:
@@ -49,22 +49,22 @@ Comment:
Files: lib/isc/random.c
Copyright: 2018-2020 Internet Systems Consortium, Inc. ("ISC")
- 1996 David Mazieres
- 2008 Damien Miller
+ 1996 David Mazieres
+ 2008 Damien Miller
License: MPL-2.0 and ISC
Files: lib/isc/siphash.c
Copyright: 2018-2020 Internet Systems Consortium, Inc. ("ISC")
- 2012-2016 Jean-Philippe Aumasson
- 2012-2014 Daniel J. Bernstein
+ 2012-2016 Jean-Philippe Aumasson
+ 2012-2014 Daniel J. Bernstein
License: MPL-2.0 and CC0-1.0
Comment:
The SipHash in BIND 9 is based on SipHash reference C implementation.
Files: lib/isc/include/pkcs11/pkcs11.h
Copyright: 2006-2007 g10 Code GmbH
- 2006 Andreas Jellinghaus
- 2017 Red Hat, Inc.
+ 2006 Andreas Jellinghaus
+ 2017 Red Hat, Inc.
License:
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
@@ -79,39 +79,39 @@ Comment: The pkcs11.h header was imported from libp11 project
Files: lib/isc/tests/random_test.c
Copyright: 2004-2017 Internet Systems Consortium, Inc. ("ISC")
1996-2003 Internet Software Consortium
- 1985, 1987, 2000 Stephen L. Moshier
+ 1985, 1987, 2000 Stephen L. Moshier
License: MPL-2.0 and public-domain
Files: contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
Copyright: 2004-2017 Internet Systems Consortium, Inc. ("ISC")
- 2014 Maui Systems Ltd
+ 2014 Maui Systems Ltd
License: MPL-2.0 and ISC
Files: contrib/dlz/modules/perl/
Copyright: 2004-2017 Internet Systems Consortium, Inc. ("ISC")
- 2009-2012 John Eaglesham
- 2002 Stichting NLnet
+ 2009-2012 John Eaglesham
+ 2002 Stichting NLnet
License: MPL-2.0 and ISC
Files: contrib/dlz/modules/wildcard/
Copyright: 2004-2017 Internet Systems Consortium, Inc. ("ISC")
- 2012 Vadim Goncharov
- 2002 Stichting NLnet
+ 2012 Vadim Goncharov
+ 2002 Stichting NLnet
License: MPL-2.0 and ISC
Files: m4/
Copyright: 2004-2017 Internet Systems Consortium, Inc. ("ISC")
- 2008 Guido U. Draheim
- 2011 Maarten Bosmans
- 2009, 2010 Zmanda Inc.
- 2009, 2010 Dustin J. Mitchell
- 2008 Steven G. Johnson
- 2011 Daniel Richard G.
- 2009 Filippo Giunchedi
- 2011 The Board of Trustees of the Leland Stanford Junior University
- 2011 Russ Allbery <rra@stanford.edu>
- 2013 Bastien ROUCARIES
- 2004, 2011-2015 Free Software Foundation, Inc.
+ 2008 Guido U. Draheim
+ 2011 Maarten Bosmans
+ 2009, 2010 Zmanda Inc.
+ 2009, 2010 Dustin J. Mitchell
+ 2008 Steven G. Johnson
+ 2011 Daniel Richard G.
+ 2009 Filippo Giunchedi
+ 2011 The Board of Trustees of the Leland Stanford Junior University
+ 2011 Russ Allbery <rra@stanford.edu>
+ 2013 Bastien ROUCARIES
+ 2004, 2011-2015 Free Software Foundation, Inc.
License:
Copying and distribution of this file, with or without modification, are
permitted in any medium without royalty provided the copyright notice
@@ -122,9 +122,9 @@ Comment:
Files: debian/
Copyright: 2007-2017 LaMont Jones
- 2013-2017 Michael Gilbert
+ 2013-2017 Michael Gilbert
2017-2019 Ondřej Surý
- 2008-2016 Jamie Strandboge
+ 2008-2016 Jamie Strandboge
License: ISC or MPL-2.0
License: MPL-2.0
diff --git a/debian/rules b/debian/rules
index d7447b12a..07b36954e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,6 +118,6 @@ override_dh_install:
dh_apparmor -pbind9 --profile-name=usr.sbin.named
override_dh_missing:
- dh_missing $(EXCLUDE_FILES) --fail-missing
+ dh_missing $(EXCLUDE_FILES)
.PHONY: prepare_version_extensions clean_version_extensions
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 000000000..98ce6c3f3
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,2 @@
+---
+Repository-Browse: https://gitlab.isc.org/isc-projects/bind9
