Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package avahi The main fix is making avahi-daemon compatible with the ifupdown changes that were introduced in wheezy. Without that, the boot process can be blocked by avahi-daemon when ifupdown runs if-up -a. The changelog: avahi (0.6.31-2) unstable; urgency=low * Use recommended maintscript versioning scheme. * The avahi-dnsconfd init script doesn't support reload but provides a refresh action, so list that instead in the usage help message. * Update ifupdown hooks for avahi-daemon and avahi-autoipd. Drop the usage of ADDRFAM=NetworkManager, since network-manager no longer uses that. Run avahi-daemon only for ADDRFAM inet and inet6. (Closes: #699749) -- Michael Biebl <bi...@debian.org> Wed, 06 Mar 2013 22:58:55 +0100 Full debdiff attached. Cheers, Michael unblock avahi/0.6.31-2 -- System Information: Debian Release: 7.0 APT prefers unstable APT policy: (500, 'unstable'), (200, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru avahi-0.6.31/debian/avahi-autoipd.if-down avahi-0.6.31/debian/avahi-autoipd.if-down --- avahi-0.6.31/debian/avahi-autoipd.if-down 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/avahi-autoipd.if-down 2013-03-06 23:04:59.000000000 +0100 @@ -13,12 +13,12 @@ [ "$IFACE" != "lo" ] || exit 0 case "$ADDRFAM" in - inet|NetworkManager) ;; - *) exit 0 + inet) ;; + *) exit 0 ;; esac case "$METHOD" in static|dhcp|NetworkManager) ;; - *) exit 0 + *) exit 0 ;; esac if [ -x /bin/ip ]; then diff -Nru avahi-0.6.31/debian/avahi-autoipd.if-up avahi-0.6.31/debian/avahi-autoipd.if-up --- avahi-0.6.31/debian/avahi-autoipd.if-up 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/avahi-autoipd.if-up 2013-03-06 23:04:59.000000000 +0100 @@ -11,13 +11,13 @@ [ "$IFACE" != "lo" ] || exit 0 case "$ADDRFAM" in - inet|NetworkManager) ;; - *) exit 0 + inet) ;; + *) exit 0 ;; esac case "$METHOD" in static|dhcp|NetworkManager) ;; - *) exit 0 + *) exit 0 ;; esac diff -Nru avahi-0.6.31/debian/avahi-autoipd.maintscript avahi-0.6.31/debian/avahi-autoipd.maintscript --- avahi-0.6.31/debian/avahi-autoipd.maintscript 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/avahi-autoipd.maintscript 2013-03-06 23:04:59.000000000 +0100 @@ -1,2 +1,2 @@ -mv_conffile /etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd /etc/dhcp/dhclient-enter-hooks.d/avahi-autoipd 0.6.25-3 avahi-autoipd -mv_conffile /etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd /etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd 0.6.25-3 avahi-autoipd +mv_conffile /etc/dhcp3/dhclient-enter-hooks.d/avahi-autoipd /etc/dhcp/dhclient-enter-hooks.d/avahi-autoipd 0.6.25-4~ avahi-autoipd +mv_conffile /etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd /etc/dhcp/dhclient-exit-hooks.d/zzz_avahi-autoipd 0.6.25-4~ avahi-autoipd diff -Nru avahi-0.6.31/debian/avahi-daemon.if-up avahi-0.6.31/debian/avahi-daemon.if-up --- avahi-0.6.31/debian/avahi-daemon.if-up 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/avahi-daemon.if-up 2013-03-06 23:04:59.000000000 +0100 @@ -4,9 +4,13 @@ # the loopback device; it's not necessary until we bring up a real network # device [ "$IFACE" != "lo" ] || exit 0 +case "$ADDRFAM" in + inet|inet6) ;; + *) exit 0 ;; +esac # If we have an unicast .local domain, we immediately disable avahi to avoid # conflicts with the multicast IP4LL .local domain if [ -x /usr/lib/avahi/avahi-daemon-check-dns.sh ] ; then - exec /usr/lib/avahi/avahi-daemon-check-dns.sh + exec /usr/lib/avahi/avahi-daemon-check-dns.sh fi diff -Nru avahi-0.6.31/debian/avahi-dnsconfd.init avahi-0.6.31/debian/avahi-dnsconfd.init --- avahi-0.6.31/debian/avahi-dnsconfd.init 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/avahi-dnsconfd.init 2013-03-06 23:04:59.000000000 +0100 @@ -88,7 +88,7 @@ d_status ;; *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|refresh}" >&2 exit 1 ;; esac diff -Nru avahi-0.6.31/debian/avahi-dnsconfd.maintscript avahi-0.6.31/debian/avahi-dnsconfd.maintscript --- avahi-0.6.31/debian/avahi-dnsconfd.maintscript 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/avahi-dnsconfd.maintscript 2013-03-06 23:04:59.000000000 +0100 @@ -1 +1 @@ -rm_conffile /etc/default/avahi-dnsconfd 0.6.25-4 avahi-dnsconfd +rm_conffile /etc/default/avahi-dnsconfd 0.6.26-1~ avahi-dnsconfd diff -Nru avahi-0.6.31/debian/changelog avahi-0.6.31/debian/changelog --- avahi-0.6.31/debian/changelog 2012-03-04 05:24:07.000000000 +0100 +++ avahi-0.6.31/debian/changelog 2013-03-06 23:04:59.000000000 +0100 @@ -1,3 +1,14 @@ +avahi (0.6.31-2) unstable; urgency=low + + * Use recommended maintscript versioning scheme. + * The avahi-dnsconfd init script doesn't support reload but provides a + refresh action, so list that instead in the usage help message. + * Update ifupdown hooks for avahi-daemon and avahi-autoipd. Drop the usage + of ADDRFAM=NetworkManager, since network-manager no longer uses that. Run + avahi-daemon only for ADDRFAM inet and inet6. (Closes: #699749) + + -- Michael Biebl <bi...@debian.org> Wed, 06 Mar 2013 22:58:55 +0100 + avahi (0.6.31-1) unstable; urgency=low * New upstream release.