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

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 38d1dd2f178688ca7677e30a8df3ad7a762c8150
Merged at revision: 38d1dd2f178688ca7677e30a8df3ad7a762c8150
Proposed branch: ~paelzer/ubuntu/+source/unbound:lp-1788622-fix-unbound-systemd-reload
Merge into: ubuntu/+source/unbound:ubuntu/bionic-devel
Diff against target: 66 lines (+45/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/lp-1788622-fix-systemd-reload.patch (+37/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Canonical Server packageset reviewers Pending
git-ubuntu developers Pending
Review via email: mp+353786@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1, and TIL about single-debian-patch

Fix confirmed using the test from the SRU template.

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 0e45455..e8b5c2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1unbound (1.6.7-1ubuntu2.2) bionic; urgency=medium
2
3 * d/p/lp-1788622-fix-systemd-reload.patch: Fix hang due to all worker threads
4 stopping on reload (LP: #1788622)
5
6 -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 27 Aug 2018 14:12:29 +0200
7
1unbound (1.6.7-1ubuntu2.1) bionic-security; urgency=medium8unbound (1.6.7-1ubuntu2.1) bionic-security; urgency=medium
29
3 * SECURITY UPDATE: vulnerability in the processing of wildcard10 * 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
4new file mode 10064411new file mode 100644
index 0000000..ec50993
--- /dev/null
+++ b/debian/patches/lp-1788622-fix-systemd-reload.patch
@@ -0,0 +1,37 @@
1From 5106ad7a2c8460d5bb9cb619d360dfe1f259eac2 Mon Sep 17 00:00:00 2001
2From: Wouter Wijngaards <wouter@nlnetlabs.nl>
3Date: Thu, 21 Jun 2018 07:11:12 +0000
4Subject: [PATCH] - #4108: systemd reload hang fix.
5
6git-svn-id: file:///svn/unbound/trunk@4747 be551aaa-1e26-0410-a405-d3ace91eadb9
7
8Backport Note: This isn't released by upstream yet but on upstream
9master. Debian picked the fix a while ago, due to that it is in Cosmic
10already.
11
12Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
13Original-Author: Wouter Wijngaards <wouter@nlnetlabs.nl>
14Origin: backport, https://github.com/NLnetLabs/unbound/commit/5106ad7a2c8460d5bb9cb619d360dfe1f259eac2
15Bug-Ubuntu: https://bugs.launchpad.net/bugs/1788622
16Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=892914
17Last-Update: 2018-08-27
18
19---
20 daemon/daemon.c | 5 ++++-
21 doc/Changelog | 3 +++
22 2 files changed, 7 insertions(+), 1 deletion(-)
23
24--- a/daemon/daemon.c
25+++ b/daemon/daemon.c
26@@ -650,7 +650,10 @@ daemon_fork(struct daemon* daemon)
27 log_info("start of service (%s).", PACKAGE_STRING);
28 worker_work(daemon->workers[0]);
29 #ifdef HAVE_SYSTEMD
30- sd_notify(0, "STOPPING=1");
31+ if (daemon->workers[0]->need_to_exit)
32+ sd_notify(0, "STOPPING=1");
33+ else
34+ sd_notify(0, "RELOADING=1");
35 #endif
36 log_info("service stopped (%s).", PACKAGE_STRING);
37
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 @@
1CVE-2017-15105.patch1CVE-2017-15105.patch
2lp-1788622-fix-systemd-reload.patch
2debian-changes3debian-changes

Subscribers

People subscribed via source and target branches