Accepting request 41964 from GNOME:Factory

Copy from GNOME:Factory/avahi based on submit request 41964 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/41964
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=64

avahi-0.6.25-fixcrash.patch

@@ -1,4 +1,4 @@
-From ae19b3039335999e3c06f2bec9ae11ee79b204c1 Mon Sep 17 00:00:00 2001
+From cef39a95d31834ab3aac2ea09970ad54d5f5a08b Mon Sep 17 00:00:00 2001
 From: Ludwig Nussel <ludwig.nussel@suse.de>
 Date: Wed, 19 May 2010 15:43:44 +0200
 Subject: [PATCH] ignore packet if FIONREAD returns zero
@@ -7,14 +7,25 @@ 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 |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 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..8b9736a 100644
+index 4146d5a..49238c2 100644
 --- a/avahi-core/socket.c
 +++ b/avahi-core/socket.c
-@@ -805,6 +805,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
+@@ -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;
      }
  
@@ -26,5 +37,5 @@ index 4146d5a..8b9736a 100644
  
      io.iov_base = AVAHI_DNS_PACKET_DATA(p);
 -- 
-1.6.4.2
+1.7.1
 

avahi-glib2.spec

@@ -31,7 +31,7 @@ Name:           avahi-glib2
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.25
-Release:        9
+Release:        10
 %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})

avahi-mono.spec

@@ -31,7 +31,7 @@ Name:           avahi-mono
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.25
-Release:        9
+Release:        10
 %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})

avahi-qt4.spec

@@ -31,7 +31,7 @@ Name:           avahi-qt4
 %define         build_qt3 0
 %define         build_qt4 1
 Version:        0.6.25
-Release:        9
+Release:        10
 %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})

avahi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 21 12:04:15 UTC 2010 - lnussel@suse.de
+
+- also check ipv6 case in avahi-0.6.25-fixcrash.patch 
+
 -------------------------------------------------------------------
 Wed Jun 16 11:19:57 UTC 2010 - lnussel@suse.de
 

avahi.spec

@@ -33,7 +33,7 @@ Name:           avahi
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.25
-Release:        9
+Release:        10
 %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})