Tue Nov 28 17:27:10 UTC 2006

Author: mbacovsk

Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31763

Modified Files:
	.cvsignore avahi.spec sources 
Added Files:
	avahi-0.5.2-fedora.patch avahi-0.5.2-start_after_dbus.patch 
	avahi-0.6-dbus-0.6.patch avahi-0.6-initscript_status.patch 
	avahi-0.6.11-netlink-source.patch avahi-0.6.3-bz177148.patch 
	avahi-0.6.3-lockfile.patch avahi-0.6.4-bz178784.patch 
	avahi-0.6.4-initscript-i18n.patch avahi-0.6.4-localtime.patch 
	avahi-0.6.5-bz179448.patch avahi-0.6.7-initscript.patch 
	avahi-sharp-lock.patch 
Removed Files:
	avahi-0.6.15-initscript.patch 
Log Message:
* Tue Nov 28 2006 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.11-2.fc5
- fix bug #216655 - CVE-2006-5461 - avahi did not verify
  the sender identity of netlink messages


avahi-0.5.2-fedora.patch:
 configure.ac                        |    5 +-
 initscript/Makefile.am              |    4 +
 initscript/fedora/Makefile.am       |   34 ++++++++++++++
 initscript/fedora/avahi-daemon.in   |   87 ++++++++++++++++++++++++++++++++++++
 initscript/fedora/avahi-dnsconfd.in |   87 ++++++++++++++++++++++++++++++++++++
 5 files changed, 216 insertions(+), 1 deletion(-)

