Merge ~paelzer/ubuntu/+source/unbound:lp-1788622-fix-unbound-systemd-reload into ubuntu/+source/unbound:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Test Descriptions in the SRU Template at bug: https://bugs.launchpad.net/ubuntu/+source/unbound/+bug/1788622
Test PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3382

Reivew-Note: there is some magic in
  $ cat debian/source/options
  single-debian-patch
To work with git ubuntu "the usual" way we have to prepend the patch in debian/patch/series before the generic "debian-changes". Otherwise it would be double included and fail to build.

[Andreas Hasenack (ahasenack)]

+1, and TIL about single-debian-patch

Fix confirmed using the test from the SRU template.

review: Approve

[Christian Ehrhardt  (paelzer)]

There is another unbound SRU I was tempted to combine, but its test steps are not complete yet and one by one they will be easier for the SRU Team to review.
So uploading this - thanks for the review.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/unbound
 * [new tag] upload/1.6.7-1ubuntu2.2 -> upload/1.6.7-1ubuntu2.2

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading unbound_1.6.7-1ubuntu2.2.dsc: done.
  Uploading unbound_1.6.7-1ubuntu2.2.debian.tar.xz: done.
  Uploading unbound_1.6.7-1ubuntu2.2_source.buildinfo: done.
  Uploading unbound_1.6.7-1ubuntu2.2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 0e45455..e8b5c2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+unbound (1.6.7-1ubuntu2.2) bionic; urgency=medium
+
+  * d/p/lp-1788622-fix-systemd-reload.patch: Fix hang due to all worker threads
+    stopping on reload (LP: #1788622)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 27 Aug 2018 14:12:29 +0200
+
 unbound (1.6.7-1ubuntu2.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: vulnerability in the processing of wildcard
diff --git a/debian/patches/lp-1788622-fix-systemd-reload.patch b/debian/patches/lp-1788622-fix-systemd-reload.patch
new file mode 100644
index 0000000..ec50993
--- /dev/null
+++ b/debian/patches/lp-1788622-fix-systemd-reload.patch
@@ -0,0 +1,37 @@
+From 5106ad7a2c8460d5bb9cb619d360dfe1f259eac2 Mon Sep 17 00:00:00 2001
+From: Wouter Wijngaards <[e-mail]>
+Date: Thu, 21 Jun 2018 07:11:12 +0000
+Subject: [PATCH] - #4108: systemd reload hang fix.
+
+git-svn-id: file:///svn/unbound/trunk@4747 be551aaa-1e26-0410-a405-d3ace91eadb9
+
+Backport Note: This isn't released by upstream yet but on upstream
+master. Debian picked the fix a while ago, due to that it is in Cosmic
+already.
+
+Author: Christian Ehrhardt <[e-mail]>
+Original-Author: Wouter Wijngaards <[e-mail]>
+Origin: backport, https://github.com/NLnetLabs/unbound/commit/5106ad7a2c8460d5bb9cb619d360dfe1f259eac2
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1788622
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892914
+Last-Update: 2018-08-27
+
+---
+ daemon/daemon.c | 5 ++++-
+ doc/Changelog   | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+--- a/daemon/daemon.c
++++ b/daemon/daemon.c
+@@ -650,7 +650,10 @@ daemon_fork(struct daemon* daemon)
+ 	log_info("start of service (%s).", PACKAGE_STRING);
+ 	worker_work(daemon->workers[0]);
+ #ifdef HAVE_SYSTEMD
+-	sd_notify(0, "STOPPING=1");
++	if (daemon->workers[0]->need_to_exit)
++		sd_notify(0, "STOPPING=1");
++	else
++		sd_notify(0, "RELOADING=1");
+ #endif
+ 	log_info("service stopped (%s).", PACKAGE_STRING);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c21e312..597d6e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 CVE-2017-15105.patch
+lp-1788622-fix-systemd-reload.patch
 debian-changes