synchronize distro/deb with official debian packaging

Note that this is not an exact synchronization, just the salient parts
where i believe upstream wants to sync up with debian.

I've left alone indications of upstream package maintainership, and
I've left debhelper back at version 9, for example.  and i've left the
differences between the shipped debian/kresd.conf (debian package
ships a minimal kresd.conf that doesn't load those four modules, in
particular).

diff --git a/distro/deb/debian/NEWS b/distro/deb/debian/NEWS
new file mode 100644 (file)
index 0000000..e81403c
--- /dev/null
+++ b/distro/deb/debian/NEWS
@@ -0,0 +1,23 @@
+knot-resolver (2.0.0-1) unstable; urgency=medium
+
+  Knot Resolver systemd service units are now templated, so that multiple
+  processes can run concurrently on multi-core systems.  For a full
+  overview of the status of all the running daemons, use:
+
+      systemctl status system-kresd.slice
+
+  For more information about this setup, please see kresd.systemd(7).
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sat, 03 Feb 2018 22:51:02 -0500
+
+knot-resolver (1.1.0~git2016072900-1) unstable; urgency=medium
+
+  Knot Resolver now starts and runs under unprivileged user and uses a
+  socket activations to bind on the privileged ports.  That means that if
+  you use anything more complicated than that you need to either override
+  the default service file with `systemd edit kresd.service` and
+  `systemd edit kresd.socket` to add more IP addresses, or just disable
+  it with `systemd mask kresd*.socket kresd.service` and provide your
+  own custom system service file tailored to your needs.
+
+ -- Ondřej Surý <ondrej@debian.org>  Thu, 04 Aug 2016 09:04:53 +0200

diff --git a/distro/deb/debian/README.source b/distro/deb/debian/README.source
index b8a3fa219ed2073ee20ef10f91648cd1a292d34e..657fc289b4eab8c48ca011d9ead8ac71f5487570 100644 (file)
--- a/distro/deb/debian/README.source
+++ b/distro/deb/debian/README.source
@@ -1,8 +1,8 @@
 Tracking upstream sources in git
 --------------------------------
 
-This debian package is tracked in git at
-https://anonscm.debian.org/git/pkg-dns/knot-resolver.git, which
+This debian package is tracked in the git "debian/master" branch at
+https://salsa.debian.org/dns-team/knot-resolver, which
 includes the commits from the upstream git repository at
 https://gitlab.labs.nic.cz/knot/knot-resolver.git.  When importing
 upstream tarballs, make sure you've fetched from the upstream repo
@@ -11,7 +11,9 @@ upstream-vcs-tag from debian/gbp.conf to link upstream git history
 with new package history.
 
 See Joey Hess's thoughts about why tracking upstream git history is
-useful: https://joeyh.name/blog/entry/upstream_git_repositories/
+useful: https://joeyh.name/blog/entry/upstream_git_repositories/, as
+well as DEP-14 for the branch-naming scheme:
+http://dep.debian.net/deps/dep14/
 
 Rebuilding epoch.js and epoch.css
 ---------------------------------
@@ -65,4 +67,4 @@ sass -t compact sass/epoch.scss > dist/css/epoch.css
 sass -t compressed sass/epoch.scss > dist/css/epoch.min.css
 EOF
 
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Sun, 12 Nov 2017 12:52:39 +0800
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Thu, 22 Feb 2018 13:25:27 -0800

diff --git a/distro/deb/debian/clean b/distro/deb/debian/clean
index b46f22a0f7667a676a36d3bd37d06c2ec8e201cc..d080dd6ff16ea88fa83469e40719b708b7ecb2af 100644 (file)
--- a/distro/deb/debian/clean
+++ b/distro/deb/debian/clean
@@ -1,4 +1,4 @@
 doc/kresd.8
 libkres.pc
 lib/libkres.a
-lib/libkres.so.6
+lib/libkres.so.7

