--- avahi-0.6.22.orig/debian/avahi-daemon.ifupdown +++ avahi-0.6.22/debian/avahi-daemon.ifupdown @@ -0,0 +1,15 @@ +#!/bin/sh + +# Don't run the avahi-daemon unicast local check while bringing up +# the loopback device; it's not necessary until we bring up a real network +# device +[ "$IFACE" != "lo" ] || exit 0 + +# Bail out if resolvconf is installed +[ -x /sbin/resolvconf ] && exit 0 + +# 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 +fi --- avahi-0.6.22.orig/debian/libavahi-glib-dev.install +++ avahi-0.6.22/debian/libavahi-glib-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/libavahi-glib.so +debian/tmp/usr/lib/libavahi-glib.la +debian/tmp/usr/lib/libavahi-glib.a +debian/tmp/usr/include/avahi-glib +debian/tmp/usr/lib/pkgconfig/avahi-glib.pc --- avahi-0.6.22.orig/debian/avahi-discover.manpages +++ avahi-0.6.22/debian/avahi-discover.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/avahi-discover.1 --- avahi-0.6.22.orig/debian/avahi-discover.install +++ avahi-0.6.22/debian/avahi-discover.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin/avahi-discover +debian/tmp/usr/share/applications/avahi-discover.desktop +debian/tmp/usr/share/avahi/interfaces/avahi-discover.glade +debian/tmp/usr/lib/python*/site-packages/avahi_discover --- avahi-0.6.22.orig/debian/libavahi-common-dev.install +++ avahi-0.6.22/debian/libavahi-common-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/libavahi-common.so +debian/tmp/usr/lib/libavahi-common.la +debian/tmp/usr/lib/libavahi-common.a +debian/tmp/usr/include/avahi-common --- avahi-0.6.22.orig/debian/compat +++ avahi-0.6.22/debian/compat @@ -0,0 +1 @@ +5 --- avahi-0.6.22.orig/debian/avahi-daemon.init +++ avahi-0.6.22/debian/avahi-daemon.init @@ -0,0 +1,110 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: avahi +# Required-Start: $remote_fs dbus +# Required-Stop: $remote_fs dbus +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Avahi mDNS/DNS-SD Daemon +# Description: Zeroconf daemon for configuring your network +# automatically +### END INIT INFO + +#set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DESC="Avahi mDNS/DNS-SD Daemon" +NAME="avahi-daemon" +DAEMON="/usr/sbin/$NAME" +SCRIPTNAME=/etc/init.d/$NAME + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +# Include avahi-daemon defaults if available. +test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon + +DISABLE_TAG="/var/run/avahi-daemon/disabled-for-unicast-local" + +if [ -n "$AVAHI_DAEMON_START" ]; then + log_warning_msg "The AVAHI_DAEMON_START option in /etc/default/$NAME has been deprecated." + log_warning_msg "Please remove this setting from the configuration file." + log_warning_msg "To disable the service use a runlevel editor like sysv-rc-conf or bum instead." +fi + +# +# Function that starts the daemon/service. +# +d_start() { + modprobe capability >/dev/null 2>&1 || true + + $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; + + $DAEMON -D +} + +# +# Function that stops the daemon/service. +# +d_stop() { + if $DAEMON -c ; then + $DAEMON -k + fi +} + +# +# Function that reload the config file for the daemon/service. +# +d_reload() { + $DAEMON -c && $DAEMON -r +} + +# +# Function that check the status of the daemon/service. +# +d_status() { + $DAEMON -c && echo "$DESC is running" || echo "$DESC is not running" +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + d_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + d_stop + log_end_msg $? + ;; + reload) + log_daemon_msg "Reloading services for $DESC" "$NAME" + d_reload + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + $DAEMON -c && d_stop + d_start + log_end_msg $? + ;; + status) + d_status + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- avahi-0.6.22.orig/debian/avahi-daemon.default +++ avahi-0.6.22/debian/avahi-daemon.default @@ -0,0 +1,4 @@ +# 1 = Try to detect unicast dns servers that serve .local and disable avahi in +# that case, 0 = Don't try to detect .local unicast dns servers, can cause +# troubles on misconfigured networks +AVAHI_DAEMON_DETECT_LOCAL=1 --- avahi-0.6.22.orig/debian/libavahi-common-data.install +++ avahi-0.6.22/debian/libavahi-common-data.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/avahi/service-types +debian/tmp/usr/lib/avahi/service-types.db --- avahi-0.6.22.orig/debian/libavahi-qt3-1.install +++ avahi-0.6.22/debian/libavahi-qt3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-qt3.so.* --- avahi-0.6.22.orig/debian/libavahi-glib1.install +++ avahi-0.6.22/debian/libavahi-glib1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-glib.so.* --- avahi-0.6.22.orig/debian/libavahi-compat-howl0.shlibs +++ avahi-0.6.22/debian/libavahi-compat-howl0.shlibs @@ -0,0 +1 @@ +libhowl 0 libavahi-compat-howl0 (>= 0.6.0) --- avahi-0.6.22.orig/debian/libavahi-compat-libdnssd-dev.install +++ avahi-0.6.22/debian/libavahi-compat-libdnssd-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/libdns_sd.so +debian/tmp/usr/lib/libdns_sd.la +debian/tmp/usr/lib/libdns_sd.a +debian/tmp/usr/include/avahi-compat-libdns_sd +debian/tmp/usr/lib/pkgconfig/avahi-compat-libdns_sd.pc --- avahi-0.6.22.orig/debian/avahi-daemon.postinst +++ avahi-0.6.22/debian/avahi-daemon.postinst @@ -0,0 +1,48 @@ +#!/bin/sh +# postinst script for avahi + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + if ! getent passwd avahi >/dev/null; then + adduser --disabled-password --quiet --system \ + --home /var/run/avahi-daemon --no-create-home \ + --gecos "Avahi mDNS daemon" --group avahi + fi + # If the Avahi user has the old home, change it + if ! getent passwd avahi | grep -q /var/run/avahi-daemon; then + usermod -d /var/run/avahi-daemon avahi + fi + + # Add the netdev group unless it's already there + if ! getent group netdev >/dev/null; then + addgroup --quiet --system netdev || true + fi + + # Ask the bus to reload the config file + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- avahi-0.6.22.orig/debian/avahi-autoipd.prerm +++ avahi-0.6.22/debian/avahi-autoipd.prerm @@ -0,0 +1,8 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ]; then + avahi-autoipd --kill || true +fi + +#DEBHELPER# + --- avahi-0.6.22.orig/debian/avahi-daemon.install +++ avahi-0.6.22/debian/avahi-daemon.install @@ -0,0 +1,7 @@ +debian/tmp/etc/avahi/avahi-daemon.conf +debian/tmp/etc/avahi/hosts +debian/tmp/etc/dbus-1/system.d/avahi-dbus.conf +debian/tmp/usr/sbin/avahi-daemon +debian/tmp/usr/share/avahi/avahi-service.dtd +debian/tmp/usr/share/avahi/introspection/ +avahi-daemon/example.service /usr/share/doc/avahi-daemon/examples/ --- avahi-0.6.22.orig/debian/rules +++ avahi-0.6.22/debian/rules @@ -0,0 +1,70 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/buildvars.mk +include debian/clean-la.mk + +# List any files which are not installed +include /usr/share/cdbs/1/rules/utils.mk +common-binary-post-install-arch:: list-missing + +# Ensure at build time that the library has no dependencies on undefined +# symbols, and speed up loading. +LDFLAGS += -Wl,-z,defs -Wl,-O1 + +DEB_CONFIGURE_EXTRA_FLAGS += --enable-compat-libdns_sd --enable-compat-howl \ + --disable-mono --disable-monodoc + +# Only enable the stack protector on certain archs +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc s390 sparc amd64 i386 lpia)) + DEB_CONFIGURE_EXTRA_FLAGS += --disable-stack-protector +endif + +DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 . + +ifneq (linux,$(DEB_HOST_ARCH_OS)) + DEB_CONFIGURE_EXTRA_FLAGS += --disable-autoipd +endif + +DEB_INSTALL_DOCS_ALL += docs/README docs/NEWS + +DEB_SHLIBDEPS_INCLUDE := debian/libavahi-common3/usr/lib \ + debian/libavahi-core4/usr/lib \ + debian/libavahi-client3/usr/lib \ + debian/libavahi-glib1/usr/lib \ + debian/libavahi-ui0/usr/lib + +#ensure that ServiceTypeDatabase.py is regenerated +pre-build:: + -rm -f avahi-python/avahi/ServiceTypeDatabase.py + +binary-install/avahi-discover:: + dh_pysupport -p$(cdbs_curpkg) + rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co] + +binary-install/python-avahi:: + dh_pysupport -p$(cdbs_curpkg) + rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co] + +install/avahi-autoipd:: + install -D -o root -g root -m 755 debian/avahi-autoipd.ifup \ + debian/$(cdbs_curpkg)/etc/network/if-up.d/avahi-autoipd + 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.resolvconf \ + debian/$(cdbs_curpkg)/etc/resolvconf/update-libc.d/avahi-daemon + install -D -o root -g root -m 755 debian/avahi-daemon-check-dns.sh \ + debian/$(cdbs_curpkg)/usr/lib/avahi/avahi-daemon-check-dns.sh + +ifeq (linux,$(DEB_HOST_ARCH_OS)) +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 +endif + --- avahi-0.6.22.orig/debian/libavahi-compat-howl-dev.links +++ avahi-0.6.22/debian/libavahi-compat-howl-dev.links @@ -0,0 +1 @@ +/usr/lib/pkgconfig/avahi-compat-howl.pc /usr/lib/pkgconfig/howl.pc --- avahi-0.6.22.orig/debian/libavahi-qt3-1.shlibs +++ avahi-0.6.22/debian/libavahi-qt3-1.shlibs @@ -0,0 +1 @@ +libavahi-qt3 1 libavahi-qt3-1 (>= 0.6.0) --- avahi-0.6.22.orig/debian/libavahi-ui0.install +++ avahi-0.6.22/debian/libavahi-ui0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-ui.so.* --- avahi-0.6.22.orig/debian/avahi-dnsconfd.init +++ avahi-0.6.22/debian/avahi-dnsconfd.init @@ -0,0 +1,113 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: avahi-dnsconfd +# Required-Start: $remote_fs avahi +# Required-Stop: $remote_fs avahi +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Avahi Unicast DNS Configuration Daemon +# Description: A DNS configuration daemon using mDNS in a +# DHCP-like fashion +### END INIT INFO + +#set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DESC="Avahi Unicast DNS Configuration Daemon" +NAME="avahi-dnsconfd" +DAEMON="/usr/sbin/$NAME" +SCRIPTNAME=/etc/init.d/$NAME + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +# don't start if /etc/default/avahi-dnsconfd says so. +AVAHI_DNSCONFD_START=1 +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 + +# +# Function that starts the daemon/service. +# +d_start() { + $DAEMON -c + [ $? = 0 ] && exit 0 + + if [ -s /etc/localtime ]; then + if [ ! -d /etc/avahi/etc ]; then + mkdir -p /etc/avahi/etc >/dev/null 2>&1 + fi + cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1 + fi; + + $DAEMON -D +} + +# +# Function that stops the daemon/service. +# +d_stop() { + $DAEMON -c + [ $? != 0 ] && exit 0 + + $DAEMON -k +} + +# +# Function that reload the config file for the daemon/service. +# +d_refresh() { + $DAEMON -c + [ $? != 0 ] && exit 0 + + $DAEMON -r +} + +# +# Function that check the status of the daemon/service. +# +d_status() { + $DAEMON -c + [ $? = 0 ] && echo "$DESC is running" || echo "$DESC is not running" +} + +case "$1" in + start) + log_daemon_msg "Starting $DESC" "$NAME" + d_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + d_stop + log_end_msg $? + ;; + refresh) + log_daemon_msg "Refreshing $DESC" "$NAME" + d_refresh + log_end_msg $? + ;; + reload|restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + $DAEMON -c && d_stop + d_start + log_end_msg $? + ;; + status) + d_status + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- avahi-0.6.22.orig/debian/libavahi-core5.install +++ avahi-0.6.22/debian/libavahi-core5.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-core.so.* --- avahi-0.6.22.orig/debian/clean-la.mk +++ avahi-0.6.22/debian/clean-la.mk @@ -0,0 +1,6 @@ +# makefile snippet for removing dependency_libs lines from .la files + +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + for file in $(wildcard debian/$(cdbs_curpkg)/usr/lib/*.la); do \ + sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ + done --- avahi-0.6.22.orig/debian/avahi-autoipd.manpages +++ avahi-0.6.22/debian/avahi-autoipd.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man8/avahi-autoipd.8 +debian/tmp/usr/share/man/man8/avahi-autoipd.action.8 --- avahi-0.6.22.orig/debian/watch +++ avahi-0.6.22/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://avahi.org/download/avahi-(.*)\.tar\.gz --- avahi-0.6.22.orig/debian/libavahi-common3.shlibs +++ avahi-0.6.22/debian/libavahi-common3.shlibs @@ -0,0 +1 @@ +libavahi-common 3 libavahi-common3 (>= 0.6.10) --- avahi-0.6.22.orig/debian/libavahi-core5.shlibs +++ avahi-0.6.22/debian/libavahi-core5.shlibs @@ -0,0 +1 @@ +libavahi-core 5 libavahi-core5 (>= 0.6.17) --- avahi-0.6.22.orig/debian/avahi-dnsconfd.manpages +++ avahi-0.6.22/debian/avahi-dnsconfd.manpages @@ -0,0 +1,2 @@ +debian/tmp/usr/share/man/man8/avahi-dnsconfd.8 +debian/tmp/usr/share/man/man8/avahi-dnsconfd.action.8 --- avahi-0.6.22.orig/debian/libavahi-qt4-dev.install +++ avahi-0.6.22/debian/libavahi-qt4-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/avahi-qt4/qt-watch.h +debian/tmp/usr/lib/libavahi-qt4.so +debian/tmp/usr/lib/libavahi-qt4.la +debian/tmp/usr/lib/libavahi-qt4.a +debian/tmp/usr/lib/pkgconfig/avahi-qt4.pc --- avahi-0.6.22.orig/debian/libavahi-ui0.shlibs +++ avahi-0.6.22/debian/libavahi-ui0.shlibs @@ -0,0 +1 @@ +libavahi-ui 0 libavahi-ui0 (>= 0.6.18) --- avahi-0.6.22.orig/debian/libavahi-compat-libdnssd-dev.links +++ avahi-0.6.22/debian/libavahi-compat-libdnssd-dev.links @@ -0,0 +1 @@ +/usr/include/avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h --- avahi-0.6.22.orig/debian/libavahi-qt3-dev.install +++ avahi-0.6.22/debian/libavahi-qt3-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/avahi-qt3/qt-watch.h +debian/tmp/usr/lib/libavahi-qt3.so +debian/tmp/usr/lib/libavahi-qt3.la +debian/tmp/usr/lib/libavahi-qt3.a +debian/tmp/usr/lib/pkgconfig/avahi-qt3.pc --- avahi-0.6.22.orig/debian/avahi-autoipd.install +++ avahi-0.6.22/debian/avahi-autoipd.install @@ -0,0 +1,3 @@ +debian/tmp/usr/sbin/avahi-autoipd +debian/tmp/etc/avahi/avahi-autoipd.action +debian/tmp/etc/dhcp3/ --- avahi-0.6.22.orig/debian/libavahi-client3.install +++ avahi-0.6.22/debian/libavahi-client3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-client.so.* --- avahi-0.6.22.orig/debian/pyversions +++ avahi-0.6.22/debian/pyversions @@ -0,0 +1 @@ +2.4- --- avahi-0.6.22.orig/debian/libavahi-gobject-dev.install +++ avahi-0.6.22/debian/libavahi-gobject-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/libavahi-gobject.so +debian/tmp/usr/lib/libavahi-gobject.a +debian/tmp/usr/include/avahi-gobject +debian/tmp/usr/lib/pkgconfig/avahi-gobject.pc --- avahi-0.6.22.orig/debian/libavahi-qt4-1.shlibs +++ avahi-0.6.22/debian/libavahi-qt4-1.shlibs @@ -0,0 +1 @@ +libavahi-qt4 1 libavahi-qt4-1 (>= 0.6.0) --- avahi-0.6.22.orig/debian/avahi-daemon.examples +++ avahi-0.6.22/debian/avahi-daemon.examples @@ -0,0 +1 @@ +debian/tmp/etc/avahi/services/ssh.service --- avahi-0.6.22.orig/debian/copyright +++ avahi-0.6.22/debian/copyright @@ -0,0 +1,105 @@ +This package was debianized by Ross Burton on +Fri, 19 Aug 2005 11:38:54 +0000. + +It was downloaded from http://www.freedesktop.org/Software/Avahi + +The main portion of Avahi is copyright: + Upstream Authors: + Lennart Poettering + Trent Lloyd + Sebastien Estienne + Jakub Stachowski + James Willcox + Collabora Ltd. + + License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + See /usr/share/common-licenses/LGPL-2.1 on your debian system. + +The xml to man conversion files +(man/{xmltoman.css, xmltoman.dtd, xmltoman.xsl}) are under the GNU General +Public License 2. See /usr/share/common-licenses/GPL-2 on your debian system. + +SimpleGladeApp.in from avahi-python (avahi-python/avahi/SimpleGladeApp.py) is +copyright Sandino Flores Moreno under the GNU Lesser General Public version +2.1. See /usr/share/common-licenses/LGPL-2.1 on your debian system. + +common/acx_pthread.m4 is copyright Steven G. Johnson +under the GPL with the exception that it can be used with configure files +generated by autoconf. See /usr/share/common-licenses/GPL on your debian system +for the text of the GPL. + +common/doxygen.m4 and common/doxygen.mk are copyright: +# Copyright (C) 2004 Oren Ben-Kiki +# This file is distributed under the same terms as the Autoconf macro files. +Which is the GNU General Public License version 2. See +/usr/share/common-licenses/GPL-2 on your debian system. + +All the avahi-compat-howl public headers (avahi-compat-howl/include/*) and +avahi-compat-howl sample code (avahi-compat-howl/samples/*.c) are: + Copyright 2003, 2004 Porchdog Software. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY PORCHDOG SOFTWARE ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + EVENT SHALL THE HOWL PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The views and conclusions contained in the software and documentation are those + of the authors and should not be interpreted as representing official policies, + either expressed or implied, of Porchdog Software. + + +The avahi-compat-libdns_sd public header (avahi-compat-libdns_sd/dns_sd.h) is: + Copyright (c) 2003-2004, Apple Computer, Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- avahi-0.6.22.orig/debian/avahi-daemon.dirs +++ avahi-0.6.22/debian/avahi-daemon.dirs @@ -0,0 +1 @@ +etc/avahi/services --- avahi-0.6.22.orig/debian/avahi-daemon.manpages +++ avahi-0.6.22/debian/avahi-daemon.manpages @@ -0,0 +1,4 @@ +debian/tmp/usr/share/man/man8/avahi-daemon.8 +debian/tmp/usr/share/man/man5/avahi-daemon.conf.5 +debian/tmp/usr/share/man/man5/avahi.service.5 +debian/tmp/usr/share/man/man5/avahi.hosts.5 --- avahi-0.6.22.orig/debian/control +++ avahi-0.6.22/debian/control @@ -0,0 +1,504 @@ +Source: avahi +Section: net +Priority: optional +Maintainer: Utopia Maintenance Team +Uploaders: Sjoerd Simons , + Sebastian Dröge , + Loic Minier +Build-Depends: debhelper (>= 5.0.37.2), + cdbs (>= 0.4.43), + python-support (>= 0.6), + libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], + libgdbm-dev, + libglib2.0-dev (>= 2.4), + libgtk2.0-dev (>= 2.4), + libglade2-dev (>= 2.4.0), + libexpat-dev, + libdaemon-dev (>= 0.11), + libdbus-1-dev (>= 0.60), + python-all-dev (>= 2.3.5-11), + python-gdbm (>= 2.4.3-1), + python-dbus, + python-gtk2 (>= 2.8.6-2), + libqt3-mt-dev, + libqt4-dev, + xmltoman +Standards-Version: 3.7.3 +Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/avahi +Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi +Homepage: http://avahi.org/ + +Package: avahi-daemon +Section: net +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + adduser, + dbus (>= 0.60), + lsb-base (>= 3.0-6), + bind9-host | host +Recommends: libnss-mdns +Suggests: avahi-autoipd +Conflicts: mdnsresponder +Description: Avahi mDNS/DNS-SD daemon + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the Avahi Daemon which represents your machine + on the network and allows other applications to publish and resolve + mDNS/DNS-SD records. + +Package: avahi-dnsconfd +Section: net +Architecture: any +Depends: avahi-daemon, + ${shlibs:Depends}, + ${misc:Depends}, + lsb-base (>= 3.0-6) +Recommends: resolvconf +Description: Avahi DNS configuration tool + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This tool listens on the network for announced DNS servers and passes + them to resolvconf so it can use them. This is very useful on autoconfigured + IPv6 networks. + +Package: avahi-autoipd +Section: net +Architecture: i386 ia64 alpha amd64 armeb armel arm hppa lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc +Depends: ${shlibs:Depends}, + ${misc:Depends}, + adduser +Recommends: dhcp3-client, + iproute +Conflicts: zeroconf +Description: Avahi IPv4LL network address configuration daemon + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This tool implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local + Addresses" (IETF RFC3927), a protocol for automatic IP address + configuration from the link-local 169.254.0.0/16 range without the + need for a central server. It is primarily intended to be used in + ad-hoc networks which lack a DHCP server. + +Package: python-avahi +Section: python +Architecture: all +Depends: ${python:Depends}, + python-gdbm (>= 2.4.3-1), + libavahi-common-data (>= 0.6.22), + python-dbus +Provides: ${python:Provides} +Replaces: python2.4-avahi (<< 0.6.11), + avahi-utils (<< 0.4) +Conflicts: python2.4-avahi (<< 0.6.11) +Description: Python utility package for Avahi + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains utility modules to talk to Avahi with Python easier. + +Package: avahi-utils +Section: net +Architecture: any +Depends: avahi-daemon, + ${misc:Depends}, + ${shlibs:Depends} +Description: Avahi browsing, publishing and discovery utilities + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains several utilities that allow you to interact with + the Avahi daemon, including publish, browsing and discovering services. + +Package: avahi-discover +Section: net +Architecture: all +Depends: ${python:Depends}, + python-avahi, + python-dbus, + python-gtk2 (>= 2.8.6-2), + python-glade2, + avahi-daemon, + ${misc:Depends} +Conflicts: avahi-utils (<< 0.6.1-2) +Description: Service discover user interface for avahi + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains a user interface for discovering services. + +Package: libavahi-common3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libavahi-common-data +Description: Avahi common library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the Avahi common library, which is a set of common + functions used by many of Avahis components and client applications. + +Package: libavahi-common-data +Section: libs +Architecture: any +Conflicts: libavahi-common0 +Description: Avahi common data files + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains common data files for avahi. + +Package: libavahi-common-dev +Section: libdevel +Architecture: any +Depends: libavahi-common3 (= ${binary:Version}), + ${misc:Depends} +Description: Development files for the Avahi common library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for the Avahi common + library, which is a set of common functions and definitions used by many + of Avahis components and client applications. + +Package: libavahi-core5 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Conflicts: libavahi-core3 (>= 0.6.8) +Description: Avahi's embeddable mDNS/DNS-SD library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the library for Avahi's embeddable mDNS/DNS-SD stack. + This can be used by embedded applications to integrate mDNS/DNS-SD + functionality into their applications. + . + You should not however use this library for non-embedded applications, you + should use libavahi-client which interacts with the avahi daemon. + +Package: libavahi-core-dev +Section: libdevel +Architecture: any +Depends: libavahi-core5 (= ${binary:Version}), + ${misc:Depends}, + libavahi-common-dev +Replaces: libavahi-core1 (<< 0.4) +Description: Development files for Avahi's embeddable mDNS/DNS-SD library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development files for Avahi's embeddable + mDNS/DNS-SD stack. This can be used by embedded application developers + to integrate mDNS/DNS-SD functionality into their applications. + . + You should not however use this library for non-embedded applications, you + shoudl use libavahi-client-dev which interacts with the avahi daemon. + +Package: libavahi-client3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Conflicts: avahi-daemon (<< 0.6) +Description: Avahi client library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the library for Avahi's C API which allows you + to integrate mDNS/DNS-SD functionality into your application. + +Package: libavahi-client-dev +Section: libdevel +Architecture: any +Depends: libavahi-client3 (= ${binary:Version}), + ${misc:Depends}, + libavahi-common-dev, + libdbus-1-dev (>= 0.60) +Description: Development files for the Avahi client library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for Avahi's C API which + allows you to integrate mDNS/DNS-SD functionality into your application. + +Package: libavahi-glib1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Avahi glib integration library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains the interface to integrate the Avahi libraries + into a GLIB main loop application, including GTK applications. + +Package: libavahi-glib-dev +Section: libdevel +Architecture: any +Depends: libavahi-glib1 (= ${binary:Version}), + libglib2.0-dev, + ${misc:Depends}, + libavahi-common-dev +Description: Development headers for the Avahi glib integration library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for the interface + to integrate the Avahi libraries into a GLIB main loop application, + including GTK applications. + +Package: libavahi-gobject0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Avahi GObject library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains the development headers for a GObject interface + to Avahi + +Package: libavahi-gobject-dev +Section: libdevel +Architecture: any +Depends: libavahi-gobject0 (= ${binary:Version}), + ${misc:Depends}, + libglib2.0-dev, + libavahi-client-dev, + libavahi-glib-dev +Description: Development headers for the Avahi GObject library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for a GObject interface + to Avahi + +Package: libavahi-qt3-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Avahi Qt 3 integration library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains the interface to integrate the Avahi libraries + into a Qt 3 main loop application. + +Package: libavahi-qt3-dev +Section: libdevel +Architecture: any +Depends: libavahi-qt3-1 (= ${binary:Version}), + libqt3-mt-dev, + ${misc:Depends}, + libavahi-common-dev +Description: Development headers for the Avahi Qt 3 integration library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for the interface + to integrate the Avahi libraries into a Qt 3 main loop application. + +Package: libavahi-qt4-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Avahi Qt 4 integration library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains the interface to integrate the Avahi libraries + into a Qt 4 main loop application. + +Package: libavahi-qt4-dev +Section: libdevel +Architecture: any +Depends: libavahi-qt4-1 (= ${binary:Version}), + libqt4-dev, + ${misc:Depends}, + libavahi-common-dev +Description: Development headers for the Avahi Qt 4 integration library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for the interface + to integrate the Avahi libraries into a Qt 4 main loop application. + +Package: libavahi-compat-howl0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Replaces: libhowl0 +Conflicts: libhowl0 +Description: Avahi Howl compatibility library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains the howl compatibility library for Avahi. + +Package: libavahi-compat-howl-dev +Section: libdevel +Architecture: any +Replaces: libhowl-dev +Conflicts: libhowl-dev +Depends: libavahi-compat-howl0 (= ${binary:Version}), + libavahi-client-dev +Description: Development headers for the Avahi Howl compatibility library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for howl compatibility library + for Avahi. + +Package: libavahi-compat-libdnssd1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: libnss-mdns +Description: Avahi Apple Bonjour compatibility library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains the Apple Bonjour compatibility library of Avahi. + +Package: libavahi-compat-libdnssd-dev +Section: libdevel +Architecture: any +Depends: libavahi-compat-libdnssd1 (= ${binary:Version}), + libavahi-client-dev +Description: Development headers for the Avahi Apple Bonjour compatibility library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for Apple Bonjour compatibility + library of Avahi. + +Package: libavahi-ui0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Suggests: ssh-client, + xvncviewer +Description: Avahi GTK User interface library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This library contains a Gtk widget for browsing services. + +Package: libavahi-ui-dev +Section: libdevel +Architecture: any +Depends: libavahi-ui0 (= ${binary:Version}), + libavahi-client-dev, + libavahi-glib-dev, + libgtk2.0-dev +Description: Development headers for the Avahi GTK User interface library + Avahi is a fully LGPL framework for Multicast DNS Service Discovery. + It allows programs to publish and discover services and hosts + running on a local network with no specific configuration. For + example you can plug into a network and instantly find printers to + print to, files to look at and people to talk to. + . + This package contains the development headers for the Gtk library of Avahi. + +Package: avahi-dbg +Section: libdevel +Priority: extra +Architecture: any +Description: Avahi - debugging symbols + This package contains detached debugging symbols for the binary packages + produced by the avahi source. + . + Most people will not need this package. + --- avahi-0.6.22.orig/debian/avahi-daemon-check-dns.sh +++ avahi-0.6.22/debian/avahi-daemon-check-dns.sh @@ -0,0 +1,153 @@ +#!/bin/sh +# +# If we have an unicast .local domain, we immediately disable avahi to avoid +# conflicts with the multicast IP4LL .local domain + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +RUNDIR="/var/run/avahi-daemon/" +DISABLE_TAG="$RUNDIR/disabled-for-unicast-local" +NS_CACHE="$RUNDIR/checked_nameservers" + +AVAHI_DAEMON_DETECT_LOCAL=1 + +test -f /etc/default/avahi-daemon && . /etc/default/avahi-daemon + +if [ "$AVAHI_DAEMON_DETECT_LOCAL" != "1" ]; then + exit 0 +fi + +ensure_rundir() { + if [ ! -d ${RUNDIR} ] ; then + mkdir -m 0755 -p ${RUNDIR} + chown avahi:avahi ${RUNDIR} + fi +} + +dns_reachable() { + # If there are no nameserver entries in resolv.conf there is no dns reachable + $(grep -q nameserver /etc/resolv.conf) || return 1; + + # If there is no local nameserver and no we have no global ip addresses + # then we can't reach any nameservers + if ! $(egrep -q "nameserver 127.0.0.1|::1" /etc/resolv.conf); then + # Get addresses of all running interfaces + ADDRS=$(LC_ALL=C ifconfig | grep ' addr:') + # Filter out all local addresses + ADDRS=$(echo "${ADDRS}" | egrep -v ':127|Scope:Host|Scope:Link') + if [ -z "${ADDRS}" ] ; then + return 1; + fi + fi + + return 0 +} + +dns_has_local() { + # Some magic to do tests + if [ -n ${FAKE_HOST_RETURN} ] ; then + if [ "${FAKE_HOST_RETURN}" = "true" ]; then + return 0; + else + return 1; + fi + fi + + OUT=`LC_ALL=C host -t soa local. 2>&1` + if [ $? -eq 0 ] ; then + if echo "$OUT" | egrep -vq 'has no|not found'; then + return 0 + fi + else + # Checking the dns servers failed. Assuming no .local unicast dns, but + # remove the nameserver cache so we recheck the next time we're triggered + rm -f ${NS_CACHE} + fi + return 1 +} + +dns_needs_check() { + TMP_CACHE="${NS_CACHE}.$$" + RET=0 + + ensure_rundir + cat /etc/resolv.conf | grep "nameserver" | sort > ${TMP_CACHE} || return 0 + + if [ -e ${NS_CACHE} ]; then + DIFFERENCE=$(diff -w ${NS_CACHE} ${TMP_CACHE}) + echo "${DIFFERENCE}" | grep -q '^>' + ADDED=$? + echo "${DIFFERENCE}" | grep -q '^<' + REMOVED=$? + # Avahi was disabled and no servers were removed, no need to recheck + [ -e ${DISABLE_TAG} ] && [ ${REMOVED} -ne 0 ] && RET=1 + # Avahi was enabled and no servers were added, no need to recheck + [ ! -e ${DISABLE_TAG} ] && [ ${ADDED} -ne 0 ] && RET=1 + fi + + mv ${TMP_CACHE} ${NS_CACHE} + return ${RET}; +} + + +enable_avahi () { + # no unicast .local conflict, so remove the tag and start avahi again + if [ -e ${DISABLE_TAG} ]; then + rm -f ${DISABLE_TAG} + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d avahi-daemon start || true + else + if [ -x "/etc/init.d/avahi-daemon" ]; then + /etc/init.d/avahi-daemon start || true + fi + fi + fi +} + +disable_avahi () { + [ -e ${DISABLE_TAG} ] && return + + if [ -x /etc/init.d/avahi-daemon ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d --force avahi-daemon stop || true + else + if [ -x "/etc/init.d/avahi-daemon" ]; then + /etc/init.d/avahi-daemon stop || true + fi + fi + if [ -x /usr/bin/logger ]; then + logger -p daemon.warning -t avahi <= 0.6) as suggested by the + python-support documentation. + * debian/avahi-daemon.init, debian/avahi-dnsconfd.init + - Fix LSB init header. (Closes: #469990) + Use $remote_fs instead of $local_fs as the daemon requires /usr to be + mounted. Remove S from Should-Stop. + * debian/watch + - Add a watch file which allows to track new upstream releases. + + [ Sjoerd Simons ] + * debian/patches/80_better_poof.patch: + - Added. Improve the poof algorithm to prevent false positives when on a + unreliable network. + + [ Loic Minier ] + * Stop shipping bssh and bvnc; these are meant as examples, but would + require a replace if libavahi-ui would change SONAME; also these show up + in the menus while we have nicer alternatives now (e.g. vinagre); finally + these require additional deps which wouldn't be fit for libavahi-ui (bvnc + requires xvncviewer); see also Launchpad #194749; closes: #461693. + * Add armel to architecture list; closes: #469854. + + -- Sjoerd Simons Sat, 05 Apr 2008 12:15:29 +0200 + +avahi (0.6.22-2) unstable; urgency=low + + * Fix typo in the control file (missing ,) + * debian/avahi-discover.install: Install some forgotten files + + -- Sjoerd Simons Mon, 07 Jan 2008 22:29:08 +0100 + +avahi (0.6.22-1) unstable; urgency=low + + [ Michael Biebl ] + * Deprecate the AVAHI_DAEMON_START option and remove it from + /etc/default/avahi-daemon. Print a warning message in the init script if + this option is still used. + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/70_gobject_libs_typo.patch + - Added. Fix typo in the Makefiles causing avahi-gobject build to fail + * debian/libavahi-common-data.install + - service-type.db moved to /usr/lib/avahi (Closes: #458851) + * debian/patches/01_avahi-daemon.conf.patch + - Updated. Switch on ipv6 support by default + * Package libavahi-gobject + * debian/copyright: Updated + * debian/control: Let libavahi-common3 depend on + libavahi-common-data (>= 0.6.22) + * debian/paches/20_avahi-libdns_sd-crash.patch + - Removed. Fixed upstream + + -- Sjoerd Simons Thu, 03 Jan 2008 17:00:24 +0100 + +avahi (0.6.21-5) experimental; urgency=low + + * Add a -dbg package; thanks Sam Morris; closes: #379953. + - Target at experimental to avoid blocking uploads to unstable. + - Update control. + + -- Loic Minier Wed, 28 Nov 2007 17:14:18 +0100 + +avahi (0.6.21-4) unstable; urgency=low + + * Revert checking DNS on ifup only in avahi-daemon.ifupdown as an ifdown + might actually reenable avahi properly if the interface was the only + defining a DNS server with .local; thanks Sjoerd. + + -- Loic Minier Wed, 28 Nov 2007 13:33:41 +0100 + +avahi (0.6.21-3) unstable; urgency=low + + [ Michael Biebl ] + * debian/control + + Use new "Homepage:" field to specify the upstream URL. + + The Vcs-* fields are now officially supported, so remove the XS- prefix. + + Replace deprecated ${Source-Version} substvar with ${binary:Version}. + + [ Loic Minier ] + * Only check the DNS on ifup in avahi-daemon.ifupdown, not on ifdown. + * Add lpia to the list of arches on which not to pass + --disable-stack-protector to configure. + * Build avahi-autoipd on lpia. + * Check the host -- not build -- arch to enable/disable the stack protector; + thanks Neil Williams; closes: #452859. + * New patch, 60_hurd-fixes, fixes FTBFS on hurd; thanks Samuel Thibault; + closes: #438938. + * Wrap deps, uploaders and build-deps. + * Add myself to uploaders. + * Misc whitespace cleanups. + * Let avahi-daemon depend on bind9-host | host; closes: #433030. + * Bump up Debhelper compatibility level to 5. + + -- Loic Minier Tue, 27 Nov 2007 15:30:15 +0100 + +avahi (0.6.21-2) unstable; urgency=low + + * debian/patches/20_avahi-libdns_sd-crash.patch + + Added. Fix a segfault when registering services with libdns_sd before the + avahi daemon finished starting up (from upstream SVN) + + -- Sjoerd Simons Sun, 09 Sep 2007 12:15:55 +0200 + +avahi (0.6.21-1) unstable; urgency=low + + [ Loic Minier ] + * Fix "the the" typos in descriptions and use "Qt 3" instead of "Qt3" and + "Qt 4" instead of "Qt4"; thanks Philippe Cloutier; closes: #434261. + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/15_avahi_dns_truncate.patch + + Removed, fixed upstream + * debian/patches/20_avahi_remove_ka_conflict.patch: + + Removed, fixed upstream + + -- Sjoerd Simons Sun, 12 Aug 2007 19:44:01 +0200 + +avahi (0.6.20-2) unstable; urgency=low + + * debian/patches/15_avahi_dns_truncate.patch: + + Added. Fix truncating of dns packets when their too big. Could cause + assertion failures + * debian/patches/20_avahi_remove_ka_conflict.patch: + + Added. Don't treat known answers as authorative when they don't match + our local records. + * Fix short description of libavahi-ui0 and libavahi-ui-dev + + -- Sjoerd Simons Tue, 10 Jul 2007 21:29:46 +0200 + +avahi (0.6.20-1) unstable; urgency=low + + * New upstream release + * debian/control: + + Bump build-depend on libdaemon to (>= 0.11) + + Add depend on python-dbus to python-avahi (Closes: #426365) + * debian/avahi-autoipd.{ifup,ifdown}: + + Check for the existance of link-local routes on all interfaces + and use some nicer grep rules. Thanks Martin F Krafft and Eloi Granado + (Closes: #426918) + * debian/avahi-daemon.preinst: + + Added. Remove /etc/avahi/etc/{,localtime} on installation, it's should + no longer be necessary (Closes: #427237) + * debian/avahi-daemon.init: + + No longer create /etc/avahi/etc/localtime (Closes: #422368) + + -- Sjoerd Simons Fri, 06 Jul 2007 14:56:24 +0200 + +avahi (0.6.19-2) unstable; urgency=low + + * debian/control: + + libavahi-ui-dev must depend on libgtk2.0-dev. + + -- Sebastian Dröge Thu, 17 May 2007 14:44:05 +0200 + +avahi (0.6.19-1) unstable; urgency=low + + * New upstream release + * debian/libavahi-ui0.install, + debian/libavahi-ui0.links, + debian/rules: + + Update for the new binary names which are upstream now. + * debian/patches/11_avahi-autoipd.action-add-routes.patch: + + Fix patch header to patch the real source file and actually apply. + Thanks to Martin Pitt for noticing. + * debian/patches/12_avahi-autoipd-dhcp-exit-hook-take-down.patch, + debian/patches/20_avahi-ui-non-existing-domain-segv.patch, + debian/patches/25_avahi_fix_desktop_files.patch: + + Dropped, merged upstream. + + -- Sebastian Dröge Thu, 17 May 2007 13:48:26 +0200 + +avahi (0.6.18-5) unstable; urgency=low + + * debian/avahi-daemon.init: Don't report failure when stopping an already + stopped daemon (Closes: #421928) + * debian/avahi-daemon-check-dns.sh: Explicitly set $PATH so programs in + /usr/bin are also found (Closes: #421360) + * debian/rules, debian/libavahi-ui0.links: Rename zssh and zvnc to bssh and + bvnc. Upstream will have this renaming in their next release + (Closes: #421473) + + -- Sjoerd Simons Thu, 03 May 2007 19:06:17 +0200 + +avahi (0.6.18-4) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/rules: + + Ensure that ServiceTypeDatabase.py is generated instead of using the one + from the tarball (Closes: #420184) + * debian/avahi-daemon-check-dns.sh: + + Minimise the number of times the DNS servers are checked for a unicast + .local domain even more. (Closes: #419796) + + Use invoke-rc.d to start/stop avahi as we're a proper sysv init service + now + * debian/avahi-daemon.{ifupdown,resolvconf}: + + Check if avahi-daemon-check-dns.sh is executable before executing it + (Closes: #419259) + * debian/rules: + + Disable gcc's strack protection on all archs except those that actually + support it (powerpc s390 sparc amd64 i386). Fixes FTBS on the other + architectures. + * debian/patches/25_avahi_fix_desktop_files.patch: + + Added. Only put at most one main category in one .desktop file. Fixes + applications turning up in multiple places in the KDE menu. Also move + zvnc and zssh to the Network category. + + [ Michael Biebl ] + * Start avahi-daemon and avahi-dnsconfd as regular SysV init scripts. + (Closes: #396811, #367748, #378114) + + debian/avahi-daemon.init, + debian/avahi-dnsconfd.init + - Added. Based on the upstream init scripts. + - Add proper LSB headers. + - Remove reimplementation of LSB logging functions. Depend on lsb-base + being installed. + - Use log_daemon_msg instead of log_begin_msg. + - Remove SVN $Id keyword. (Closes: #354988) + + debian/avahi-daemon.install, + debian/avahi-dnsconfd.install + - Do not install the upstream init script anymore. + + debian/avahi-daemon.links + - Remove the symlink /etc/dbus-1/event.d/25avahi-daemon + + debian/avahi-daemon.postinst + - Do not restart avahi-daemon manually. dh_installinit takes care of + that automatically. + + debian/avahi-daemon.prerm, + debian/avahi-dnsconfd.{links,postinst,prerm} + - Removed. Not needed anymore. + + debian/control + - Add Depends: lsb-base (>= 3.0-6) to avahi-daemon and avahi-dnsconfd. + + debian/rules + - Set DEB_DH_INSTALLINIT_ARGS to start at 24 and stop at 16. + + debian/patches/03_avahi-daemon-init-unicast-disable.patch + - Removed, debian/avahi-daemon.init includes this fix directly. + * debian/rules + + Remove dh_python call as it is not needed anymore with python-support. + * debian/control + + Update the Vcs control field from XS-X-Vcs-Svn to XS-Vcs-Svn. + + Add XS-Vcs-Browser control field. + + -- Sjoerd Simons Fri, 27 Apr 2007 13:43:07 +0200 + +avahi (0.6.18-3) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/avahi-daemon.postinst: + + Don't let adduser create avahi-daemon's homedir. This prevents it from + being created with the wrong permissions. (Closes: #419935) + + [ Sebastian Dröge ] + * debian/patches/20_avahi-ui-non-existing-domain-segv.patch: + + Patch from upstream SVN (r1448): fix segfault when browsing for services + on non-existing domains or domains that don't have any services assigned. + + -- Sebastian Dröge Fri, 20 Apr 2007 21:05:05 +0200 + +avahi (0.6.18-2) unstable; urgency=low + + * debian/control, + debian/libavahi-ui0.install, + debian/libavahi-ui0.shlibs, + debian/libavahi-ui-dev.install: + + Add libavahi-ui package, containing a Gtk widget for browsing services + and two example programs (zssh, zxvnc) that can be used to browse for + local ssh or vnc servers. + * debian/rules: + + Add libavahi-glib and libavahi-ui to DEB_SHLIBDEPS_INCLUDE + + -- Sebastian Dröge Thu, 19 Apr 2007 15:13:03 +0200 + +avahi (0.6.18-1) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/patches/13_avahi_big_dns_records.patch + + Update this patch to the version that was commited upstream + + [ Sebastian Dröge ] + * New upstream release: + + debian/patches/12_avahi-generic-records.patch, + debian/patches/13_avahi_big_dns_records.patch: + - Dropped, merged upstream. + * debian/patches/12_avahi-autoipd-dhcp-exit-hook-take-down.patch: + + Patch by Joey Hess to make ifdown faster again (Closes: #419794) + + -- Sebastian Dröge Thu, 19 Apr 2007 07:00:01 +0200 + +avahi (0.6.17-3) unstable; urgency=low + + * Upload to unstable + * Merge experimental branch + + -- Sjoerd Simons Mon, 09 Apr 2007 22:37:02 +0200 + +avahi (0.6.17-2) experimental; urgency=low + + * debian/patches/12_avahi-generic-records.patch + + Added. Fixes the resolving of generic dns records. + Patch from http://avahi.org/ticket/130 + * debian/patches/13_avahi_big_dns_records.patch + + Added. Fixes publishing of big dns records. + Patch from http://avahi.org/ticket/131 + + -- Sjoerd Simons Wed, 04 Apr 2007 14:40:35 +0200 + +avahi (0.6.17-1) experimental; urgency=low + + * New upstream release: + + Fix bogus comment in init script (Closes: #399234) + + debian/patches/02_avahi-init-warn.patch, + debian/patches/04_function_return.patch, + debian/patches/05_dns_sd_dont_bump_soname.patch, + debian/patches/06_dont_log_broken_packets.patch, + debian/patches/07_ia64_unaligned_access.patch, + debian/patches/08_unicast_ipv6_only.patch, + debian/patches/09_fionread.patch, + debian/patches/10_widearea_socket_types.patch, + debian/patches/12_bogus_static_host_error_message.patch, + debian/patches/13_NULL_dns_service_refs.patch: + - Dropped, merged upstream + * debian/control: + + Updated to use my debian.org mail address + * debian/rules: + + Fix build failure on GNU/kFreeBSD (Closes: #391298) + + Install more complex example service in + /usr/share/doc/avahi-daemon/eexamples (Closes: #398623) + * debian/avahi-daemon.ifupdown: + + Don't run the avahi-daemon unicast local check while bringing up + the loopback device; it's not necessary until we bring up a real network + device, and we do those in the background so they don't hold up the + boot process. Patch by Scott James Remnant, taken from the Ubuntu + package + * debian/python-avahi.install: + + Ship python module from every python version, not just 2.4. This fixes + python-avahi for non-2.4 default python versions + * debian/libavahi-core5.install, debian/libavahi-core5.shlibs, + debian/control: + + Updated for new libavahi-core soname + + -- Sebastian Dröge Mon, 5 Feb 2007 06:22:21 +0100 + +avahi (0.6.16-5) unstable; urgency=low + + * debian/avahi-daemon-check-dns.sh: Run ifconfig with LC_ALL=C to make + .local detection work for all locales (Closes: #415160) + + -- Sjoerd Simons Sat, 17 Mar 2007 13:30:05 +0100 + +avahi (0.6.16-4) unstable; urgency=low + + * Bump version number to be greater then the one in testing-proposed-updates + (0.6.16-3etch0) + + -- Sjoerd Simons Thu, 15 Mar 2007 10:59:15 +0100 + +avahi (0.6.16-3) unstable; urgency=low + + * Move .local detection code to a common script. Also minize the cases where + host lookups are done, fixing annoying slowdowns (Closes: #409513) + * Add a way to disable the .location detection code completely for the cases + we can't work around. (Closes: #406272) + + -- Sjoerd Simons Sun, 4 Mar 2007 20:52:53 +0100 + +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 + * debian/patches/04_function_return.patch + - Added. Ensure a value is always returned from a non-void function (From + upstream svn) + * debian/patches/05_dns_sd_dont_bump_soname.patch + - Added. Undo the bumping of the micro soname version to keep the soname + fully in sync with apple's (From upstream svn) + * debian/patches/06_dont_log_broken_packets.patch + - Added. Don't log errors from recvmsg if there caused by broken ip + packets. Fixes log flooding on machines with bad links (From + upstream svn) (Closes: #386239) + * debian/patches/07_ia64_unaligned_access.patch + - Added. Some fixes for unaligned accesses as seen on ia64 (From upstream + svn) + * debian/patches/08_unicast_ipv6_only.patch + - Added. Set the unicast ipv6 socket as ipv6 only, as the linux ipv4 in + ipv6 misses some control info (From upstream svn) + * debian/patches/09_fionread.patch + - Added. It's valid for FIONREAD so handle this instead of throwing a + warning and failing (From upstream svn) + * debian/patches/10_widearea_socket_types.patch + - Added. Only create a unicast ipv4 or ipv6 socket for widecast if + respectively ipv4 or ipv6 is enabled. (From upstream svn) + * debian/patches/12_bogus_static_host_error_message.patch + - Added. Prevent logging of bogus error message when adding static .local + hosts. (from upstream svn) + * debian/patches/13_NULL_dns_service_refs.patch + - Added. Let the bonjour compatibility layer handle NULL services + references gracefully and don't use the service reference after + unreffing it. (From upstream svn) + + -- Sjoerd Simons Sun, 7 Jan 2007 15:32:56 +0100 + +avahi (0.6.16-1) unstable; urgency=low + + * New upstream release + * Uses a SO_PASSCRED-based check of the sending UID on netlink messages + (Closes: #399766) + * Removed patches which were merged upstream: + - debian/patches/09_initscripts-default.patch + - debian/patches/10_initscripts-scriptname.patch + - debian/patches/12_dbus1.0.patch + * 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. + * debian/patches/02_avahi-daemon-init-unicast-disable.patch + - Added. Prevent avahi from starting when there is a unicast .local domain + + -- Sjoerd Simons Thu, 28 Dec 2006 20:02:27 +0100 + +avahi (0.6.15-2) unstable; urgency=low + + * debian/patches/12_dbus1.0.patch: + + Fix version detection of dbus with version above 1.0. Also don't ever + call dbus_connection_close on shared connections as this is not allowed + by the DBus API. Patch from upstream SVN (r1333) + + -- Sebastian Dröge Mon, 13 Nov 2006 10:48:48 +0100 + +avahi (0.6.15-1) unstable; urgency=high + + * New upstream version, urgency=high because of potential security fix: + + Check that netlink messages actually originate from the kernel and + not another process + * debian/patches/02_local-service.patch: + + Dropped, merged upstream + * debian/control: + + Fix the avahi-autoipd description (Closes: #394330) + + -- Sebastian Dröge Mon, 6 Nov 2006 17:15:15 +0100 + +avahi (0.6.14-2) unstable; urgency=low + + [ Sebastian Dröge ] + * debian/control: + + Update Standards-Version to 3.7.2 + + Recommend dhcp3-client instead of non-existing dhclient + (Closes: #392076, #391924) + + Change QT to Qt in all descriptions (Closes: #384783) + + Change Maintainer to pkg-utopia team + + Add XS-X-Vcs-Svn control field + * debian/control, + debian/rules: + + Don't build avahi-autoipd on something else than Linux until it is + ported (Closes: #391298). Thanks to Aurelien Jarno + for the patch. + * debian/patches/10_initscripts-scriptname.patch: + + Set SCRIPTNAME variable in init scripts (Closes: #386957) + * debian/avahi-daemon.postinst: + + Add the netdev group unless it's already there (Closes: #385495, #389243) + * debian/avahi-autoipd.ifup, + debian/avahi-autoipd.ifdown, + debian/rules, + debian/patches/11_avahi-autoipd.action-add-routes.patch: + + Add ifupdown scripts to set routes to allow communication between + machines which only have an IPv4LL address assigned and those which + only have a routable address assigned. + See http://developer.apple.com/qa/qa2004/qa1357.html for more information. + + [ Sjoerd Simons ] + * debian/avahi-autoipd.ifup, + debian/avahi-autoipd.ifdown, + + Also recognise the NetworkManager method and address family(?!) as valid + for ipv4ll routes + + -- Sjoerd Simons Fri, 20 Oct 2006 21:55:17 +0200 + +avahi (0.6.14-1) unstable; urgency=low + + [ Sebastian Dröge ] + * New upstream release + * debian/patches/02_static-hosts.patch: + + Dropped, merged upstream + * debian/patches/02_local-service.patch: + + Fix detection whether a service is from the local machine. Patch from + upstream SVN (r1329) + * debian/control, + debian/avahi-autoipd.postinst: + debian/avahi-autoipd.postrm: + debian/avahi-autoipd.prerm, + debian/avahi-autoipd.install: + + Add new avahi-autoipd package + + [ Sjoerd Simons ] + * Let libavahi-compat-libdnssd1 recommend libnss-mdns instead of depending + on it. (Closes: #390614) + * Install avahi-autoipd's exit hook as zzz_avahi-autoipd to ensure it runs + last. + + -- Sjoerd Simons Mon, 2 Oct 2006 21:03:20 +0200 + +avahi (0.6.13-3) unstable; urgency=low + + [ Sebastian Dröge ] + * debian/control, + debian/pyversions: + + Allow the modules to be used with all supported python versions greater + or equal to 2.4 + * debian/pycompat: + + Dropped, not required by policy anymore + + [ Sjoerd Simons ] + * Make libavahi-compat-libdnssd1 depend on libnss-mdns as it's needed for + proper operation. + * debian/clean-la.mk: Copy clean-la.mk from the gnome-pkg-tools packages. + Removes dependency_libs from the .la file. + + -- Sjoerd Simons Sun, 3 Sep 2006 19:27:13 +0200 + + +avahi (0.6.13-2) unstable; urgency=low + + * debian/patches/02_static-hosts.patch: + + Fix assertion failure when using static hosts (Closes: #385297) + Patch from upstream SVN (r1285) + + -- Sebastian Dröge Wed, 30 Aug 2006 18:29:10 +0200 + +avahi (0.6.13-1) unstable; urgency=low + + * New upstream release + * debian/libavahi-client3.shlibs, + debian/libavahi-compat-libdnssd1.shlibs: + + Bumped for new functions + * debian/avahi-utils.install, + debian/avahi-utils.manpages: + + Added new avahi-set-host-name utility for setting the mDNS hostname + + -- Sebastian Dröge Sun, 27 Aug 2006 22:10:05 +0200 + +avahi (0.6.12-1) unstable; urgency=low + + * New upstream version + * Bump the shlibs for libavahi-glib and libavahi-client + + -- Sebastian Dröge Thu, 27 Jul 2006 15:46:57 +0200 + +avahi (0.6.11-1) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/copyright: Obfuscate Lennart poettering's e-mail address on his + request. + * Update the python bindings for the new policy. + + [ Sebastian Dröge ] + * New upstream release + * debian/patches/09_initscripts-default.patch: + Add /etc/default/avahi-daemon and /etc/default/avahi-dnsconfd to allow + disabling of the startup of both daemons (Closes: #349603) + + -- Sjoerd Simons Thu, 6 Jul 2006 00:49:30 +0200 + +avahi (0.6.10-1) unstable; urgency=high + + * New upstream release + * Urgency high, contains security fixes + - Local DOS via unspecified mDNS name conflicts (CVE-2006-2288) + - Local buffer overflow in avahi-core (CVS-2006-2289) + * No longer ship the avahi cli bindings, they now have their own source + package (Closes: #360881) + * Don't build-depend on libcap-dev on hurd, kfreebsd-* and netbsd-i386 archs + (Closes: #360596) + * Dropped patches that have been applied upstream: + + debian/patches/02_pthread_flags.patch + + debian/patches/03_cmsg_too_large.patch + + debian/patches/04_initscript_log_end_msg.patch + + debian/patches/05_empty_service_directory.patch + + debian/patches/07_avahi-sharp_missing_lock.patch + * debian/patches/99_autotools.patch + + Not needed anymore + * Bump libavahi-core3's shlibs + + -- Sjoerd Simons Wed, 10 May 2006 11:02:17 +0200 + +avahi (0.6.9-8) unstable; urgency=medium + + * Pass --disable-mono --disable-monodoc to configure on ia64 and powerpc. + This makes the fix in the previous package actually usefull. + + -- Sjoerd Simons Tue, 4 Apr 2006 00:33:58 +0200 + +avahi (0.6.9-7) unstable; urgency=medium + + [ Sebastian Dröge ] + * debian/patches/05_empty_service_directory.patch: + + updated to use upstream's solution for this which is much cleaner. + + [ Sjoerd Simons ] + * Urgency medium. Recent version include some big bug-fixes wrt. the testing + version. (i.e. it actually works on sparc64 and ppc64) + * Only build the mono library on i386 and amd64 for now. Other architectures + can't install the mono build-deps currently. + + -- Sjoerd Simons Tue, 4 Apr 2006 00:02:16 +0200 + +avahi (0.6.9-6) unstable; urgency=low + + [ Sjoerd Simons ] + * Also ship docs/NEWS (Closes: #355267) + * Don't let libavahi-client3 recommend avahi-daemon. Let the end-user apps + decide if they want to recommend avahi-daemon or not. (Closes: #357416) + * debian/patches/99_autotools.patch + + Added. Update the autotools files so + debian/patches/02_pthread_flags.patch actually has effect. Fixes ftbs on + mips (Closes: #358304) + + [ Sebastian Dröge ] + * debian/patches/04_initscript_log_end_msg.patch: + + Replace exit statements with return, otherwise log_end_msg might not + be called after d_start. Patch by Benjamin Leipold. (Closes: #358190) + * debian/patches/05_empty_service_directory.patch: + + Change the error message that is printed when running the daemon with an + empty or non-existing /etc/avahi/services directory to an informational + message as we have no service files installed by default. Also add that + this could be caused by an empty service directory. (Closes: #355615) + + + -- Sjoerd Simons Wed, 22 Mar 2006 20:01:46 +0100 + +avahi (0.6.9-5) unstable; urgency=low + + * debian/patches/03_cmsg_too_large.patch + + Updated. The previous version undid a fix for alignment on ia64. + + -- Sjoerd Simons Wed, 15 Mar 2006 19:01:15 +0100 + +avahi (0.6.9-4) unstable; urgency=low + + * debian/patches/03_cmsg_too_large.patch + + Added. Don't make the cmsg somewhat oversized. Fixes sendmsg returning + EINVAL on 64 bit machines with 32 bit user space. + + -- Sjoerd Simons Fri, 10 Mar 2006 10:12:02 +0100 + +avahi (0.6.9-3) unstable; urgency=low + + [ Sebastian Dröge ] + * Renamed libavahi-cil to libavahi1.0-cil to conform with the CLI policy + + [ Sjoerd Simons ] + * Fix typo in libavahi-core4's description (Closes: #355402) + * debian/patches/02_pthread_flags.patch + + Added. Check how gcc handles -pthread in combination with -shared. + Fixes FTBS on mips{,el}. (Was fixed, but patch was accidentally reverted + upstream) + + -- Sjoerd Simons Mon, 6 Mar 2006 17:14:09 +0100 + +avahi (0.6.9-2) unstable; urgency=low + + * Update shlibs of libavahi-common + + -- Sjoerd Simons Sat, 4 Mar 2006 10:36:51 +0100 + +avahi (0.6.9-1) unstable; urgency=low + + * New upstream release + * Added me to Uploaders + * Fix the permissions of avahi-sharp.dll + + -- Sebastian Dröge Thu, 2 Mar 2006 21:21:15 +0100 + +avahi (0.6.8-2) unstable; urgency=low + + * libavahi-core's soname changed from 3 to 4. As only + avahi-daemon depends on -core it's not a big problem luckily. + * Change the package to reflect the soname change (Closes: #354771) + + -- Sjoerd Simons Wed, 1 Mar 2006 10:23:35 +0100 + +avahi (0.6.8-1) unstable; urgency=low + + [ Ross Burton ] + * Package the avahi.hosts(5) manpage + * Package the hosts conffile + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/02_avahi-initscripts.patch + Applied upstream + + -- Sjoerd Simons Mon, 27 Feb 2006 23:13:05 +0100 + +avahi (0.6.7-1) unstable; urgency=low + + * New upstream release + * debian/patches/02_avahi-initscripts.patch + + Force the load of the capabilities kernel module before starting the + avahi-daemon. (Closes: #352858) + + Fix the restart argument of the initscripts + + -- Sjoerd Simons Wed, 15 Feb 2006 20:37:07 +0100 + +avahi (0.6.6-2) unstable; urgency=low + + * Add libcap-dev to the build-depends to enable chroot() support + (Closes: #351699) + * Update the avahi-dnsconfd description (Closes: 351273) + + -- Sjoerd Simons Sun, 12 Feb 2006 20:12:23 +0100 + +avahi (0.6.6-1) unstable; urgency=low + + * New upstream release + * s/Bonyour/Bonjour/ in libdnssd package descriptions (Closes: #349408) + * debian/patches/02_stdlib_NULL.patch + + Removed. Fixed upstream + * debian/patches/03_reduce_qt3lib_depends.patch + + Removed. Fixed upstream + * debian/patches/04_pthread_flags.patch + + Removed Fixed upstream + * Don't let avahi-daemon suggets avahi-dnsconfd + + -- Sjoerd Simons Thu, 2 Feb 2006 21:11:34 +0100 + +avahi (0.6.4-2) unstable; urgency=low + + * debian/patches/04_pthread_flags.patch + + Added. Check how gcc handles -pthread in combination with -shared. + Fixes FTBS on mips{,el}. + * Add --disabled-password to adduser options in postinst + + -- Sjoerd Simons Fri, 20 Jan 2006 10:40:27 +0100 + +avahi (0.6.4-1) unstable; urgency=low + + * New upstream release + * Make python2.4-avahi depend on python2.4-glade (Closes: #348284) + * debian/patches/02_avahi-sharp-mono1.1.13.patch + + Removed. Fixed upstream + * debian/patches/02_stdlib_NULL.patch + + Added. To use NULL on GNU/kFreeBSD needs to be included + (Thanks Aurelien Jarno) (Closes: #348405) + * debian/patches/03_reduce_qt3lib_depends.patch + + Added. Change avahi-qt3.pc to have qt3-mt in Requires.private instead of + Requires (Thanks Isaac Clerencia) (Closes: #347710) + * Make libavahi-client-dev depend on libdbus-1-dev + + -- Sjoerd Simons Tue, 17 Jan 2006 11:26:51 +0100 + +avahi (0.6.3-3) unstable; urgency=low + + * debian/patches/02_avahi-sharp-mono1.1.13.patch + + Added. Compatibility fixes for mono 1.1.13. + + -- Sjoerd Simons Fri, 13 Jan 2006 14:03:59 +0100 + +avahi (0.6.3-2) unstable; urgency=low + + * Add ia64 to the architectures that build-depend on the mono stuff + + -- Sjoerd Simons Thu, 12 Jan 2006 11:08:42 +0100 + +avahi (0.6.3-1) unstable; urgency=low + + * New upstream release (Closes: 347385) + * debian/patches/01_dbus060_compatibility.patch + + Removed. Fixed upstream + * debian/patches/02_avahi-sharp.patch + + Removed. Fixed upstream + * Don't build mono stuff on archs that don't support it (Closes: 347383) + * GNU dbm files aren't arch independent so libavahi-common-data must be an + arch: any package + * debian/patches/01_avahi-daemon.conf.patch + + Added. Don't browse any extra domains by default + * Add libavahi-client-dev depend to libavahi-compat-howl-dev + and libavahi-compat-libdnssd-dev (Closes: 347247) + + -- Sjoerd Simons Thu, 12 Jan 2006 00:23:42 +0100 + +avahi (0.6.1-4) unstable; urgency=low + + * Upload to unstable + + -- Sjoerd Simons Thu, 5 Jan 2006 22:13:55 +0100 + +avahi (0.6.1-2) experimental; urgency=low + + * Let libavahi-common-data conflict with libavahi-common0 + * Switch avahi-utils from Arch all to Arch any (Closes: #344354) + * avahi/debian/patches/02_avahi-sharp.patch + + Added. Fix avahi-sharp.dll.config.in to use libavahi-glib.so.1 instead + of libavahi-glib.so.0 (From avahi upstream svn) + * Add ${shlibds:Depends} to the avahi-utils depends. + * Add debian/libavahi-client3/usr/lib to dh_shlibdeps includes + * Also ship the avahi-browse-domains symlink + * Fix the avahi-discover description + * Have avahi-daemon depend on dbus (>= 0.60) + * Fix libavahi-cil depends + * Add libavahi-common-data to python2.4-avahi depends + * Update FSF address in copyright + + -- Sjoerd Simons Thu, 22 Dec 2005 20:02:11 +0100 + +avahi (0.6.1-1) experimental; urgency=low + + [ Sjoerd Simons ] + * New upstream release (closes: #341685) + * Depend on dbus >= 0.50-3 so we can use force-reload to have dbus reload + configuration. + * Create packages for howl and Apple Bonyour compatibility libraries + * Split out common data into libavahi-common-data + * Split out avahi-discover into it's own package + * Symlink /usr/include/avahi-compat-libdns_sd/dns_sd.h to + /usr/include/dns_sd.h for API compatability + * debian/patches/01_dbus060_compatibility.patch + + Added. Enables build against dbus 0.60 (from upstream svn) + * Update debian/copyright + * Add myself to Uploaders + + [ Ross Burton ] + * Add debian/watch + + -- Sjoerd Simons Mon, 19 Dec 2005 16:25:53 +0100 + +avahi (0.5.2-4) experimental; urgency=low + + * Add python2.4-gdbm dependency to python2.4-avahi (closes: #336900) + * Build monodoc manual (thanks Sebastian Dröge) + + -- Ross Burton Wed, 2 Nov 2005 08:49:48 +0000 + +avahi (0.5.2-3) experimental; urgency=low + + * Move all packages to their correct section (closes: #334565) + + -- Ross Burton Tue, 18 Oct 2005 19:05:22 +0100 + +avahi (0.5.2-2) experimental; urgency=low + + * -daemon depends on dbus-1-utils, and allow dbus-send to fail (Trent Lloyd). + * -utils recommends python2.4-glad2, and explain the recommends (TL). + + -- Ross Burton Mon, 10 Oct 2005 10:20:05 +0100 + +avahi (0.5.2-1) experimental; urgency=low + + * New upstream release. + * Change mono package to arch all. + + -- Ross Burton Mon, 3 Oct 2005 20:08:52 +0100 + +avahi (0.5-1) experimental; urgency=low + + [ Ross Burton ] + * Update for new library versions + * Added libavahi-cil mono bindings (thanks Andrew Mitchell) + * Build for Debian Experimental (closes: #324990) + * Split out python2.4-avahi + * Add QT3 and QT4 bindings + * Reload D-BUS configuration files and daemons on install + * Fix daemon prerm + * Add maintainer scripts for dnsconfd + * Move the avahi user's home directory + * Move .pc files to -dev packages + + [ Sjoerd Simons ] + * New upstream release + + -- Ross Burton Fri, 30 Sep 2005 12:16:39 +0100 + +avahi (0.2-0ubuntu1) breezy; urgency=low + + * New upstream version. + * Thanks to Trent Lloyd for the work + - Dropped all old patches, now merged upstream. + - Added new patch avahi-dnsconfd-crash.patch, fix from upstream. + + -- Ross Burton Tue, 30 Aug 2005 09:13:46 +0100 + +avahi (0.1-1) breezy; urgency=low + + * First upload. + * Thanks to Trent Lloyd for reviewing the packages. + + -- Ross Burton Tue, 23 Aug 2005 09:29:46 +0100 --- avahi-0.6.22.orig/debian/libavahi-glib1.shlibs +++ avahi-0.6.22/debian/libavahi-glib1.shlibs @@ -0,0 +1 @@ +libavahi-glib 1 libavahi-glib1 (>= 0.6.12) --- avahi-0.6.22.orig/debian/libavahi-core-dev.install +++ avahi-0.6.22/debian/libavahi-core-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/libavahi-core.so +debian/tmp/usr/lib/libavahi-core.la +debian/tmp/usr/lib/libavahi-core.a +debian/tmp/usr/include/avahi-core +debian/tmp/usr/lib/pkgconfig/avahi-core.pc --- avahi-0.6.22.orig/debian/avahi-utils.install +++ avahi-0.6.22/debian/avahi-utils.install @@ -0,0 +1,9 @@ +debian/tmp/usr/bin/avahi-browse +debian/tmp/usr/bin/avahi-browse-domains +debian/tmp/usr/bin/avahi-publish +debian/tmp/usr/bin/avahi-publish-address +debian/tmp/usr/bin/avahi-publish-service +debian/tmp/usr/bin/avahi-set-host-name +debian/tmp/usr/bin/avahi-resolve +debian/tmp/usr/bin/avahi-resolve-address +debian/tmp/usr/bin/avahi-resolve-host-name --- avahi-0.6.22.orig/debian/libavahi-ui-dev.install +++ avahi-0.6.22/debian/libavahi-ui-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/avahi-ui/avahi-ui.h +debian/tmp/usr/lib/libavahi-ui.so +debian/tmp/usr/lib/libavahi-ui.la +debian/tmp/usr/lib/libavahi-ui.a +debian/tmp/usr/lib/pkgconfig/avahi-ui.pc --- avahi-0.6.22.orig/debian/patches/11_avahi-autoipd.action-add-routes.patch +++ avahi-0.6.22/debian/patches/11_avahi-autoipd.action-add-routes.patch @@ -0,0 +1,30 @@ +--- avahi-autoipd/avahi-autoipd.action.linux 2006-10-20 09:42:33.732375000 +0200 ++++ avahi-autoipd/avahi-autoipd.action.linux 2006-10-20 09:44:35.003954000 +0200 +@@ -36,11 +36,13 @@ + + case "$1" in + BIND) +- ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" ++ ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" ++ ip route add default dev "$2" metric 1000 scope link || true + ;; + + CONFLICT|UNBIND|STOP) + ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" ++ ip route del default dev "$2" metric 1000 scope link || true + ;; + + *) +@@ -56,10 +58,12 @@ + case "$1" in + BIND) + ifconfig "$2:3" inet "$3" netmask 255.255.0.0 broadcast 169.254.255.255 up ++ route add default dev "$2:3" metric 1000 || true + ;; + + CONFLICT|STOP|UNBIND) + ifconfig "$2:3" down ++ route del default dev "$2:3" metric 1000 || true + ;; + + *) --- avahi-0.6.22.orig/debian/patches/01_avahi-daemon.conf.patch +++ avahi-0.6.22/debian/patches/01_avahi-daemon.conf.patch @@ -0,0 +1,12 @@ +--- avahi-daemon/avahi-daemon.conf.orig 2006-01-11 22:48:59.000000000 +0100 ++++ avahi-daemon/avahi-daemon.conf 2006-01-11 22:51:46.000000000 +0100 +@@ -23,7 +23,7 @@ + [server] + #host-name=foo + #domain-name=local +-browse-domains=0pointer.de, zeroconf.org ++#browse-domains=0pointer.de, zeroconf.org + use-ipv4=yes +-use-ipv6=no ++use-ipv6=yes + #check-response-ttl=no --- avahi-0.6.22.orig/debian/patches/60_hurd-fixes.patch +++ avahi-0.6.22/debian/patches/60_hurd-fixes.patch @@ -0,0 +1,127 @@ +diff -ur avahi-0.6.21-orig/avahi-core/Makefile.am avahi-0.6.21/avahi-core/Makefile.am +--- avahi-0.6.21-orig/avahi-core/Makefile.am 2007-04-13 01:41:00.000000000 +0200 ++++ avahi-0.6.21/avahi-core/Makefile.am 2007-08-20 23:09:35.000000000 +0200 +@@ -95,6 +95,9 @@ + if HAVE_PF_ROUTE + libavahi_core_la_SOURCES += \ + iface-pfroute.c iface-pfroute.h ++else ++libavahi_core_la_SOURCES += \ ++ iface-none.c + endif + endif + +diff -ur avahi-0.6.21-orig/avahi-core/Makefile.in avahi-0.6.21/avahi-core/Makefile.in +--- avahi-0.6.21-orig/avahi-core/Makefile.in 2007-08-12 18:08:47.338305000 +0200 ++++ avahi-0.6.21/avahi-core/Makefile.in 2007-08-20 23:10:21.673759000 +0200 +@@ -72,6 +72,9 @@ + @HAVE_NETLINK_FALSE@@HAVE_PF_ROUTE_TRUE@am__append_2 = \ + @HAVE_NETLINK_FALSE@@HAVE_PF_ROUTE_TRUE@ iface-pfroute.c iface-pfroute.h + ++@HAVE_NETLINK_FALSE@@HAVE_PF_ROUTE_FALSE@am__append_3 = \ ++@HAVE_NETLINK_FALSE@@HAVE_PF_ROUTE_FALSE@ iface-none.c ++ + subdir = avahi-core + DIST_COMMON = $(avahiinclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +@@ -108,10 +111,11 @@ + multicast-lookup.h querier.c querier.h addr-util.h addr-util.c \ + domain-util.h domain-util.c dns-srv-rr.h iface-linux.c \ + iface-linux.h netlink.c netlink.h iface-pfroute.c \ +- iface-pfroute.h ++ iface-pfroute.h iface-none.c + @HAVE_NETLINK_TRUE@am__objects_1 = libavahi_core_la-iface-linux.lo \ + @HAVE_NETLINK_TRUE@ libavahi_core_la-netlink.lo + @HAVE_NETLINK_FALSE@@HAVE_PF_ROUTE_TRUE@am__objects_2 = libavahi_core_la-iface-pfroute.lo ++@HAVE_NETLINK_FALSE@@HAVE_PF_ROUTE_FALSE@am__objects_3 = libavahi_core_la-iface-none.lo + am_libavahi_core_la_OBJECTS = libavahi_core_la-timeeventq.lo \ + libavahi_core_la-iface.lo libavahi_core_la-server.lo \ + libavahi_core_la-entry.lo libavahi_core_la-prioq.lo \ +@@ -133,7 +137,7 @@ + libavahi_core_la-multicast-lookup.lo \ + libavahi_core_la-querier.lo libavahi_core_la-addr-util.lo \ + libavahi_core_la-domain-util.lo $(am__objects_1) \ +- $(am__objects_2) ++ $(am__objects_2) $(am__objects_3) + libavahi_core_la_OBJECTS = $(am_libavahi_core_la_OBJECTS) + PROGRAMS = $(noinst_PROGRAMS) + am_avahi_reflector_OBJECTS = \ +@@ -525,7 +529,7 @@ + hashmap.c hashmap.h wide-area.c wide-area.h multicast-lookup.c \ + multicast-lookup.h querier.c querier.h addr-util.h addr-util.c \ + domain-util.h domain-util.c dns-srv-rr.h $(am__append_1) \ +- $(am__append_2) ++ $(am__append_2) $(am__append_3) + libavahi_core_la_CFLAGS = $(AM_CFLAGS) + libavahi_core_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la + libavahi_core_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CORE_VERSION_INFO) +@@ -725,6 +729,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-fdutil.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-hashmap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-iface-linux.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-iface-none.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-iface-pfroute.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-iface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libavahi_core_la-log.Plo@am__quote@ +@@ -1013,6 +1018,13 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_core_la_CFLAGS) $(CFLAGS) -c -o libavahi_core_la-iface-pfroute.lo `test -f 'iface-pfroute.c' || echo '$(srcdir)/'`iface-pfroute.c + ++libavahi_core_la-iface-none.lo: iface-none.c ++@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_core_la_CFLAGS) $(CFLAGS) -MT libavahi_core_la-iface-none.lo -MD -MP -MF "$(DEPDIR)/libavahi_core_la-iface-none.Tpo" -c -o libavahi_core_la-iface-none.lo `test -f 'iface-none.c' || echo '$(srcdir)/'`iface-none.c; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libavahi_core_la-iface-none.Tpo" "$(DEPDIR)/libavahi_core_la-iface-none.Plo"; else rm -f "$(DEPDIR)/libavahi_core_la-iface-none.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='iface-none.c' object='libavahi_core_la-iface-none.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libavahi_core_la_CFLAGS) $(CFLAGS) -c -o libavahi_core_la-iface-none.lo `test -f 'iface-none.c' || echo '$(srcdir)/'`iface-none.c ++ + avahi_reflector-avahi-reflector.o: avahi-reflector.c + @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avahi_reflector_CFLAGS) $(CFLAGS) -MT avahi_reflector-avahi-reflector.o -MD -MP -MF "$(DEPDIR)/avahi_reflector-avahi-reflector.Tpo" -c -o avahi_reflector-avahi-reflector.o `test -f 'avahi-reflector.c' || echo '$(srcdir)/'`avahi-reflector.c; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/avahi_reflector-avahi-reflector.Tpo" "$(DEPDIR)/avahi_reflector-avahi-reflector.Po"; else rm -f "$(DEPDIR)/avahi_reflector-avahi-reflector.Tpo"; exit 1; fi +--- /dev/null 2005-07-18 01:39:37.000000000 +0200 ++++ avahi-0.6.21/avahi-core/iface-none.c 2007-08-20 23:08:51.000000000 +0200 +@@ -0,0 +1,32 @@ ++/* $Id: iface-linux.c 1339 2006-12-12 02:12:03Z lathiat $ */ ++ ++/*** ++ This file is part of avahi. ++ ++ avahi is free software; you can redistribute it and/or modify it ++ under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ avahi is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General ++ Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with avahi; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 ++ USA. ++***/ ++ ++#include "iface.h" ++ ++int avahi_interface_monitor_init_osdep(AvahiInterfaceMonitor *m) { ++ return 0; ++} ++ ++void avahi_interface_monitor_free_osdep(AvahiInterfaceMonitor *m) { ++} ++ ++void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) { ++} +--- avahi-0.6.21-orig/avahi-client/xdg-config.c 2006-08-31 19:18:03.887351000 +0200 ++++ avahi-0.6.21/avahi-client/xdg-config.c 2007-08-20 23:18:31.782555000 +0200 +@@ -31,6 +31,10 @@ + + #include "xdg-config.h" + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + FILE *avahi_xdg_config_open(const char *filename) { + FILE *f; + const char *e, *d; --- avahi-0.6.22.orig/debian/patches/80_better_poof.patch +++ avahi-0.6.22/debian/patches/80_better_poof.patch @@ -0,0 +1,78 @@ +Index: avahi-core/cache.c +=================================================================== +--- avahi-core/cache.c (revision 1745) ++++ avahi-core/cache.c (working copy) +@@ -444,12 +444,15 @@ + + static void* start_poof_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void *userdata) { + AvahiAddress *a = userdata; ++ struct timeval now; + + assert(c); + assert(pattern); + assert(e); + assert(a); +- ++ ++ gettimeofday(&now, NULL); ++ + switch (e->state) { + case AVAHI_CACHE_VALID: + +@@ -458,15 +461,23 @@ + + e->state = AVAHI_CACHE_POOF; + e->poof_address = *a; +- ++ e->poof_timestamp = now; ++ e->poof_num = 0; ++ + break; + + case AVAHI_CACHE_POOF: ++ if (avahi_timeval_diff(&now, &e->poof_timestamp) < 1000000) ++ break; + +- /* This is the second time we got no response, so let's ++ e->poof_timestamp = now; ++ e->poof_address = *a; ++ e->poof_num ++; ++ ++ /* This is the 4th time we got no response, so let's + * fucking remove this entry. */ +- +- expire_in_one_second(c, e, AVAHI_CACHE_POOF_FINAL); ++ if (e->poof_num > 3) ++ expire_in_one_second(c, e, AVAHI_CACHE_POOF_FINAL); + break; + + default: +Index: avahi-core/server.c +=================================================================== +--- avahi-core/server.c (revision 1745) ++++ avahi-core/server.c (working copy) +@@ -585,7 +585,8 @@ + + if (!legacy_unicast && !from_local_iface) { + reflect_query(s, i, key); +- avahi_cache_start_poof(i->cache, key, a); ++ if (!unicast_response) ++ avahi_cache_start_poof(i->cache, key, a); + } + + if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 && +Index: avahi-core/cache.h +=================================================================== +--- avahi-core/cache.h (revision 1745) ++++ avahi-core/cache.h (working copy) +@@ -48,8 +48,10 @@ + AvahiCache *cache; + AvahiRecord *record; + struct timeval timestamp; ++ struct timeval poof_timestamp; + struct timeval expiry; + int cache_flush; ++ int poof_num; + + AvahiAddress origin; + --- avahi-0.6.22.orig/debian/patches/70_gobject_libs_typo.patch +++ avahi-0.6.22/debian/patches/70_gobject_libs_typo.patch @@ -0,0 +1,24 @@ +diff -Naur avahi-0.6.22.orig/avahi-gobject/Makefile.am avahi-0.6.22/avahi-gobject/Makefile.am +--- avahi-0.6.22.orig/avahi-gobject/Makefile.am 2008-01-03 13:36:25.000000000 +0100 ++++ avahi-0.6.22/avahi-gobject/Makefile.am 2008-01-03 13:36:51.000000000 +0100 +@@ -63,7 +63,7 @@ + $(BUILT_SOURCES) + + libavahi_gobject_la_CFLAGS = $(AM_CFLAGS) $(GOBJECT_CFLAGS) +-libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOJECT_LIBS) ++libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOBJECT_LIBS) + libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO) + + # correctly clean the generated source files +diff -Naur avahi-0.6.22.orig/avahi-gobject/Makefile.in avahi-0.6.22/avahi-gobject/Makefile.in +--- avahi-0.6.22.orig/avahi-gobject/Makefile.in 2008-01-03 13:36:25.000000000 +0100 ++++ avahi-0.6.22/avahi-gobject/Makefile.in 2008-01-03 13:36:51.000000000 +0100 +@@ -518,7 +518,7 @@ + @HAVE_GOBJECT_TRUE@ $(BUILT_SOURCES) + + @HAVE_GOBJECT_TRUE@libavahi_gobject_la_CFLAGS = $(AM_CFLAGS) $(GOBJECT_CFLAGS) +-@HAVE_GOBJECT_TRUE@libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOJECT_LIBS) ++@HAVE_GOBJECT_TRUE@libavahi_gobject_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GOBJECT_LIBS) + @HAVE_GOBJECT_TRUE@libavahi_gobject_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_GOBJECT_VERSION_INFO) + + # correctly clean the generated source files --- avahi-0.6.22.orig/debian/avahi-dnsconfd.install +++ avahi-0.6.22/debian/avahi-dnsconfd.install @@ -0,0 +1,2 @@ +debian/tmp/etc/avahi/avahi-dnsconfd.action +debian/tmp/usr/sbin/avahi-dnsconfd --- avahi-0.6.22.orig/debian/libavahi-client-dev.install +++ avahi-0.6.22/debian/libavahi-client-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/libavahi-client.so +debian/tmp/usr/lib/libavahi-client.la +debian/tmp/usr/lib/libavahi-client.a +debian/tmp/usr/include/avahi-client +debian/tmp/usr/lib/pkgconfig/avahi-client.pc --- avahi-0.6.22.orig/debian/libavahi-compat-howl0.install +++ avahi-0.6.22/debian/libavahi-compat-howl0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhowl.so.* --- avahi-0.6.22.orig/debian/avahi-autoipd.postinst +++ avahi-0.6.22/debian/avahi-autoipd.postinst @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + if ! getent passwd avahi-autoipd >/dev/null; then + adduser --disabled-password --quiet --system \ + --home /var/lib/avahi-autoipd \ + --gecos "Avahi autoip daemon" --group avahi-autoipd + fi + # FIXME: restart it somehow... SIGHUP? + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + --- avahi-0.6.22.orig/debian/libavahi-compat-howl-dev.install +++ avahi-0.6.22/debian/libavahi-compat-howl-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/libhowl.so +debian/tmp/usr/lib/libhowl.la +debian/tmp/usr/lib/libhowl.a +debian/tmp/usr/include/avahi-compat-howl +debian/tmp/usr/lib/pkgconfig/avahi-compat-howl.pc --- avahi-0.6.22.orig/debian/avahi-autoipd.ifdown +++ avahi-0.6.22/debian/avahi-autoipd.ifdown @@ -0,0 +1,32 @@ +#!/bin/sh -e +# Description: Remove routes to allow communication between machines which +# only have an IPv4LL address assigned and those which only +# have a routable address assigned. These were added by +# /etc/network/if-up.d/avahi-autoipd. +# +# See http://developer.apple.com/qa/qa2004/qa1357.html for +# more information. + + +[ "$IFACE" != "lo" ] || exit 0 +case "$ADDRFAM" in + inet|NetworkManager) ;; + *) exit 0 +esac +case "$METHOD" in + static|dhcp|NetworkManager) ;; + *) exit 0 +esac + +if [ -x /bin/ip ]; then + # route already present? + ip route show | grep -q '^169.254.0.0/16[[:space:]]' && exit 0 + + /bin/ip route del 169.254.0.0/16 dev $IFACE metric 1000 scope link || true +elif [ -x /sbin/route ]; then + # route already present? + /sbin/route -n | grep -q "^169.254.0.0[[:space:]]" && exit 0 + + /sbin/route del -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000 || true +fi + --- avahi-0.6.22.orig/debian/avahi-utils.manpages +++ avahi-0.6.22/debian/avahi-utils.manpages @@ -0,0 +1,9 @@ +debian/tmp/usr/share/man/man1/avahi-browse.1 +debian/tmp/usr/share/man/man1/avahi-browse-domains.1 +debian/tmp/usr/share/man/man1/avahi-publish.1 +debian/tmp/usr/share/man/man1/avahi-publish-address.1 +debian/tmp/usr/share/man/man1/avahi-publish-service.1 +debian/tmp/usr/share/man/man1/avahi-set-host-name.1 +debian/tmp/usr/share/man/man1/avahi-resolve.1 +debian/tmp/usr/share/man/man1/avahi-resolve-address.1 +debian/tmp/usr/share/man/man1/avahi-resolve-host-name.1 --- avahi-0.6.22.orig/debian/avahi-autoipd.postrm +++ avahi-0.6.22/debian/avahi-autoipd.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + deluser --quiet --system avahi-autoipd > /dev/null || true + delgroup --quiet --system avahi-autoipd > /dev/null || true +fi + --- avahi-0.6.22.orig/debian/avahi-autoipd.ifup +++ avahi-0.6.22/debian/avahi-autoipd.ifup @@ -0,0 +1,32 @@ +#!/bin/sh -e +# Description: Add routes to allow communication between machines which +# only have an IPv4LL address assigned and those which only +# have a routable address assigned. +# +# See http://developer.apple.com/qa/qa2004/qa1357.html for +# more information. + +[ "$IFACE" != "lo" ] || exit 0 +case "$ADDRFAM" in + inet|NetworkManager) ;; + *) exit 0 +esac + +case "$METHOD" in + static|dhcp|NetworkManager) ;; + *) exit 0 +esac + + +if [ -x /bin/ip ]; then + # route already present? + ip route show | grep -q '^169.254.0.0/16[[:space:]]' && exit 0 + + /bin/ip route add 169.254.0.0/16 dev $IFACE metric 1000 scope link +elif [ -x /sbin/route ]; then + # route already present? + /sbin/route -n | egrep -q "^169.254.0.0[[:space:]]" && exit 0 + + /sbin/route add -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000 +fi + --- avahi-0.6.22.orig/debian/avahi-daemon.postrm +++ avahi-0.6.22/debian/avahi-daemon.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + deluser --quiet --system avahi > /dev/null || true + delgroup --quiet --system avahi > /dev/null || true +fi + --- avahi-0.6.22.orig/debian/avahi-daemon.links +++ avahi-0.6.22/debian/avahi-daemon.links @@ -0,0 +1 @@ +etc/network/if-up.d/avahi-daemon etc/network/if-post-down.d/avahi-daemon --- avahi-0.6.22.orig/debian/avahi-daemon.preinst +++ avahi-0.6.22/debian/avahi-daemon.preinst @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "0.6.20-1"; then + if [ -d "/etc/avahi/etc" ]; then + rm -f /etc/avahi/etc/localtime; + rmdir --ignore-fail-on-non-empty /etc/avahi/etc; + fi + fi +esac + +#DEBHELPER# + --- avahi-0.6.22.orig/debian/python-avahi.install +++ avahi-0.6.22/debian/python-avahi.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python*/site-packages/avahi --- avahi-0.6.22.orig/debian/libavahi-gobject0.install +++ avahi-0.6.22/debian/libavahi-gobject0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-gobject.so.* --- avahi-0.6.22.orig/debian/libavahi-client3.shlibs +++ avahi-0.6.22/debian/libavahi-client3.shlibs @@ -0,0 +1 @@ +libavahi-client 3 libavahi-client3 (>= 0.6.13) --- avahi-0.6.22.orig/debian/libavahi-common3.install +++ avahi-0.6.22/debian/libavahi-common3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-common.so.* --- avahi-0.6.22.orig/debian/libavahi-compat-libdnssd1.shlibs +++ avahi-0.6.22/debian/libavahi-compat-libdnssd1.shlibs @@ -0,0 +1 @@ +libdns_sd 1 libavahi-compat-libdnssd1 (>= 0.6.13) --- avahi-0.6.22.orig/debian/avahi-daemon.resolvconf +++ avahi-0.6.22/debian/avahi-daemon.resolvconf @@ -0,0 +1,8 @@ +#!/bin/sh +# +# 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 +fi --- avahi-0.6.22.orig/debian/libavahi-compat-libdnssd1.install +++ avahi-0.6.22/debian/libavahi-compat-libdnssd1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdns_sd.so.* --- avahi-0.6.22.orig/debian/avahi-dnsconfd.default +++ avahi-0.6.22/debian/avahi-dnsconfd.default @@ -0,0 +1,2 @@ +# 0 = don't start, 1 = start +AVAHI_DNSCONFD_START=1 --- avahi-0.6.22.orig/debian/libavahi-qt4-1.install +++ avahi-0.6.22/debian/libavahi-qt4-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libavahi-qt4.so.*