Index: avahi-0.5.2-fedora.patch
===================================================================
RCS file: avahi-0.5.2-fedora.patch
diff -N avahi-0.5.2-fedora.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.5.2-fedora.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,262 @@
+--- avahi-0.5.2.fedora/configure.ac.fedora	2005-10-20 18:05:07.000000000 +0200
++++ avahi-0.5.2.fedora/configure.ac	2005-10-19 18:02:19.000000000 +0200
+@@ -62,6 +62,7 @@
+     AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
+     AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
+     AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
++    AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
+ fi
+ with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
+ 
+@@ -70,7 +71,7 @@
+     exit 1
+ else
+ case $with_distro in
+-    debian|gentoo|archlinux|suse|none)
++    debian|gentoo|archlinux|suse|fedora|none)
+      ;;
+     *)
+      AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check])
+@@ -82,6 +83,7 @@
+ AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
+ AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
+ AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux)
++AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
+ 
+ test_gcc_flag() {
+     AC_LANG_CONFTEST([int main() {}])
+@@ -543,6 +545,7 @@
+ initscript/gentoo/Makefile
+ initscript/archlinux/Makefile
+ initscript/suse/Makefile
++initscript/fedora/Makefile
+ avahi-dnsconfd/Makefile
+ avahi-utils/Makefile
+ avahi-utils/avahi/Makefile
+--- avahi-0.5.2.fedora/initscript/fedora/Makefile.am.fedora	2005-10-20 18:06:09.000000000 +0200
++++ avahi-0.5.2.fedora/initscript/fedora/Makefile.am	2005-10-19 18:06:26.000000000 +0200
+@@ -0,0 +1,34 @@
++# $Id$
++
++# 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 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 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.
++
++initddir = $(sysconfdir)/init.d
++
++EXTRA_DIST = avahi-daemon.in avahi-dnsconfd.in
++
++initd_SCRIPTS = avahi-daemon avahi-dnsconfd
++
++CLEANFILES = avahi-daemon avahi-dnsconfd
++
++avahi-daemon: avahi-daemon.in
++	sed -e 's, at sbindir\@,$(sbindir),g' $< > $@
++	chmod +x $@
++
++avahi-dnsconfd: avahi-dnsconfd.in
++	sed -e 's, at sbindir\@,$(sbindir),g' $< > $@
++	chmod +x $@
+--- avahi-0.5.2.fedora/initscript/fedora/avahi-dnsconfd.in.fedora	2005-10-20 18:06:04.000000000 +0200
++++ avahi-0.5.2.fedora/initscript/fedora/avahi-dnsconfd.in	2005-10-20 18:02:10.000000000 +0200
+@@ -0,0 +1,87 @@
++#! /bin/sh
++#
++# avahi-daemon:       Starts the Avahi dns configuration daemon
++#
++# chkconfig: - 34 66
++# description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
++#       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
++#       on the local LAN. This is useful for configuring unicast DNS servers in
++#       a DHCP-like fashion with mDNS.
++# processname: avahi-dnsconfd
++# config: 
++
++OTHER_AVAHI_OPTS=""
++
++# Source function library.
++. /etc/init.d/functions
++
++. /etc/sysconfig/network
++
++# Check that networking is configured.
++[ ${NETWORKING} = "no" ] && exit 0
++
++AVAHI_BIN=@sbindir@/avahi-dnsconfd
++test -x $AVAHI_BIN || exit 5
++
++start() {
++	echo -n $"Starting Avahi DNS daemon... "
++        $AVAHI_BIN -D
++	RETVAL=$?
++	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	echo
++	return $RETVAL
++}
++
++stop() {
++        echo -n "Shutting down Avahi DNS daemon: "
++        $AVAHI_BIN -k
++	RETVAL=$?
++	echo
++	return $RETVAL
++}
++
++reload() {
++        echo -n "Reloading Avahi DNS daemon... "
++        $AVAHI_BIN -r
++	RETVAL=$?
++	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	echo
++	return $RETVAL
++}
++
++
++restart() {
++	stop
++	start
++}
++
++RETVAL=0
++
++# See how we were called.
++case "$1" in
++  start)
++	start
++	;;
++  stop)
++	stop
++	;;
++  status)
++        $AVAHI_BIN -c
++	[ $? = 0 ] && echo "Avahi DNS daemon is running" || echo "Avahi DNS daemon is not running"
++	;;
++  restart)
++	restart
++	;;
++  reload)
++        reload 
++	;;
++  condrestart)
++        $AVAHI_BIN -c
++        [ $? = 0 ] && restart || :
++	;;
++  *)
++	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
++	exit 1
++esac
++
++exit $?
+--- avahi-0.5.2.fedora/initscript/fedora/avahi-daemon.in.fedora	2005-10-20 18:05:59.000000000 +0200
++++ avahi-0.5.2.fedora/initscript/fedora/avahi-daemon.in	2005-10-20 18:02:20.000000000 +0200
+@@ -0,0 +1,87 @@
++#! /bin/sh
++#
++# avahi-daemon:       Starts the Avahi Daemon
++#
++# chkconfig: 345 34 66
++# description: This is a daemon which runs on client machines to perform \
++#              Zeroconf service discovery on a network. avahi-daemon must be \
++#              running on systems  that use Avahi for service discovery. \
++#              Avahi-daemon should not be running otherwise.
++# processname: avahi-daemon
++# config: 
++
++OTHER_AVAHI_OPTS=""
++
++# Source function library.
++. /etc/init.d/functions
++
++. /etc/sysconfig/network
++
++# Check that networking is configured.
++[ ${NETWORKING} = "no" ] && exit 0
++
++AVAHI_BIN=@sbindir@/avahi-daemon
++test -x $AVAHI_BIN || exit 5
++
++start() {
++	echo -n $"Starting Avahi daemon... "
++        $AVAHI_BIN -D
++	RETVAL=$?
++	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	echo
++	return $RETVAL
++}
++
++stop() {
++        echo -n "Shutting down Avahi daemon: "
++        $AVAHI_BIN -k
++	RETVAL=$?
++	echo
++	return $RETVAL
++}
++
++reload() {
++        echo -n "Reloading Avahi daemon... "
++        $AVAHI_BIN -r
++	RETVAL=$?
++	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	echo
++	return $RETVAL
++}
++
++
++restart() {
++	stop
++	start
++}
++
++RETVAL=0
++
++# See how we were called.
++case "$1" in
++  start)
++	start
++	;;
++  stop)
++	stop
++	;;
++  status)
++        $AVAHI_BIN -c
++	[ $? = 0 ] && echo "Avahi daemon is running" || echo "Avahi daemon is not running"
++	;;
++  restart)
++	restart
++	;;
++  reload)
++        reload 
++	;;
++  condrestart)
++        $AVAHI_BIN -c
++        [ $? = 0 ] && restart || :
++	;;
++  *)
++	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
++	exit 1
++esac
++
++exit $?
+--- avahi-0.5.2.fedora/initscript/Makefile.am.fedora	2005-10-21 13:41:31.000000000 +0200
++++ avahi-0.5.2.fedora/initscript/Makefile.am	2005-10-19 17:59:57.000000000 +0200
+@@ -34,3 +34,7 @@
+ if TARGET_SUSE
+ SUBDIRS += suse
+ endif
++
++if TARGET_FEDORA
++SUBDIRS += fedora
++endif