diff --git a/distro/deb/debian/control b/distro/deb/debian/control
index d4fc69610f9c6dd96a6d2ac01c53b2ffd54984ab..da6fb312bb4d8293e5722b56657af6969ce8ec5d 100644 (file)
--- a/distro/deb/debian/control
+++ b/distro/deb/debian/control
@@ -16,17 +16,13 @@ Build-Depends:
  libedit-dev,
  libgeoip-dev,
  libgnutls28-dev,
- libhiredis-dev,
- libjansson-dev,
  libknot-dev (>= 2.6.4),
  liblmdb-dev,
  libluajit-5.1-dev,
- libmemcached-dev,
- libsystemd-dev (>= 227),
+ libsystemd-dev (>= 227) [linux-any],
  libuv1-dev,
  luajit,
  pkg-config,
- python3,
 Homepage: https://www.knot-resolver.cz/
 Rules-Requires-Root: no
 

diff --git a/distro/deb/debian/copyright b/distro/deb/debian/copyright
index bc5269e636ddee109644c71563110b55e89cf6ac..2d0b0b21de33d74288081c14ed681f24974fc3f1 100644 (file)
--- a/distro/deb/debian/copyright
+++ b/distro/deb/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: knot-resolver
 Source: https://www.knot-resolver.cz/
 
 Files: *
-Copyright: 2015 CZ.NIC
+Copyright: 2015-2018 CZ.NIC
 License: GPL-3.0+
 
 Files: contrib/ccan/asprintf/*
@@ -40,7 +40,7 @@ License: BSD-3-clause
 
 Files: contrib/murmurhash3/*
 Copyright: Austin Appleby
-License: public-domain
+License: CC0-1.0
 
 Files: debian/missing-sources/dygraph-combined.js
  modules/http/static/dygraph-combined.js
@@ -440,3 +440,14 @@ License: OpenLDAP
  holders.
  .
  OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+License: CC0-1.0
+ This work is licensed under the "Creative Commons Zero" license.
+ .
+ On debian systems, a copy of the Creative Commons Zero license may be
+ found at /usr/share/common-licenses/CC0-1.0.
+
+License: public-domain
+ This work has been released into the public domain.  The map
+ implementation builds off of prior public domain work from Dan
+ Bernstein (qhasm) and Adam Langley (critbit).

diff --git a/distro/deb/debian/knot-resolver.postinst b/distro/deb/debian/knot-resolver.postinst
index b57d88fdfb18dd1569bfe1d34a75090d7f5d4733..7c4bc5b64a561e59fe711d365875f81b6edde8cc 100644 (file)
--- a/distro/deb/debian/knot-resolver.postinst
+++ b/distro/deb/debian/knot-resolver.postinst
@@ -19,4 +19,12 @@ if [ "$1" = "triggered" ]; then
     exit 0
 fi
 
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
+    if [ -d /run/systemd/system ]; then
+        systemctl try-restart 'kresd@*.service' || true
+    else
+        invoke-rc.d kresd try-restart || true
+    fi
+fi
+
 #DEBHELPER#

diff --git a/distro/deb/debian/rules b/distro/deb/debian/rules
index 8f6091317ca570caf5a63e18276ad8b57cb13873..758f30c765c225a1538ecd828fe5cbff8f4ff3ff 100755 (executable)
--- a/distro/deb/debian/rules
+++ b/distro/deb/debian/rules
@@ -42,9 +42,8 @@ override_dh_auto_build-indep:
        cd doc && sphinx-build -b html -D html_theme=nature . html
 
 override_dh_auto_install-arch:
-       dh_auto_install --destdir=debian/tmp -- V=1
-       rm debian/tmp/etc/knot-resolver/icann-ca.pem
-       rm debian/tmp/etc/knot-resolver/root.hints
+       dh_auto_install --destdir=debian/tmp -- V=1 KEYFILE_DEFAULT=/usr/share/dns/root.key
+       rm -f debian/tmp/etc/knot-resolver/root.hints debian/tmp/etc/knot-resolver/icann-ca.pem
 
 override_dh_auto_install-indep:
 # install just the http/2 module