commit avahi for openSUSE:11.2

Hello community, here is the log from the commit of package avahi for openSUSE:11.2 checked in at Mon Feb 28 17:21:52 CET 2011. -------- avahi-mono.changes: same change avahi-qt4.changes: same change --- old-versions/11.2/all/avahi/avahi.changes 2009-10-07 21:48:33.000000000 +0200 +++ 11.2/avahi/avahi.changes 2011-02-17 17:56:29.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 17 17:44:08 CET 2011 - vuntz@opensuse.org + +- Add avahi-0.6.25-fixcrash.patch: avoid crash due to assertion + when receiving corrupt packets. (CVE-2010-2244) +- Add avahi-null-packet-infinite-loop.patch: fix an infinite loop + eating CPU when receiving corrupted/null packets. Fix bnc#671797. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.2/all/avahi Destination is old-versions/11.2/UPDATES/all/avahi calling whatdependson for 11.2-i586 New: ---- avahi-0.6.25-fixcrash.patch avahi-null-packet-infinite-loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi-glib2.spec ++++++ --- /var/tmp/diff_new_pack.M5J4U8/_old 2011-02-28 17:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.M5J4U8/_new 2011-02-28 17:20:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package avahi-glib2 (Version 0.6.25) +# spec file for package avahi-glib2 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ %define build_qt3 0 %define build_qt4 0 Version: 0.6.25 -Release: 4.<RELEASE1> +Release: 16.<RELEASE2> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -49,7 +49,7 @@ %endif Url: http://www.avahi.org/ Group: System/Daemons -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -71,6 +71,10 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch +#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer +Patch12: avahi-0.6.25-fixcrash.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch13: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -132,7 +136,7 @@ %if %build_core %package -n libavahi-client3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -150,7 +154,7 @@ across LAN segments. %package -n libavahi-common3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -168,7 +172,7 @@ across LAN segments. %package -n libavahi-core6 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -186,7 +190,7 @@ across LAN segments. %package -n libdns_sd -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -224,7 +228,7 @@ correct mDNS reflection accross LAN segments. %package -n libhowl0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -247,7 +251,7 @@ correct mDNS reflection accross LAN segments. %package -n python-avahi -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -290,7 +294,7 @@ across LAN segments. %package -n libavahi-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -360,7 +364,7 @@ %if %build_glib2 %package -n libavahi-ui0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -378,7 +382,7 @@ across LAN segments. %package -n libavahi-glib1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -401,7 +405,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -419,7 +423,7 @@ across LAN segments. %package -n avahi-utils-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -443,7 +447,7 @@ across LAN segments. %package -n python-avahi-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -469,7 +473,7 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel Group: Development/Libraries/C and C++ @@ -492,7 +496,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -515,6 +519,7 @@ %package -n libavahi-qt3-1 + Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -538,6 +543,7 @@ %package -n libavahi-qt3-devel + Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -563,7 +569,7 @@ %if %build_qt4 %package -n libavahi-qt4-1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -586,7 +592,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-qt4-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -613,7 +619,7 @@ %if %build_mono %package -n avahi-mono -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -642,6 +648,8 @@ %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. ++++++ avahi-mono.spec ++++++ --- /var/tmp/diff_new_pack.M5J4U8/_old 2011-02-28 17:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.M5J4U8/_new 2011-02-28 17:20:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package avahi-mono (Version 0.6.25) +# spec file for package avahi-mono # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ %define build_qt3 0 %define build_qt4 0 Version: 0.6.25 -Release: 4.<RELEASE2> +Release: 4.<RELEASE7> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -49,7 +49,7 @@ %endif Url: http://www.avahi.org/ Group: Development/Languages/Mono -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -71,6 +71,10 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch +#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer +Patch12: avahi-0.6.25-fixcrash.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch13: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -131,7 +135,7 @@ %if %build_core %package -n libavahi-client3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -149,7 +153,7 @@ across LAN segments. %package -n libavahi-common3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -167,7 +171,7 @@ across LAN segments. %package -n libavahi-core6 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -185,7 +189,7 @@ across LAN segments. %package -n libdns_sd -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -223,7 +227,7 @@ correct mDNS reflection accross LAN segments. %package -n libhowl0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -246,7 +250,7 @@ correct mDNS reflection accross LAN segments. %package -n python-avahi -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -289,7 +293,7 @@ across LAN segments. %package -n libavahi-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -359,7 +363,7 @@ %if %build_glib2 %package -n libavahi-ui0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -377,7 +381,7 @@ across LAN segments. %package -n libavahi-glib1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -400,7 +404,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -418,7 +422,7 @@ across LAN segments. %package -n avahi-utils-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -442,7 +446,7 @@ across LAN segments. %package -n python-avahi-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -468,7 +472,7 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel Group: Development/Libraries/C and C++ @@ -491,7 +495,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -514,6 +518,7 @@ %package -n libavahi-qt3-1 + Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -537,6 +542,7 @@ %package -n libavahi-qt3-devel + Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -562,7 +568,7 @@ %if %build_qt4 %package -n libavahi-qt4-1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -585,7 +591,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-qt4-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -612,7 +618,7 @@ %if %build_mono %package -n avahi-mono -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -641,6 +647,8 @@ %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. ++++++ avahi-qt4.spec ++++++ --- /var/tmp/diff_new_pack.M5J4U8/_old 2011-02-28 17:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.M5J4U8/_new 2011-02-28 17:20:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package avahi-qt4 (Version 0.6.25) +# spec file for package avahi-qt4 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ %define build_qt3 0 %define build_qt4 1 Version: 0.6.25 -Release: 4.<RELEASE1> +Release: 16.<RELEASE2> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -49,7 +49,7 @@ %endif Url: http://www.avahi.org/ Group: System/GUI/KDE -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -71,6 +71,10 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch +#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer +Patch12: avahi-0.6.25-fixcrash.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch13: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -134,7 +138,7 @@ %if %build_core %package -n libavahi-client3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -152,7 +156,7 @@ across LAN segments. %package -n libavahi-common3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -170,7 +174,7 @@ across LAN segments. %package -n libavahi-core6 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -188,7 +192,7 @@ across LAN segments. %package -n libdns_sd -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -226,7 +230,7 @@ correct mDNS reflection accross LAN segments. %package -n libhowl0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -249,7 +253,7 @@ correct mDNS reflection accross LAN segments. %package -n python-avahi -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -292,7 +296,7 @@ across LAN segments. %package -n libavahi-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -362,7 +366,7 @@ %if %build_glib2 %package -n libavahi-ui0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -380,7 +384,7 @@ across LAN segments. %package -n libavahi-glib1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -403,7 +407,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -421,7 +425,7 @@ across LAN segments. %package -n avahi-utils-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -445,7 +449,7 @@ across LAN segments. %package -n python-avahi-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -471,7 +475,7 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel Group: Development/Libraries/C and C++ @@ -494,7 +498,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -517,6 +521,7 @@ %package -n libavahi-qt3-1 + Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -540,6 +545,7 @@ %package -n libavahi-qt3-devel + Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -565,7 +571,7 @@ %if %build_qt4 %package -n libavahi-qt4-1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -588,7 +594,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-qt4-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -615,7 +621,7 @@ %if %build_mono %package -n avahi-mono -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -644,6 +650,8 @@ %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.M5J4U8/_old 2011-02-28 17:20:35.000000000 +0100 +++ /var/tmp/diff_new_pack.M5J4U8/_new 2011-02-28 17:20:35.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package avahi (Version 0.6.25) +# spec file for package avahi # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ %define build_qt3 0 %define build_qt4 0 Version: 0.6.25 -Release: 4.<RELEASE2> +Release: 4.<RELEASE7> %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 # Create split spec files only when building per partes: #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) @@ -51,7 +51,7 @@ %endif Url: http://www.avahi.org/ Group: System/Daemons -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Source: %{_name}-%{version}.tar.bz2 Source1: gnome-nettool2.png @@ -73,6 +73,10 @@ Patch10: avahi-unicastdomains.patch # PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead Patch11: avahi-init_unused-not-dead.patch +#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer +Patch12: avahi-0.6.25-fixcrash.patch +# PATCH-FIX-UPSTREAM avahi-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325 +Patch13: avahi-null-packet-infinite-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config # Even if we are not building python bindings, we need python to build service types database: @@ -134,7 +138,7 @@ %if %build_core %package -n libavahi-client3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -152,7 +156,7 @@ across LAN segments. %package -n libavahi-common3 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -170,7 +174,7 @@ across LAN segments. %package -n libavahi-core6 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -188,7 +192,7 @@ across LAN segments. %package -n libdns_sd -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # mDNSResponder-lib used unversioned soname. @@ -226,7 +230,7 @@ correct mDNS reflection accross LAN segments. %package -n libhowl0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Group: System/Libraries # Old name used for <= 10.3: @@ -249,7 +253,7 @@ correct mDNS reflection accross LAN segments. %package -n python-avahi -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python PreReq: coreutils Requires: %{name} = %{version} python-gdbm dbus-1-python python-twisted python-twisted-web @@ -273,7 +277,7 @@ elsewhere, like correct mDNS reflection across LAN segments. %package utils -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Command Line Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -292,7 +296,7 @@ across LAN segments. %package -n libavahi-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development # Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel @@ -315,7 +319,7 @@ correct mDNS reflection accross LAN segments. %package compat-mDNSResponder-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: mDNSResponder Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libdns_sd = %{version} Group: Development/Libraries/C and C++ @@ -338,7 +342,7 @@ correct mDNS reflection accross LAN segments. %package compat-howl-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Requires: libavahi-devel = %{version} libhowl0 = %{version} Group: Development/Libraries/C and C++ @@ -362,7 +366,7 @@ %if %build_glib2 %package -n libavahi-ui0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Libraries @@ -380,7 +384,7 @@ across LAN segments. %package -n libavahi-glib1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Glib Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/GNOME # Old name used for <= 10.3: @@ -403,7 +407,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject0 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Group: System/Daemons @@ -421,7 +425,7 @@ across LAN segments. %package -n avahi-utils-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: GTK+ Utilities for D-BUS Service for Zeroconf and Bonjour Requires: %{_name} >= %{version} Group: Productivity/Networking/Other @@ -445,7 +449,7 @@ across LAN segments. %package -n python-avahi-gtk -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: A set of Avahi utilities written in Python Using python-gtk PreReq: coreutils Requires: python-avahi = %{version} python-gtk @@ -471,7 +475,7 @@ elsewhere, like correct mDNS reflection across LAN segments. %package -n libavahi-glib-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-ui0 = %{version} libavahi-glib1 = %{version} glib2-devel gtk2-devel Group: Development/Libraries/C and C++ @@ -494,7 +498,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-gobject-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: D-BUS Service for Zeroconf and Bonjour Requires: libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel Group: System/Daemons @@ -517,6 +521,7 @@ %package -n libavahi-qt3-1 + Summary: Qt3 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -540,6 +545,7 @@ %package -n libavahi-qt3-devel + Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt3-1 = %{version} qt3-devel Group: Development/Libraries/C and C++ @@ -565,7 +571,7 @@ %if %build_qt4 %package -n libavahi-qt4-1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Qt4 Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Group: System/GUI/KDE # Old name used for <= 10.3: @@ -588,7 +594,7 @@ correct mDNS reflection accross LAN segments. %package -n libavahi-qt4-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Include Files and Libraries Mandatory for Development Requires: libavahi-devel = %{version} libavahi-qt4-1 = %{version} libqt4-devel Group: Development/Libraries/C and C++ @@ -615,7 +621,7 @@ %if %build_mono %package -n avahi-mono -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Group: Development/Languages/Mono @@ -644,6 +650,8 @@ %patch3 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %if !%build_core # Replace all .la references from local .la files to installed versions # with exception of libavahi-glib.la. ++++++ avahi-0.6.25-fixcrash.patch ++++++

