[Pkg-utopia-commits] r1191 - packages/unstable/avahi/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-12-27 22:43:13 +0100 (Wed, 27 Dec 2006)
New Revision: 1191

Added:
   packages/unstable/avahi/debian/avahi-daemon.ifupdown
Modified:
   packages/unstable/avahi/debian/avahi-daemon.links
   packages/unstable/avahi/debian/changelog
   packages/unstable/avahi/debian/rules
Log:
* Add ifupdown up and post-down hooks to disable avahi if there is a .local
  unicast domain. Based on work from the Ubuntu package by Martin Pitt.

Added: packages/unstable/avahi/debian/avahi-daemon.ifupdown
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.ifupdown	2006-12-26 00:23:09 UTC (rev 1190)
+++ packages/unstable/avahi/debian/avahi-daemon.ifupdown	2006-12-27 21:43:13 UTC (rev 1191)
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# If we have an unicast .local domain, we immediately disable avahi to avoid
+# conflicts with the multicast IP4LL .local domain
+DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local"
+OUT=`LC_ALL=C host -t soa local. 2>&1`
+if [ $? -eq 0 ] && echo "$OUT" | egrep -vq 'has no|not found'; then
+    if [ -x /etc/init.d/avahi-daemon ]; then
+        /etc/init.d/avahi-daemon stop || true
+    fi
+    if [ -d /var/run/avahi-daemon ]; then
+        touch $DISABLE_TAG
+    fi
+    exit 0
+else
+    # no unicast .local conflict, so remove the tag and start avahi again
+    if [ -e $DISABLE_TAG ]; then
+        rm -f $DISABLE_TAG
+        if [ -x /etc/init.d/avahi-daemon ]; then
+            /etc/init.d/avahi-daemon start || true
+        fi
+    fi
+fi


Property changes on: packages/unstable/avahi/debian/avahi-daemon.ifupdown
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/unstable/avahi/debian/avahi-daemon.links
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.links	2006-12-26 00:23:09 UTC (rev 1190)
+++ packages/unstable/avahi/debian/avahi-daemon.links	2006-12-27 21:43:13 UTC (rev 1191)
@@ -1 +1,2 @@
 etc/init.d/avahi-daemon etc/dbus-1/event.d/25avahi-daemon
+etc/network/if-up.d/avahi-daemon etc/network/if-post-down.d/avahi-daemon

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-12-26 00:23:09 UTC (rev 1190)
+++ packages/unstable/avahi/debian/changelog	2006-12-27 21:43:13 UTC (rev 1191)
@@ -1,3 +1,10 @@
+avahi (0.6.15-3) unstable; urgency=low
+
+  * Add ifupdown up and post-down hooks to disable avahi if there is a .local
+    unicast domain. Based on work from the Ubuntu package by Martin Pitt.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 27 Dec 2006 22:09:03 +0100
+
 avahi (0.6.15-2) unstable; urgency=low
 
   * debian/patches/12_dbus1.0.patch:

Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules	2006-12-26 00:23:09 UTC (rev 1190)
+++ packages/unstable/avahi/debian/rules	2006-12-27 21:43:13 UTC (rev 1191)
@@ -47,6 +47,12 @@
 	install -D -o root -g root -m 755 debian/avahi-autoipd.ifdown \
 		debian/$(cdbs_curpkg)/etc/network/if-down.d/avahi-autoipd
 
+install/avahi-daemon::
+	install -D -o root -g root -m 755 debian/avahi-daemon.ifupdown \
+		debian/$(cdbs_curpkg)/etc/network/if-up.d/avahi-daemon
+	install -D -o root -g root -m 755 debian/avahi-daemon.ifupdown \
+		debian/$(cdbs_curpkg)/etc/network/if-post-down.d/avahi-daemon
+
 common-install-impl::
 	mv $(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/avahi-autoipd \
 		$(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/zzz_avahi-autoipd