[Pkg-utopia-commits] r793 - in packages/unstable/avahi/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-04-18 14:20:36 +0000 (Tue, 18 Apr 2006)
New Revision: 793

Added:
   packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch
Modified:
   packages/unstable/avahi/debian/changelog
Log:
* add a missing lock in the avahi CIl bindings to prevent a segfault


Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-04-09 04:00:44 UTC (rev 792)
+++ packages/unstable/avahi/debian/changelog	2006-04-18 14:20:36 UTC (rev 793)
@@ -1,10 +1,16 @@
 avahi (0.6.9-9) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons ]
   * Don't build-depend on libcap-dev on hurd, kfreebsd-* and netbsd-i386 archs
     (Closes: #360596)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Tue,  4 Apr 2006 13:34:12 +0200
+  [ Sebastian Dröge ]
+  * debian/patches/07_avahi-sharp_missing_lock.patch (SVN rev 1188):
+    + Add a missing lock around the avahi_entry_group_add_service_strlst()
+      call (Closes: #348999)
 
+ -- Sebastian Dröge <slomo at ubuntu.com>  Tue, 18 Apr 2006 16:12:29 +0200
+
 avahi (0.6.9-8) unstable; urgency=medium
 
   * Pass --disable-mono --disable-monodoc to configure on ia64 and powerpc.

Added: packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch
===================================================================
--- packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch	2006-04-09 04:00:44 UTC (rev 792)
+++ packages/unstable/avahi/debian/patches/07_avahi-sharp_missing_lock.patch	2006-04-18 14:20:36 UTC (rev 793)
@@ -0,0 +1,18 @@
+--- trunk/avahi-sharp/EntryGroup.cs (revision 1021)
++++ trunk/avahi-sharp/EntryGroup.cs (revision 1188)
+@@ -237,9 +237,13 @@
+                                  string domain, string host, UInt16 port, IntPtr list)
+         {
+-            int ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
++            int ret;
++
++            lock (client) {
++                ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
+                                                             Utility.StringToBytes (name),
+                                                             Utility.StringToBytes (type),
+                                                             Utility.StringToBytes (domain),
+                                                             Utility.StringToBytes (host), port, list);
++            }
+             
+             avahi_string_list_free (list);
+