From cef39a95d31834ab3aac2ea09970ad54d5f5a08b Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 19 May 2010 15:43:44 +0200 Subject: [PATCH] ignore packet if FIONREAD returns zero

zero size is reported for corrupt packets. recvmsg() later could nevertheless get data from a good packet that followed the bad one. So get out early to avoid hitting an assertion. --- avahi-core/socket.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/avahi-core/socket.c b/avahi-core/socket.c index 4146d5a..49238c2 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -652,6 +652,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4( goto fail; } + /* corrupt packets have zero size */ + if (!ms) + goto fail; + p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); @@ -805,6 +809,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( goto fail; } + /* corrupt packets have zero size */ + if (!ms) + goto fail; + p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); -- 1.7.1 ++++++ avahi-null-packet-infinite-loop.patch ++++++ Index: avahi-0.6.25/avahi-core/socket.c =================================================================== --- avahi-0.6.25.orig/avahi-core/socket.c +++ avahi-0.6.25/avahi-core/socket.c @@ -652,10 +652,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip goto fail; } - /* corrupt packets have zero size */ - if (!ms) - goto fail; - p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); @@ -682,6 +678,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip goto fail; } + /* corrupt packets have zero size */ + if (!ms) + goto fail; + if (sa.sin_addr.s_addr == INADDR_ANY) { /* Linux 2.4 behaves very strangely sometimes! */ goto fail; @@ -809,10 +809,6 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip goto fail; } - /* corrupt packets have zero size */ - if (!ms) - goto fail; - p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); @@ -840,6 +836,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip goto fail; } + /* corrupt packets have zero size */ + if (!ms) + goto fail; + assert(!(msg.msg_flags & MSG_CTRUNC)); assert(!(msg.msg_flags & MSG_TRUNC)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org