avahi-0.5.2-start_after_dbus.patch:
 avahi-daemon.in   |    2 +-
 avahi-dnsconfd.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: avahi-0.5.2-start_after_dbus.patch
===================================================================
RCS file: avahi-0.5.2-start_after_dbus.patch
diff -N avahi-0.5.2-start_after_dbus.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.5.2-start_after_dbus.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,22 @@
+--- avahi-0.5.2/initscript/fedora/avahi-daemon.in.start_after_dbus	2005-10-28 18:44:31.000000000 -0400
++++ avahi-0.5.2/initscript/fedora/avahi-daemon.in	2005-10-28 18:44:56.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+ # avahi-daemon:       Starts the Avahi Daemon
+ #
+-# chkconfig: 345 34 66
++# chkconfig: 345 98 02
+ # description: This is a daemon which runs on client machines to perform \
+ #              Zeroconf service discovery on a network. avahi-daemon must be \
+ #              running on systems  that use Avahi for service discovery. \
+--- avahi-0.5.2/initscript/fedora/avahi-dnsconfd.in.start_after_dbus	2005-10-28 18:44:31.000000000 -0400
++++ avahi-0.5.2/initscript/fedora/avahi-dnsconfd.in	2005-10-28 18:45:09.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+ # avahi-daemon:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 34 66
++# chkconfig: - 34 98 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
+ #       on the local LAN. This is useful for configuring unicast DNS servers in

avahi-0.6-dbus-0.6.patch:
 dbus-protocol.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: avahi-0.6-dbus-0.6.patch
