[Pkg-utopia-commits] r1198 - in packages/unstable/avahi/debian: .
patches
Sjoerd Simons
sjoerd at alioth.debian.org
Wed Jan 3 12:22:38 CET 2007
Author: sjoerd
Date: 2007-01-03 12:22:37 +0100 (Wed, 03 Jan 2007)
New Revision: 1198
Added:
packages/unstable/avahi/debian/avahi-daemon.resolvconf
packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch
packages/unstable/avahi/debian/patches/03_avahi-daemon-init-unicast-disable.patch
Removed:
packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch
Modified:
packages/unstable/avahi/debian/avahi-daemon.ifupdown
packages/unstable/avahi/debian/changelog
packages/unstable/avahi/debian/rules
Log:
* debian/patches/02_avahi-daemon-init-unicast-disable.patch
- Renamed to 03_avahi-daemon-init-unicast-disable.patch
* debian/patches/02_avahi-init-warn.patch
- Added. Output a warning if avahi-daemon or avahi-dnsconfd are disabled
via /etc/default (Thanks Laurent Bigonville) (Closes: #405375)
* debian/patches/03_avahi-daemon-init-unicast-disable.patch
- Add a warning if avahi-daemon isn't started because of the presence of a
unicast .local domain.
* debian/avahi-daemon.ifupdown
- Log to syslog if disabling avahi.
- Don't run if resolvconf is installed
* debian/avahi-daemon.resolvconf
- Added. Hook script for resolvconf
Modified: packages/unstable/avahi/debian/avahi-daemon.ifupdown
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.ifupdown 2007-01-02 18:19:38 UTC (rev 1197)
+++ packages/unstable/avahi/debian/avahi-daemon.ifupdown 2007-01-03 11:22:37 UTC (rev 1198)
@@ -4,10 +4,25 @@
# conflicts with the multicast IP4LL .local domain
DISABLE_TAG_DIR="/var/run/avahi-daemon/"
DISABLE_TAG="$DISABLE_TAG_DIR/disabled-for-unicast-local"
+
+# Bail out if resolvconf is installed
+[ -x /sbin/resolvconf ] && exit 0
+
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
+ if [ -x /usr/bin/logger ]; then
+ logger -p daemon.warning -t avahi <<EOF
+Avahi detected that your currently configured local DNS server serves
+a domain .local. This is inherently incompatible with Avahi and thus
+Avahi disabled itself. If you want to use Avahi in this network, please
+contact your administrator and convince him to use a different DNS domain,
+since .local should be used exclusively for Zeroconf technology.
+For more information, see http://avahi.org/wiki/AvahiAndUnicastDotLocal
+EOF
+ fi
fi
mkdir -p ${DISABLE_TAG_DIR}
touch ${DISABLE_TAG}
Added: packages/unstable/avahi/debian/avahi-daemon.resolvconf
===================================================================
--- packages/unstable/avahi/debian/avahi-daemon.resolvconf 2007-01-02 18:19:38 UTC (rev 1197)
+++ packages/unstable/avahi/debian/avahi-daemon.resolvconf 2007-01-03 11:22:37 UTC (rev 1198)
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# If we have an unicast .local domain, we immediately disable avahi to avoid
+# conflicts with the multicast IP4LL .local domain
+DISABLE_TAG_DIR="/var/run/avahi-daemon/"
+DISABLE_TAG="$DISABLE_TAG_DIR/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
+ if [ -x /usr/bin/logger ]; then
+ logger -p daemon.warning -t avahi <<EOF
+Avahi detected that your currently configured local DNS server serves
+a domain .local. This is inherently incompatible with Avahi and thus
+Avahi disabled itself. If you want to use Avahi in this network, please
+contact your administrator and convince him to use a different DNS domain,
+since .local should be used exclusively for Zeroconf technology.
+For more information, see http://avahi.org/wiki/AvahiAndUnicastDotLocal
+EOF
+ fi
+ fi
+ mkdir -p ${DISABLE_TAG_DIR}
+ touch ${DISABLE_TAG}
+ 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.resolvconf
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog 2007-01-02 18:19:38 UTC (rev 1197)
+++ packages/unstable/avahi/debian/changelog 2007-01-03 11:22:37 UTC (rev 1198)
@@ -1,3 +1,21 @@
+avahi (0.6.16-2) unstable; urgency=low
+
+ * debian/patches/02_avahi-daemon-init-unicast-disable.patch
+ - Renamed to 03_avahi-daemon-init-unicast-disable.patch
+ * debian/patches/02_avahi-init-warn.patch
+ - Added. Output a warning if avahi-daemon or avahi-dnsconfd are disabled
+ via /etc/default (Thanks Laurent Bigonville) (Closes: #405375)
+ * debian/patches/03_avahi-daemon-init-unicast-disable.patch
+ - Add a warning if avahi-daemon isn't started because of the presence of a
+ unicast .local domain.
+ * debian/avahi-daemon.ifupdown
+ - Log to syslog if disabling avahi.
+ - Don't run if resolvconf is installed
+ * debian/avahi-daemon.resolvconf
+ - Added. Hook script for resolvconf
+
+ -- Sjoerd Simons <sjoerd at debian.org> Wed, 3 Jan 2007 11:22:59 +0100
+
avahi (0.6.16-1) unstable; urgency=low
* New upstream release
Deleted: packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch 2007-01-02 18:19:38 UTC (rev 1197)
+++ packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch 2007-01-03 11:22:37 UTC (rev 1198)
@@ -1,23 +0,0 @@
---- avahi-0.6.16/initscript/debian/avahi-daemon.in.orig 2006-12-28 20:24:35.000000000 +0100
-+++ avahi-0.6.16/initscript/debian/avahi-daemon.in 2006-12-28 20:26:17.000000000 +0100
-@@ -26,6 +26,8 @@
- # Authors: <sebastien.estienne at gmail.com>
- #
-
-+DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local"
-+
- if [ -f /lib/lsb/init-functions ]
- then
- . /lib/lsb/init-functions
-@@ -104,6 +106,11 @@
-
- $DAEMON -c && return 0
-
-+ if [ -e ${DISABLE_TAG} ]; then
-+ # Disabled because of the existance of an unicast .local domain
-+ return 1;
-+ fi;
-+
- if [ -s /etc/localtime ]; then
- if [ ! -d /etc/avahi/etc ]; then
- mkdir -p @sysconfdir@/avahi/etc >/dev/null 2>&1
Added: packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch 2007-01-02 18:19:38 UTC (rev 1197)
+++ packages/unstable/avahi/debian/patches/02_avahi-init-warn.patch 2007-01-03 11:22:37 UTC (rev 1198)
@@ -0,0 +1,56 @@
+diff -uar avahi-0.6.16.orig/initscript/debian/avahi-daemon.in avahi-0.6.16/initscript/debian/avahi-daemon.in
+--- avahi-0.6.16.orig/initscript/debian/avahi-daemon.in 2007-01-03 10:57:01.000000000 +0100
++++ avahi-0.6.16/initscript/debian/avahi-daemon.in 2007-01-03 10:57:20.000000000 +0100
+@@ -75,6 +75,16 @@
+ return $1
+ }
+
++ log_warning_msg () {
++ if log_use_fancy_output; then
++ YELLOW=`$TPUT setaf 3`
++ NORMAL=`$TPUT op`
++ echo "$YELLOW*$NORMAL $@"
++ else
++ echo "$@"
++ fi
++ }
++
+ fi
+
+ #set -e
+@@ -93,6 +103,7 @@
+ test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon
+
+ if [ "$AVAHI_DAEMON_START" != "1" -a "$1" != "stop" ]; then
++ log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
+diff -uar avahi-0.6.16.orig/initscript/debian/avahi-dnsconfd.in avahi-0.6.16/initscript/debian/avahi-dnsconfd.in
+--- avahi-0.6.16.orig/initscript/debian/avahi-dnsconfd.in 2007-01-03 10:57:01.000000000 +0100
++++ avahi-0.6.16/initscript/debian/avahi-dnsconfd.in 2007-01-03 10:57:20.000000000 +0100
+@@ -75,6 +75,16 @@
+ return $1
+ }
+
++ log_warning_msg () {
++ if log_use_fancy_output; then
++ YELLOW=`$TPUT setaf 3`
++ NORMAL=`$TPUT op`
++ echo "$YELLOW*$NORMAL $@"
++ else
++ echo "$@"
++ fi
++ }
++
+ fi
+
+ #set -e
+@@ -93,6 +103,7 @@
+ test -f /etc/default/avahi-dnsconfd && . /etc/default/avahi-dnsconfd
+
+ if [ "$AVAHI_DNSCONFD_START" != "1" -a "$1" != "stop" ]; then
++ log_warning_msg "Not starting $DESC $NAME, disabled via /etc/default/$NAME"
+ exit 0
+ fi
+
Copied: packages/unstable/avahi/debian/patches/03_avahi-daemon-init-unicast-disable.patch (from rev 1194, packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch)
===================================================================
--- packages/unstable/avahi/debian/patches/02_avahi-daemon-init-unicast-disable.patch 2006-12-28 19:27:22 UTC (rev 1194)
+++ packages/unstable/avahi/debian/patches/03_avahi-daemon-init-unicast-disable.patch 2007-01-03 11:22:37 UTC (rev 1198)
@@ -0,0 +1,24 @@
+--- avahi-0.6.16/initscript/debian/avahi-daemon.in.orig 2006-12-28 20:24:35.000000000 +0100
++++ avahi-0.6.16/initscript/debian/avahi-daemon.in 2006-12-28 20:26:17.000000000 +0100
+@@ -26,6 +26,8 @@
+ # Authors: <sebastien.estienne at gmail.com>
+ #
+
++DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local"
++
+ if [ -f /lib/lsb/init-functions ]
+ then
+ . /lib/lsb/init-functions
+@@ -104,6 +106,12 @@
+
+ $DAEMON -c && return 0
+
++ if [ -e ${DISABLE_TAG} ]; then
++ # Disabled because of the existance of an unicast .local domain
++ log_warning_msg "avahi-daemon disabled because there is a unicast .local domain"
++ exit 0;
++ fi;
++
+ if [ -s /etc/localtime ]; then
+ if [ ! -d /etc/avahi/etc ]; then
+ mkdir -p @sysconfdir@/avahi/etc >/dev/null 2>&1
Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules 2007-01-02 18:19:38 UTC (rev 1197)
+++ packages/unstable/avahi/debian/rules 2007-01-03 11:22:37 UTC (rev 1198)
@@ -50,8 +50,8 @@
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
+ install -D -o root -g root -m 755 debian/avahi-daemon.resolvconf \
+ debian/$(cdbs_curpkg)/etc/resolvconf/update-libc.d/avahi-daemon
common-install-impl::
mv $(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/avahi-autoipd \
More information about the Pkg-utopia-commits
mailing list