Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Adam D. Barratt]

Control: tags -1 + pending

On Sun, 2016-08-07 at 13:34 -0400, Robert Edmonds wrote:
> Adam D. Barratt wrote:
> > On Mon, 2016-07-04 at 16:11 -0400, Robert Edmonds wrote:
> > > +unbound (1.4.22-3+deb8u2) jessie; urgency=medium
> > > +
> > > +  * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
> > > +  * debian/unbound.init: Call start-stop-daemon with --retry for 'stop'
> > > +action (patch from Julien Cristau)
> > 
> > Sorry for the delay in getting back to you; please go ahead.
> 
> Uploaded. Thanks!

Flagged for acceptance into p-u.

Regards,

Adam

Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Robert Edmonds]

Adam D. Barratt wrote:
> On Mon, 2016-07-04 at 16:11 -0400, Robert Edmonds wrote:
> > +unbound (1.4.22-3+deb8u2) jessie; urgency=medium
> > +
> > +  * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
> > +  * debian/unbound.init: Call start-stop-daemon with --retry for 'stop'
> > +action (patch from Julien Cristau)
> 
> Sorry for the delay in getting back to you; please go ahead.

Uploaded. Thanks!

-- 
Robert Edmonds
edmo...@debian.org

Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Adam D. Barratt]

Control: tags -1 + confirmed

On Mon, 2016-07-04 at 16:11 -0400, Robert Edmonds wrote:
> Robert Edmonds wrote:
> > Julien Cristau wrote:
> > > May I take the opportunity to ask you to also fix the 'stop' action from
> > > the init script?
> > > 
> > > We've been using this patch on the debian.org hosts for a year now.
[...]
> +unbound (1.4.22-3+deb8u2) jessie; urgency=medium
> +
> +  * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
> +  * debian/unbound.init: Call start-stop-daemon with --retry for 'stop'
> +action (patch from Julien Cristau)

Sorry for the delay in getting back to you; please go ahead.

Regards,

Adam

Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Robert Edmonds]

Robert Edmonds wrote:
> Julien Cristau wrote:
> > May I take the opportunity to ask you to also fix the 'stop' action from
> > the init script?
> > 
> > We've been using this patch on the debian.org hosts for a year now.
> > Previously restarting the service would quite often result in no running
> > unbound, because (AIUI) systemd doesn't use the init script 'restart'
> > action (uses stop && start instead), the 'stop' action would not wait
> > for the process to actually die before returning, and then 'start' would
> > say "I'm already running, nothing to do".
> 
> Wow, thanks for pointing that out. Yes, I'd be happy to fix that one too
> in a stable update.

Here is the updated debdiff for the package I'd like to upload to
jessie.

diff -Nru unbound-1.4.22/debian/changelog unbound-1.4.22/debian/changelog
--- unbound-1.4.22/debian/changelog 2016-02-21 18:43:22.0 -0500
+++ unbound-1.4.22/debian/changelog 2016-07-04 15:58:35.0 -0400
@@ -1,3 +1,11 @@
+unbound (1.4.22-3+deb8u2) jessie; urgency=medium
+
+  * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
+  * debian/unbound.init: Call start-stop-daemon with --retry for 'stop'
+action (patch from Julien Cristau)
+
+ -- Robert Edmonds   Mon, 04 Jul 2016 15:58:01 -0400
+
 unbound (1.4.22-3+deb8u1) jessie; urgency=medium
 
   * iterator/iter_hints.c: Update hints for H.ROOT-SERVERS.NET
diff -Nru unbound-1.4.22/debian/patches/debian-changes 
unbound-1.4.22/debian/patches/debian-changes
--- unbound-1.4.22/debian/patches/debian-changes2016-02-22 
10:58:04.0 -0500
+++ unbound-1.4.22/debian/patches/debian-changes2016-07-04 
16:06:41.0 -0400
@@ -5,12 +5,13 @@
  information below has been extracted from the changelog. Adjust it or drop
  it.
  .