===================================================================
RCS file: avahi-0.6-dbus-0.6.patch
diff -N avahi-0.6-dbus-0.6.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6-dbus-0.6.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,11 @@
+--- avahi-0.6/avahi-daemon/dbus-protocol.c.dbus-0.6	2005-11-16 14:30:53.000000000 -0500
++++ avahi-0.6/avahi-daemon/dbus-protocol.c	2005-12-01 18:31:04.000000000 -0500
+@@ -1021,7 +1021,7 @@
+         goto fail;
+     }
+ 
+-    if (dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
++    if (dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, 0, &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+         if (dbus_error_is_set(&error)) {
+             avahi_log_error("dbus_bus_request_name(): %s", error.message);
+             goto fail;

avahi-0.6-initscript_status.patch:
 avahi-daemon.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Index: avahi-0.6-initscript_status.patch
===================================================================
RCS file: avahi-0.6-initscript_status.patch
diff -N avahi-0.6-initscript_status.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6-initscript_status.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,33 @@
+--- avahi-0.6/initscript/fedora/avahi-daemon.in.initscript_status	2005-11-22 13:01:04.000000000 -0500
++++ avahi-0.6/initscript/fedora/avahi-daemon.in	2005-11-30 14:22:24.000000000 -0500
+@@ -23,6 +23,8 @@
+ AVAHI_BIN=@sbindir@/avahi-daemon
+ test -x $AVAHI_BIN || exit 5
+ 
++base=${0##*/}
++
+ start() {
+ 	echo -n $"Starting Avahi daemon... "
+         $AVAHI_BIN -D
+@@ -36,6 +38,7 @@
+         echo -n "Shutting down Avahi daemon: "
+         $AVAHI_BIN -k
+ 	RETVAL=$?
++	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+ 	echo
+ 	return $RETVAL
+ }
+@@ -44,12 +47,11 @@
+         echo -n "Reloading Avahi daemon... "
+         $AVAHI_BIN -r
+ 	RETVAL=$?
+-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	[ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload"
+ 	echo
+ 	return $RETVAL
+ }
+ 
+-
+ restart() {
+ 	stop
+ 	start

avahi-0.6.11-netlink-source.patch:
 0 files changed

--- NEW FILE avahi-0.6.11-netlink-source.patch ---
--- avahi-0.6.11.old/avahi-core/netlink.c	(revision 1329)
+++ avahi-0.6.11/avahi-core/netlink.c	(working copy)
@@ -62,6 +62,12 @@
 
     p = (struct nlmsghdr *) nl->buffer;
     
+    /* Check that this message originated from the kernel,
+       or a request from avahi itself, and not another process */
+    if ((p->nlmsg_pid != 0) && (p->nlmsg_pid != getpid())) {
+        return -1;
+    }
+
     assert(nl->callback);
     
     for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {

avahi-0.6.3-bz177148.patch:
 avahi-daemon.in |    5 +++++
 1 files changed, 5 insertions(+)

Index: avahi-0.6.3-bz177148.patch
===================================================================
RCS file: avahi-0.6.3-bz177148.patch
diff -N avahi-0.6.3-bz177148.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.3-bz177148.patch	28 Nov 2006 17:27:08 -0000	1.4
@@ -0,0 +1,14 @@
+--- avahi-0.6.3/initscript/fedora/avahi-daemon.in.bz177148	2006-01-09 14:57:41.767520000 -0500
++++ avahi-0.6.3/initscript/fedora/avahi-daemon.in	2006-01-09 14:59:40.580588000 -0500
+@@ -27,6 +27,11 @@
+ 
+ start() {
+ 	echo -n $"Starting Avahi daemon... "
++	if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then
++	    success;
++	    echo;
++	    return 0;
++	fi;
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+ 	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"

avahi-0.6.3-lockfile.patch:
 avahi-daemon.in   |   20 ++++++++++++--------
 avahi-dnsconfd.in |   21 +++++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

Index: avahi-0.6.3-lockfile.patch
===================================================================
RCS file: avahi-0.6.3-lockfile.patch
diff -N avahi-0.6.3-lockfile.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.3-lockfile.patch	28 Nov 2006 17:27:08 -0000	1.5
@@ -0,0 +1,104 @@
+--- avahi-0.6.6/initscript/fedora/avahi-daemon.in.lockfile	2006-02-10 15:41:55.000000000 -0500
++++ avahi-0.6.6/initscript/fedora/avahi-daemon.in	2006-02-10 15:41:55.000000000 -0500
+@@ -23,18 +23,20 @@
+ AVAHI_BIN=@sbindir@/avahi-daemon
+ test -x $AVAHI_BIN || exit 5
+ 
++LOCKFILE=/var/lock/subsys/avahi-daemon
++
+ base=${0##*/}
+ 
+ start() {
+ 	echo -n $"Starting Avahi daemon... "
+-	if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then
+-	    success;
+-	    echo;
+-	    return 0;
+-	fi;
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	if [ $RETVAL = 0 ]; then
++		touch $LOCKFILE
++		success $"$base startup"
++	else
++		failure $"$base startup"
++	fi
+ 	echo
+ 	return $RETVAL
+ }
+@@ -44,6 +46,7 @@
+         $AVAHI_BIN -k
+ 	RETVAL=$?
+ 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
++	rm -f $LOCKFILE
+ 	echo
+ 	return $RETVAL
+ }
+@@ -83,8 +86,9 @@
+         reload 
+ 	;;
+   condrestart)
+-        $AVAHI_BIN -c
+-        [ $? = 0 ] && restart || :
++  	if [ -f $LOCKFILE ]; then
++		restart
++	fi
+ 	;;
+   *)
+ 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+--- avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in.lockfile	2006-02-10 15:41:55.000000000 -0500
++++ avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in	2006-02-10 15:43:03.000000000 -0500
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ #
+-# avahi-daemon:       Starts the Avahi dns configuration daemon
++# avahi-dnsconfd:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 34 98 02
++# chkconfig: - 98 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
+ #       on the local LAN. This is useful for configuring unicast DNS servers in
+@@ -23,11 +23,18 @@
+ AVAHI_BIN=@sbindir@/avahi-dnsconfd
+ test -x $AVAHI_BIN || exit 5
+ 
++LOCKFILE=/var/lock/subsys/avahi-dnsconfd
++
+ start() {
+ 	echo -n $"Starting Avahi DNS daemon... "
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
++	if [ $RETVAL = 0 ]; then
++		touch $LOCKFILE
++		success $"$base startup"
++	else
++		failure $"$base startup"
++	fi
+ 	echo
+ 	return $RETVAL
+ }
+@@ -36,6 +43,8 @@
+         echo -n "Shutting down Avahi DNS daemon: "
+         $AVAHI_BIN -k
+ 	RETVAL=$?
++	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
++	rm -f $LOCKFILE
+ 	echo
+ 	return $RETVAL
+ }
+@@ -76,9 +85,9 @@
+         reload 
+ 	;;
+   condrestart)
+-        $AVAHI_BIN -c
+-        [ $? = 0 ] && restart || :
+-	;;
++  	if [ -f $LOCKFILE ]; then
++		restart
++	fi
+   *)
+ 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+ 	exit 1

avahi-0.6.4-bz178784.patch:
 avahi-dnsconfd.in |    2 ++
 1 files changed, 2 insertions(+)

Index: avahi-0.6.4-bz178784.patch
===================================================================
RCS file: avahi-0.6.4-bz178784.patch
diff -N avahi-0.6.4-bz178784.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.4-bz178784.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,14 @@
+--- avahi-0.6.4/initscript/fedora/avahi-dnsconfd.in.bz178746	2006-01-23 15:58:38.000000000 -0500
++++ avahi-0.6.4/initscript/fedora/avahi-dnsconfd.in	2006-01-23 19:17:38.000000000 -0500
+@@ -88,9 +88,11 @@
+   	if [ -f $LOCKFILE ]; then
+ 		restart
+ 	fi
++	;;
+   *)
+ 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+ 	exit 1
++	;;
+ esac
+ 
+ exit $?

avahi-0.6.4-initscript-i18n.patch:
 avahi-daemon.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: avahi-0.6.4-initscript-i18n.patch
===================================================================
RCS file: avahi-0.6.4-initscript-i18n.patch
diff -N avahi-0.6.4-initscript-i18n.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.4-initscript-i18n.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,29 @@
+--- avahi-0.6.4/initscript/fedora/avahi-daemon.in.i18n	2006-01-16 18:48:50.000000000 -0500
++++ avahi-0.6.4/initscript/fedora/avahi-daemon.in	2006-01-19 16:41:21.000000000 -0500
+@@ -40,7 +40,7 @@
+ }
+ 
+ stop() {
+-        echo -n "Shutting down Avahi daemon: "
++        echo -n $"Shutting down Avahi daemon: "
+         $AVAHI_BIN -k
+ 	RETVAL=$?
+ 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+@@ -49,7 +49,7 @@
+ }
+ 
+ reload() {
+-        echo -n "Reloading Avahi daemon... "
++        echo -n $"Reloading Avahi daemon... "
+         $AVAHI_BIN -r
+ 	RETVAL=$?
+ 	[ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload"
+@@ -74,7 +74,7 @@
+ 	;;
+   status)
+         $AVAHI_BIN -c
+-	[ $? = 0 ] && echo "Avahi daemon is running" || echo "Avahi daemon is not running"
++	[ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+ 	;;
+   restart)
+ 	restart

avahi-0.6.4-localtime.patch:
 avahi-daemon.in |    3 +++
 1 files changed, 3 insertions(+)

Index: avahi-0.6.4-localtime.patch
===================================================================
RCS file: avahi-0.6.4-localtime.patch
diff -N avahi-0.6.4-localtime.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.4-localtime.patch	28 Nov 2006 17:27:08 -0000	1.4
@@ -0,0 +1,12 @@
+--- avahi-0.6.4/initscript/fedora/avahi-daemon.in.localtime	2006-01-23 19:44:16.000000000 -0500
++++ avahi-0.6.4/initscript/fedora/avahi-daemon.in	2006-01-26 12:34:30.000000000 -0500
+@@ -29,6 +29,9 @@
+ 
+ start() {
+ 	echo -n $"Starting Avahi daemon... "
++	if [ -s /etc/localtime ]; then
++	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
++	fi;
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+ 	if [ $RETVAL = 0 ]; then

avahi-0.6.5-bz179448.patch:
 socket.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: avahi-0.6.5-bz179448.patch
===================================================================
RCS file: avahi-0.6.5-bz179448.patch
diff -N avahi-0.6.5-bz179448.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.5-bz179448.patch	28 Nov 2006 17:27:08 -0000	1.6
@@ -0,0 +1,42 @@
+--- avahi-0.6.6/avahi-core/socket.c.bz179448	2005-11-09 13:45:51.000000000 -0500
++++ avahi-0.6.6/avahi-core/socket.c	2006-02-02 14:40:29.000000000 -0500
+@@ -456,10 +456,10 @@
+     struct iovec io;
+ #ifdef IP_PKTINFO
+     struct cmsghdr *cmsg;
+-    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
++    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
+ #elif defined(IP_SENDSRCADDR)
+     struct cmsghdr *cmsg;
+-    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
++    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
+ #endif
+ 
+     assert(fd >= 0);
+@@ -542,7 +542,7 @@
+     struct msghdr msg;
+     struct iovec io;
+     struct cmsghdr *cmsg;
+-    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
++    size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
+ 
+     assert(fd >= 0);
+     assert(p);
+@@ -596,7 +596,7 @@
+     AvahiDnsPacket *p= NULL;
+     struct msghdr msg;
+     struct iovec io;
+-    uint8_t aux[1024];
++    size_t aux[1024 / sizeof(size_t)]; /* for alignment on ia64 ! */
+     ssize_t l;
+     struct cmsghdr *cmsg;
+     int found_addr = 0;
+@@ -726,7 +726,7 @@
+     AvahiDnsPacket *p = NULL;
+     struct msghdr msg;
+     struct iovec io;
+-    uint8_t aux[64];
++    size_t aux[1024 / sizeof(size_t)];
+     ssize_t l;
+     int ms;
+     struct cmsghdr *cmsg;

avahi-0.6.7-initscript.patch:
 avahi-dnsconfd.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: avahi-0.6.7-initscript.patch
===================================================================
RCS file: avahi-0.6.7-initscript.patch
diff -N avahi-0.6.7-initscript.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-0.6.7-initscript.patch	28 Nov 2006 17:27:08 -0000	1.4
@@ -0,0 +1,47 @@
+--- avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in.initscript	2006-02-09 16:55:06.000000000 -0500
++++ avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in	2006-02-17 12:33:03.000000000 -0500
+@@ -2,7 +2,7 @@
+ #
+ # avahi-daemon:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 34 98 02
++# chkconfig: - 98 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
+ #       on the local LAN. This is useful for configuring unicast DNS servers in
+@@ -23,7 +23,7 @@
+ AVAHI_BIN=@sbindir@/avahi-dnsconfd
+ test -x $AVAHI_BIN || exit 5
+ 
+-LOCKFILE=/var/lock/subsys/avahi-daemon
++LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+ 
+ start() {
+ 	echo -n $"Starting Avahi DNS daemon... "
+@@ -40,7 +40,7 @@
+ }
+ 
+ stop() {
+-        echo -n "Shutting down Avahi DNS daemon: "
++        echo -n $"Shutting down Avahi DNS daemon: "
+         $AVAHI_BIN -k
+ 	RETVAL=$?
+ 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+@@ -50,7 +50,7 @@
+ }
+ 
+ reload() {
+-        echo -n "Reloading Avahi DNS daemon... "
++        echo -n $"Reloading Avahi DNS daemon... "
+         $AVAHI_BIN -r
+ 	RETVAL=$?
+ 	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
+@@ -76,7 +76,7 @@
+ 	;;
+   status)
+         $AVAHI_BIN -c
+-	[ $? = 0 ] && echo "Avahi DNS daemon is running" || echo "Avahi DNS daemon is not running"
++	[ $? = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
+ 	;;
+   restart)
+ 	restart

avahi-sharp-lock.patch:
 EntryGroup.cs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Index: avahi-sharp-lock.patch
===================================================================
RCS file: avahi-sharp-lock.patch
diff -N avahi-sharp-lock.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ avahi-sharp-lock.patch	28 Nov 2006 17:27:08 -0000	1.3
@@ -0,0 +1,23 @@
+http://www.avahi.org/changeset/1188
+Fixes a sporadic crash in banshee
+
+
+Index: trunk/avahi-sharp/EntryGroup.cs
+===================================================================
+--- trunk/avahi-sharp/EntryGroup.cs (revision 1021)
++++ trunk/avahi-sharp/EntryGroup.cs (revision 1188)
+@@ -237,9 +237,13 @@
+                                  string domain, string host, UInt16 port, IntPtr list)
+         {
+-            int ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
++            int ret;
++
++            lock (client) {
++                ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
+                                                             Utility.StringToBytes (name),
+                                                             Utility.StringToBytes (type),
+                                                             Utility.StringToBytes (domain),
+                                                             Utility.StringToBytes (host), port, list);
++            }
+             
+             avahi_string_list_free (list);


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Nov 2006 15:33:12 -0000	1.14
+++ .cvsignore	28 Nov 2006 17:27:08 -0000	1.15
@@ -1 +1 @@
-avahi-0.6.15.tar.gz
+avahi-0.6.11.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- avahi.spec	28 Nov 2006 15:33:12 -0000	1.52
+++ avahi.spec	28 Nov 2006 17:27:08 -0000	1.53
@@ -5,20 +5,19 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.15
-Release: 	    1%{?dist}
+Version:        0.6.11
+Release: 	    2%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://avahi.org
-BuildRoot:	    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Requires(post): initscripts, chkconfig, ldconfig
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
-BuildRequires:  dbus-devel >= 0.90
-BuildRequires:  dbus-glib-devel >= 0.70
+BuildRequires:  dbus-devel
 BuildRequires:  dbus-python
 BuildRequires:  libxml2-python
 BuildRequires:  gtk2-devel
@@ -34,16 +33,27 @@
 %if %{WITH_MONO}
 BuildRequires:  mono-devel >= 1.1.13
 %endif
-Obsoletes:	    howl
+Obsoletes:	howl
 Source0:        %{name}-%{version}.tar.gz
+Patch1:		avahi-0.5.2-fedora.patch
+Patch2:		avahi-0.5.2-start_after_dbus.patch
+Patch3:         avahi-0.6-initscript_status.patch
+Patch4:         avahi-0.6-dbus-0.6.patch
+Patch5:         avahi-0.6.3-bz177148.patch
 # enable mono's mcs to work in beehive buildroot:
-Patch6:     avahi-0.6.3-MONO_SHARED_DIR.patch
+Patch6:         avahi-0.6.3-MONO_SHARED_DIR.patch
+Patch7: 	avahi-0.6.4-initscript-i18n.patch
+Patch8:		avahi-0.6.3-lockfile.patch
+Patch9: 	avahi-0.6.4-localtime.patch
+Patch10:	avahi-0.6.4-bz178784.patch
+Patch11:        avahi-0.6.5-bz179448.patch
+Patch12:	avahi-0.6.7-initscript.patch
 Patch13: 	avahi-0.6.9-bz185972.patch
 Patch14:	avahi-0.6.9-bz189427.patch
 Patch15:	avahi-0.6.9-mono-libdir.patch
+Patch16:	avahi-sharp-lock.patch
 Patch17:	avahi-0.6.11-use-ipv6-yes.patch
-Patch21: 	avahi-0.6.11-align.patch
-Patch20: 	avahi-0.6.15-initscript.patch
+Patch18:    avahi-0.6.11-netlink-source.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -161,16 +171,37 @@
 
 %prep
 %setup -q
+#%patch1 -p1 -b .fedora
+#^- this patch now upstream
+#%patch2 -p1 -b .start_after_dbus
+#^- this patch now upstream
+#%patch3 -p1 -b .initscript_status
+#^- this patch now upstream
+#%patch4 -p1 -b .dbus-0.6
+#^- this patch now upstream
+#%patch5 -p1 -b .bz177148
+#^- this patch now upstream
 %if %{WITH_MONO}
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
+#%patch7 -p1 -b .i18n
+#^- this patch now upstream
+#%patch8 -p1 -b .lockfile
+#^- this patch now upstream
+#%patch9 -p1 -b .localtime
+#^- this patch now upstream
+#%patch10 -p1 -b .bz178746
+#^- this patch now upstream
+#%patch11 -p1 -b .bz179448
+#^- this patch now upstream
+%patch12 -p1 -b .initscript
 %patch13 -p1 -b .bz185972
 %patch14 -p1 -b .bz189427
 %patch15 -p1 -b .mono-libdir
+#%patch16 -p1 -b .sharp-lock
+#^- this patch now upstream
 %patch17 -p1 -b .use-ipv6-yes
-%patch20 -p1 -b .initscript
-%patch21 -p1 -b .align
-
+%patch18 -p1 -b .netlink-source
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
 aclocal -I common
@@ -294,8 +325,6 @@
 %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
 %config %{_sysconfdir}/avahi/avahi-dnsconfd.action
-%config %{_sysconfdir}/avahi/avahi-autoipd.action
-%config %{_sysconfdir}/avahi/services/sftp-ssh.service
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/libavahi-common.so.*
@@ -383,9 +412,9 @@
 %endif
 
 %changelog
-* Tue Nov 28 2006 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.15-1.fc5 
-- upgrade to upstream version 0.6.15
-- patches revision
+* Tue Nov 28 2006 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.11-2.fc5
+- fix bug #216655 - CVE-2006-5461 - avahi did not verify 
+  the sender identity of netlink messages
 
 * Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.11-1
 - Upgrade to upstream version 0.6.11


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Nov 2006 15:33:12 -0000	1.14
+++ sources	28 Nov 2006 17:27:08 -0000	1.15
@@ -1 +1 @@
-94dbd41336d18c47fc8213735a3fbf8e  avahi-0.6.15.tar.gz
+91fd8cc0c2bae638848faad36cf1c032  avahi-0.6.11.tar.gz


--- avahi-0.6.15-initscript.patch DELETED ---


