Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package unbound
[ Reason ]
There was a small bug in one of the package scripts (#1019140)
which results in unbound being unable to start (and package
failure) depending on the system configuration (quite common
configurations are affected). I hoped do fix this issue together
with another unbound package upload but forgot about that one,
and the issue went into the freeze period.
[ Impact ]
System upgrade failure or unbound failing to startup in
certain configurations.
[ Tests ]
The issue is well-located so it was easy to verify the bug is
fixed after the change. The whole thing is rather trivial.
[ Risks ]
The thing is trivial once you see what's going on.
And the change is trivial too, see the (helper) startup script
diff below.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock unbound/1.17.1-2
diff -Nru unbound-1.17.1/debian/changelog unbound-1.17.1/debian/changelog
--- unbound-1.17.1/debian/changelog 2023-01-12 18:28:54.000000000 +0300
+++ unbound-1.17.1/debian/changelog 2023-04-09 15:59:14.000000000 +0300
@@ -1,3 +1,10 @@
+unbound (1.17.1-2) unstable; urgency=medium
+
+ * unbound-helper: return 0 explicitly in a few places
+ (Closes: #1019140)
+
+ -- Michael Tokarev <m...@tls.msk.ru> Sun, 09 Apr 2023 15:59:14 +0300
+
unbound (1.17.1-1) unstable; urgency=medium
[ Michael Tokarev ]
diff -Nru unbound-1.17.1/debian/unbound-helper
unbound-1.17.1/debian/unbound-helper
--- unbound-1.17.1/debian/unbound-helper 2022-08-12 13:04:20.000000000
+0300
+++ unbound-1.17.1/debian/unbound-helper 2023-01-12 18:49:26.000000000
+0300
@@ -24,7 +24,7 @@
fi
do_resolvconf_start() {
- [ false != "$RESOLVCONF" -a -x /sbin/resolvconf ] || return
+ [ false != "$RESOLVCONF" -a -x /sbin/resolvconf ] || return 0
unbound-checkconf $CHROOT_DIR/$UNBOUND_CONF -o interface | {
default=yes
@@ -44,13 +44,13 @@
}
do_resolvconf_stop() {
- [ false != "$RESOLVCONF" -a -x /sbin/resolvconf ] || return
+ [ false != "$RESOLVCONF" -a -x /sbin/resolvconf ] || return 0
/sbin/resolvconf -d lo.unbound
}
do_chroot_setup() {
- [ -n "$CHROOT_DIR" -a -d "$CHROOT_DIR" ] || return
+ [ -n "$CHROOT_DIR" -a -d "$CHROOT_DIR" ] || return 0
if [ "$CHROOT_DIR" != "$UNBOUND_BASE_DIR" ]; then
# we probably should not do the force-recreate but just a refresh
rm -rf "$CHROOT_DIR/$UNBOUND_BASE_DIR"
