From ce96915d5b77d5e9344ab3d68a346f69bbecab00 Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Wed, 6 Dec 2006 23:08:05 -0600 Subject: [PATCH] [security] avahi: updated to version 0.6.15, see http://nvd.nist.gov/nvd.cfm?cvename=CVE-2006-5461; added dbus 1.0.x fix --- avahi/.footprint | 17 +++++++++++------ avahi/.md5sum | 3 ++- avahi/Pkgfile | 5 +++-- avahi/avahi-dbus-major-version.patch | 11 +++++++++++ 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 avahi/avahi-dbus-major-version.patch diff --git a/avahi/.footprint b/avahi/.footprint index 27b12dab2..03b8b41fc 100644 --- a/avahi/.footprint +++ b/avahi/.footprint @@ -17,10 +17,12 @@ lrwxrwxrwx root/root usr/bin/avahi-resolve-host-name -> avahi-resolve -rwxr-xr-x root/root usr/bin/avahi-set-host-name drwxr-xr-x root/root usr/etc/ drwxr-xr-x root/root usr/etc/avahi/ +-rwxr-xr-x root/root usr/etc/avahi/avahi-autoipd.action -rw-r--r-- root/root usr/etc/avahi/avahi-daemon.conf -rwxr-xr-x root/root usr/etc/avahi/avahi-dnsconfd.action -rw-r--r-- root/root usr/etc/avahi/hosts drwxr-xr-x root/root usr/etc/avahi/services/ +-rw-r--r-- root/root usr/etc/avahi/services/sftp-ssh.service -rw-r--r-- root/root usr/etc/avahi/services/ssh.service drwxr-xr-x root/root usr/etc/dbus-1/ drwxr-xr-x root/root usr/etc/dbus-1/system.d/ @@ -84,14 +86,14 @@ drwxr-xr-x root/root usr/include/avahi-glib/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libavahi-client.a -rwxr-xr-x root/root usr/lib/libavahi-client.la -lrwxrwxrwx root/root usr/lib/libavahi-client.so -> libavahi-client.so.3.2.0 -lrwxrwxrwx root/root usr/lib/libavahi-client.so.3 -> libavahi-client.so.3.2.0 --rwxr-xr-x root/root usr/lib/libavahi-client.so.3.2.0 +lrwxrwxrwx root/root usr/lib/libavahi-client.so -> libavahi-client.so.3.2.1 +lrwxrwxrwx root/root usr/lib/libavahi-client.so.3 -> libavahi-client.so.3.2.1 +-rwxr-xr-x root/root usr/lib/libavahi-client.so.3.2.1 -rw-r--r-- root/root usr/lib/libavahi-common.a -rwxr-xr-x root/root usr/lib/libavahi-common.la -lrwxrwxrwx root/root usr/lib/libavahi-common.so -> libavahi-common.so.3.4.2 -lrwxrwxrwx root/root usr/lib/libavahi-common.so.3 -> libavahi-common.so.3.4.2 --rwxr-xr-x root/root usr/lib/libavahi-common.so.3.4.2 +lrwxrwxrwx root/root usr/lib/libavahi-common.so -> libavahi-common.so.3.4.3 +lrwxrwxrwx root/root usr/lib/libavahi-common.so.3 -> libavahi-common.so.3.4.3 +-rwxr-xr-x root/root usr/lib/libavahi-common.so.3.4.3 -rw-r--r-- root/root usr/lib/libavahi-core.a -rwxr-xr-x root/root usr/lib/libavahi-core.la lrwxrwxrwx root/root usr/lib/libavahi-core.so -> libavahi-core.so.4.0.4 @@ -146,10 +148,13 @@ drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/avahi.hosts.5.gz -rw-r--r-- root/root usr/man/man5/avahi.service.5.gz drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/avahi-autoipd.8.gz +-rw-r--r-- root/root usr/man/man8/avahi-autoipd.action.8.gz -rw-r--r-- root/root usr/man/man8/avahi-daemon.8.gz -rw-r--r-- root/root usr/man/man8/avahi-dnsconfd.8.gz -rw-r--r-- root/root usr/man/man8/avahi-dnsconfd.action.8.gz drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/avahi-autoipd -rwxr-xr-x root/root usr/sbin/avahi-daemon -rwxr-xr-x root/root usr/sbin/avahi-dnsconfd drwxr-xr-x root/root usr/share/ diff --git a/avahi/.md5sum b/avahi/.md5sum index 798614dd9..6b9fd4fda 100644 --- a/avahi/.md5sum +++ b/avahi/.md5sum @@ -1,2 +1,3 @@ -d1000689979105cc95b9ca102284aae4 avahi-0.6.13.tar.gz +94dbd41336d18c47fc8213735a3fbf8e avahi-0.6.15.tar.gz +fbf45925c86ad3c2687c3a5da3e784a8 avahi-dbus-major-version.patch 9379c518fad18582698babf08bc14f84 rc.avahi diff --git a/avahi/Pkgfile b/avahi/Pkgfile index 002ac75f7..e4bb42e73 100644 --- a/avahi/Pkgfile +++ b/avahi/Pkgfile @@ -4,13 +4,14 @@ # Depends on: libdaemon, dbus, dbus-python, pygtk, libglade name=avahi -version=0.6.13 +version=0.6.15 release=1 source=(http://avahi.org/download/$name-$version.tar.gz \ - rc.$name) + rc.$name $name-dbus-major-version.patch) build() { cd $name-$version + patch avahi-daemon/dbus-protocol.c -i $SRC/$name-dbus-major-version.patch ./configure --prefix=/usr \ --localstatedir=/var \ --mandir=/usr/man \ diff --git a/avahi/avahi-dbus-major-version.patch b/avahi/avahi-dbus-major-version.patch new file mode 100644 index 000000000..462160c02 --- /dev/null +++ b/avahi/avahi-dbus-major-version.patch @@ -0,0 +1,11 @@ +--- dbus-protocol.c.orig 2006-12-05 22:27:05.409994516 -0600 ++++ dbus-protocol.c 2006-12-05 22:27:42.887277120 -0600 +@@ -1067,7 +1067,7 @@ + if (dbus_bus_request_name( + server->bus, + AVAHI_DBUS_NAME, +-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) ++#if (DBUS_VERSION_MAJOR >= 1) || ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) + DBUS_NAME_FLAG_DO_NOT_QUEUE, + #else + DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,