- unbound (1.4.22-3+deb8u1) jessie; urgency=medium
+ unbound (1.4.22-3+deb8u2) jessie; urgency=medium
  .
-   * iterator/iter_hints.c: Update hints for H.ROOT-SERVERS.NET
- (Closes: #815370)
+   * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
+   * debian/unbound.init: Call start-stop-daemon with --retry for 'stop'
+ action (patch from Julien Cristau)
 Author: Robert Edmonds 
-Bug-Debian: https://bugs.debian.org/815370
+Bug-Debian: https://bugs.debian.org/807132
 
 ---
 The information above should follow the Patch Tagging Guidelines, please
@@ -23,7 +24,7 @@
 Bug-Ubuntu: https://launchpad.net/bugs/
 Forwarded: 
 Reviewed-By: 
-Last-Update: 
+Last-Update: 2016-07-04
 
 --- unbound-1.4.22.orig/acx_python.m4
 +++ unbound-1.4.22/acx_python.m4
diff -Nru unbound-1.4.22/debian/unbound.init unbound-1.4.22/debian/unbound.init
--- unbound-1.4.22/debian/unbound.init  2016-02-21 18:43:22.0 -0500
+++ unbound-1.4.22/debian/unbound.init  2016-07-04 15:58:35.0 -0400
@@ -7,6 +7,7 @@
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
 ### END INIT INFO
+# pidfile: /run/unbound.pid
 
 NAME=unbound
 DESC="recursive DNS server"
@@ -121,7 +122,7 @@
 stop)
 if $UNBOUND_ENABLE; then
 log_daemon_msg "Stopping $DESC" "$NAME"
-if start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
--name $NAME; then
+if start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
--name $NAME --retry 5; then
 do_resolvconf_stop
 log_end_msg 0
 else

-- 
Robert Edmonds
edmo...@debian.org

Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Robert Edmonds]

Julien Cristau wrote:
> May I take the opportunity to ask you to also fix the 'stop' action from
> the init script?
> 
> We've been using this patch on the debian.org hosts for a year now.
> Previously restarting the service would quite often result in no running
> unbound, because (AIUI) systemd doesn't use the init script 'restart'
> action (uses stop && start instead), the 'stop' action would not wait
> for the process to actually die before returning, and then 'start' would
> say "I'm already running, nothing to do".

Wow, thanks for pointing that out. Yes, I'd be happy to fix that one too
in a stable update.

> --- /tmp/unbound-1.4.22/debian/unbound.init 2016-02-22 01:43:22.0 
> +0200
> +++ modules/unbound/files/unbound.init  2015-05-17 16:50:09.699383800 +0200
> @@ -121,7 +121,7 @@
>  stop)
>  if $UNBOUND_ENABLE; then
>  log_daemon_msg "Stopping $DESC" "$NAME"
> -if start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
> --name $NAME; then
> +if start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
> --name $NAME --retry 5; then
>  do_resolvconf_stop
>  log_end_msg 0
>  else
> 
> Cheers,
> Julien

-- 
Robert Edmonds
edmo...@debian.org

Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Julien Cristau]

On Sat, Jun 25, 2016 at 15:53:18 -0400, Robert Edmonds wrote:

> Package: release.debian.org
> Severity: normal
> Tags: jessie
> User: release.debian@packages.debian.org
> Usertags: pu
> 
> Hi,
> 
> The unbound package in jessie is affected by #807132 ("unbound-control
> breaks systemctl stop/start"). The bug report is long, but briefly, the
> unbound daemon can fail to start in several common scenarios, such as
> when the "unbound-control" utility is used to stop the daemon. One user
> reports that the unbound daemon is stopped but not subsequently started
> every time the unbound package is upgraded. This bug has been fixed in
> unstable by 1.5.9-1 and is currently marked severity important, though
> in my opinion this bug is severe enough to make it unsuitable for a
> release.
> 
> The fix for this is shown below and is relatively simple, and was
> suggested by a member of the pkg-systemd team (Michael Biebl).
> 
> I'd like to upload this to jessie.
> 
May I take the opportunity to ask you to also fix the 'stop' action from
the init script?

