commit avahi for openSUSE:11.3

28 Feb 2011

Hello community,

here is the log from the commit of package avahi for openSUSE:11.3
checked in at Mon Feb 28 17:29:17 CET 2011.



--------
avahi-mono.changes: same change
avahi-qt4.changes: same change

--- old-versions/11.3/all/avahi/avahi.changes	2010-07-01 14:04:26.000000000 +0200
+++ 11.3/avahi/avahi.changes	2011-02-17 15:07:00.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 17 15:06:14 CET 2011 - vuntz@opensuse.org
+
+- 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.3/all/avahi
Destination is old-versions/11.3/UPDATES/all/avahi
calling whatdependson for 11.3-i586


New:
----
  avahi-null-packet-infinite-loop.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ avahi-glib2.spec ++++++
--- /var/tmp/diff_new_pack.XzEyWY/_old	2011-02-28 17:29:09.000000000 +0100
+++ /var/tmp/diff_new_pack.XzEyWY/_new	2011-02-28 17:29:09.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package avahi-glib2 (Version 0.6.25)
+# spec file for package avahi-glib2
 #
-# Copyright (c) 2010 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:        10
+Release:        15.<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})
@@ -74,6 +74,8 @@
 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-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
+Patch12:        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 translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -649,6 +651,7 @@
 %patch4 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.

avahi-mono.spec: same change
++++++ avahi-qt4.spec ++++++
--- /var/tmp/diff_new_pack.XzEyWY/_old	2011-02-28 17:29:09.000000000 +0100
+++ /var/tmp/diff_new_pack.XzEyWY/_new	2011-02-28 17:29:09.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package avahi-qt4 (Version 0.6.25)
+# spec file for package avahi-qt4
 #
-# Copyright (c) 2010 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:        10
+Release:        15.<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})
@@ -74,6 +74,8 @@
 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-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
+Patch12:        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 translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -651,6 +653,7 @@
 %patch4 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -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.XzEyWY/_old	2011-02-28 17:29:09.000000000 +0100
+++ /var/tmp/diff_new_pack.XzEyWY/_new	2011-02-28 17:29:09.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package avahi (Version 0.6.25)
+# spec file for package avahi
 #
-# Copyright (c) 2010 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:        10
+Release:        15.<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})
@@ -76,6 +76,8 @@
 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-null-packet-infinite-loop.patch bnc#671797 vuntz@opensuse.org -- Fix infinite loop for corrupted/null packets, http://www.avahi.org/ticket/325
+Patch12:        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 translation-update-upstream
 # Even if we are not building python bindings, we need python to build service types database:
@@ -651,6 +653,7 @@
 %patch4 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %if !%build_core
 # Replace all .la references from local .la files to installed versions
 # with exception of libavahi-glib.la.

++++++ 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

    

root＠hilbert.suse.de

tags

participants (1)