[Pkg-utopia-maintainers] Bug#852256: #661591 for avahi-autoipd

[Christian Hofstaedtler]

Control: tags -1 + patch pending

Dear avahi Maintainers,

I propose to apply the following patch to src:avahi to make this bug
go away.

I'll also upload an NMU to DELAYED/1 given the timing. Feel free to
cancel that.

  -ch

-------------- next part --------------
diff -Nru avahi-0.6.32/debian/changelog avahi-0.6.32/debian/changelog
--- avahi-0.6.32/debian/changelog	2016-06-27 20:54:15.000000000 +0000
+++ avahi-0.6.32/debian/changelog	2017-01-22 21:44:58.000000000 +0000
@@ -1,3 +1,11 @@
+avahi (0.6.32-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Ensure dhclient hook exits with 0 even if avahi-autoipd was not running
+    (Closes: #852256)
+
+ -- Christian Hofstaedtler <zeha at debian.org>  Sun, 22 Jan 2017 21:44:58 +0000
+
 avahi (0.6.32-1) unstable; urgency=medium
 
   [ Michael Biebl ]
diff -Nru avahi-0.6.32/debian/patches/0001-avahi-autoipd-fix-dhclient-hooks-to-check-for-avahi-.patch avahi-0.6.32/debian/patches/0001-avahi-autoipd-fix-dhclient-hooks-to-check-for-avahi-.patch
--- avahi-0.6.32/debian/patches/0001-avahi-autoipd-fix-dhclient-hooks-to-check-for-avahi-.patch	2016-06-27 20:54:15.000000000 +0000
+++ avahi-0.6.32/debian/patches/0001-avahi-autoipd-fix-dhclient-hooks-to-check-for-avahi-.patch	2017-01-22 21:44:58.000000000 +0000
@@ -19,12 +19,13 @@
 index a746856..c814f2b 100755
 --- a/avahi-autoipd/dhclient-enter-hook.in
 +++ b/avahi-autoipd/dhclient-enter-hook.in
-@@ -22,7 +22,7 @@ case "$reason" in
+@@ -22,7 +23,8 @@ case "$reason" in
          ;;
  
      PREINIT|BOUND|RENEW|REBIND|REBOOT|STOP|RELEASE)
 -        @sbindir@/avahi-autoipd -k $interface 2> /dev/null
 +        [ ! -x @sbindir@/avahi-autoipd ] || @sbindir@/avahi-autoipd -k $interface 2> /dev/null
++        true  # Ensure exit code 0 even if avahi-autoipd was not running before.
          ;;
      
      EXPIRE|FAIL|TIMEOUT)