We've been using this patch on the debian.org hosts for a year now.
Previously restarting the service would quite often result in no running
unbound, because (AIUI) systemd doesn't use the init script 'restart'
action (uses stop && start instead), the 'stop' action would not wait
for the process to actually die before returning, and then 'start' would
say "I'm already running, nothing to do".

--- /tmp/unbound-1.4.22/debian/unbound.init 2016-02-22 01:43:22.0 
+0200
+++ modules/unbound/files/unbound.init  2015-05-17 16:50:09.699383800 +0200
@@ -121,7 +121,7 @@
 stop)
 if $UNBOUND_ENABLE; then
 log_daemon_msg "Stopping $DESC" "$NAME"
-if start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
--name $NAME; then
+if start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE 
--name $NAME --retry 5; then
 do_resolvconf_stop
 log_end_msg 0
 else

Cheers,
Julien

Bug#828177: jessie-pu: package unbound/1.4.22-3+deb8u2

[Robert Edmonds]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu

Hi,

The unbound package in jessie is affected by #807132 ("unbound-control
breaks systemctl stop/start"). The bug report is long, but briefly, the
unbound daemon can fail to start in several common scenarios, such as
when the "unbound-control" utility is used to stop the daemon. One user
reports that the unbound daemon is stopped but not subsequently started
every time the unbound package is upgraded. This bug has been fixed in
unstable by 1.5.9-1 and is currently marked severity important, though
in my opinion this bug is severe enough to make it unsuitable for a
release.

The fix for this is shown below and is relatively simple, and was
suggested by a member of the pkg-systemd team (Michael Biebl).

I'd like to upload this to jessie.

Thanks!

diff -Nru unbound-1.4.22/debian/changelog unbound-1.4.22/debian/changelog
--- unbound-1.4.22/debian/changelog 2016-02-21 18:43:22.0 -0500
+++ unbound-1.4.22/debian/changelog 2016-06-25 14:49:32.0 -0400
@@ -1,3 +1,9 @@
+unbound (1.4.22-3+deb8u2) jessie; urgency=medium
+
+  * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
+
+ -- Robert Edmonds   Sat, 25 Jun 2016 14:49:31 -0400
+
 unbound (1.4.22-3+deb8u1) jessie; urgency=medium
 
   * iterator/iter_hints.c: Update hints for H.ROOT-SERVERS.NET
diff -Nru unbound-1.4.22/debian/patches/debian-changes 
unbound-1.4.22/debian/patches/debian-changes
--- unbound-1.4.22/debian/patches/debian-changes2016-02-22 
10:58:04.0 -0500
+++ unbound-1.4.22/debian/patches/debian-changes2016-06-25 
14:50:22.0 -0400
@@ -5,12 +5,11 @@
  information below has been extracted from the changelog. Adjust it or drop
  it.
  .
- unbound (1.4.22-3+deb8u1) jessie; urgency=medium
+ unbound (1.4.22-3+deb8u2) jessie; urgency=medium
  .
-   * iterator/iter_hints.c: Update hints for H.ROOT-SERVERS.NET
- (Closes: #815370)
+   * debian/unbound.init: Add "pidfile" magic comment (Closes: #807132)
 Author: Robert Edmonds 
-Bug-Debian: https://bugs.debian.org/815370
+Bug-Debian: https://bugs.debian.org/807132
 
 ---
 The information above should follow the Patch Tagging Guidelines, please
diff -Nru unbound-1.4.22/debian/unbound.init unbound-1.4.22/debian/unbound.init
--- unbound-1.4.22/debian/unbound.init  2016-02-21 18:43:22.0 -0500
+++ unbound-1.4.22/debian/unbound.init  2016-06-25 14:49:32.0 -0400
@@ -7,6 +7,7 @@
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
 ### END INIT INFO
+# pidfile: /run/unbound.pid
 
 NAME=unbound
 DESC="recursive DNS server"

-- 
Robert Edmonds
edmo...@debian.org


signature.asc
Description: PGP signature