diff --git a/.cvsignore b/.cvsignore
index c64c272..628f888 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-avahi-0.6.15.tar.gz
+avahi-0.6.16.tar.gz
diff --git a/avahi-0.6.15-netdev.patch b/avahi-0.6.15-netdev.patch
new file mode 100644
index 0000000..3cf0bc6
--- /dev/null
+++ b/avahi-0.6.15-netdev.patch
@@ -0,0 +1,14 @@
+--- avahi-0.6.15/avahi-daemon/avahi-dbus.conf.in.netdev 2006-12-28 19:29:09.000000000 +0100
++++ avahi-0.6.15/avahi-daemon/avahi-dbus.conf.in 2006-12-28 19:29:15.000000000 +0100
+@@ -19,7 +19,7 @@
+
+
+
+-
++
+
+
+
+
+
+
diff --git a/avahi.spec b/avahi.spec
index 37a1476..92c6205 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -5,8 +5,8 @@
%define WITH_MONO 0
%endif
Name: avahi
-Version: 0.6.15
-Release: 4%{?dist}
+Version: 0.6.16
+Release: 1%{?dist}
Summary: Local network service discovery
Group: System Environment/Base
License: LGPL
@@ -15,7 +15,7 @@ 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 >= 1.10, automake < 1.11
+BuildRequires: automake
BuildRequires: libtool
BuildRequires: dbus-devel >= 0.90
BuildRequires: dbus-glib-devel >= 0.70
@@ -38,13 +38,12 @@ Obsoletes: howl
Source0: %{name}-%{version}.tar.gz
# enable mono's mcs to work in beehive buildroot:
Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch
-Patch13: avahi-0.6.9-bz185972.patch
Patch14: avahi-0.6.9-bz189427.patch
Patch15: avahi-0.6.9-mono-libdir.patch
Patch17: avahi-0.6.11-use-ipv6-yes.patch
Patch20: avahi-0.6.15-initscript.patch
Patch21: avahi-0.6.11-align.patch
-Patch22: avahi-0.6.15-dbus1.0.patch
+Patch23: avahi-0.6.15-netdev.patch
%description
@@ -166,13 +165,12 @@ Header files for development with the Apple Bonjour mDNSResponder compatibility
%if %{WITH_MONO}
%patch6 -p1 -b .MONO_SHARED_DIR
%endif
-%patch13 -p1 -b .bz185972
%patch14 -p1 -b .bz189427
%patch15 -p1 -b .mono-libdir
%patch17 -p1 -b .use-ipv6-yes
%patch20 -p1 -b .initscript
%patch21 -p1 -b .align
-%patch22 -p1 -b .dbus10
+%patch23 -p1 -b .netdev
%build
# auto* update needed for avahi-0.5.2-fedora.patch
@@ -181,7 +179,7 @@ libtoolize --force
automake-1.10 --add-missing
autoconf
-%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl \
+%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi\
%if %{WITH_COMPAT_DNSSD}
--enable-compat-libdns_sd \
%endif
@@ -386,6 +384,12 @@ fi
%endif
%changelog
+* Mon Jan 22 2007 Martin Bacovsky - 0.6.16-1.fc7
+- Resolves: #221763: CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon
+- upgrade to new upstream
+- patch revision
+- Resolves: #218140: avahi configuration file wants a non-existent group
+
* Wed Dec 6 2006 Jeremy Katz - 0.6.15-4
- rebuild against python 2.5
diff --git a/sources b/sources
index 4239f8c..26d3975 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94dbd41336d18c47fc8213735a3fbf8e avahi-0.6.15.tar.gz
+3cbc460bbd55bae35f7b57443c063640 avahi-0.6.16.tar.gz