[Pkg-utopia-commits] r1209 - in packages/experimental/dbus-glib/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2007-01-08 01:56:15 +0100 (Mon, 08 Jan 2007)
New Revision: 1209

Added:
   packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch
Modified:
   packages/experimental/dbus-glib/debian/changelog
   packages/experimental/dbus-glib/debian/control
Log:
* add patch to prevent random dbus-glib crashes


Modified: packages/experimental/dbus-glib/debian/changelog
===================================================================
--- packages/experimental/dbus-glib/debian/changelog	2007-01-07 18:41:50 UTC (rev 1208)
+++ packages/experimental/dbus-glib/debian/changelog	2007-01-08 00:56:15 UTC (rev 1209)
@@ -1,3 +1,13 @@
+dbus-glib (0.72-2) experimental; urgency=low
+
+  * debian/control:
+    + Updated to use my debian.org mail address
+  * debian/patches/01_proxy-crash.patch:
+    + Fix for a dbus-glib crash that could take down all dbus-glib using
+      applications at once (fd.o: #8235)
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon,  8 Jan 2007 01:54:04 +0100
+
 dbus-glib (0.72-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/experimental/dbus-glib/debian/control
===================================================================
--- packages/experimental/dbus-glib/debian/control	2007-01-07 18:41:50 UTC (rev 1208)
+++ packages/experimental/dbus-glib/debian/control	2007-01-08 00:56:15 UTC (rev 1209)
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
-Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libglib2.0-dev (>= 2.6), libdbus-1-dev (>= 0.94), libexpat-dev , gtk-doc-tools (>= 1.4)
+Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at debian.org>
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libglib2.0-dev (>= 2.6), libdbus-1-dev (>= 0.94), libexpat-dev, gtk-doc-tools (>= 1.4)
 Standards-Version: 3.7.2
 
 Package: libdbus-glib-1-dev

Added: packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch
===================================================================
--- packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch	2007-01-07 18:41:50 UTC (rev 1208)
+++ packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch	2007-01-08 00:56:15 UTC (rev 1209)
@@ -0,0 +1,51 @@
+diff -pur dbus-glib-0.72/dbus/dbus-gproxy.c dbus-glib-0.72.new/dbus/dbus-gproxy.c
+--- dbus-glib-0.72/dbus/dbus-gproxy.c	2006-10-25 22:59:07.000000000 +0300
++++ dbus-glib-0.72.new/dbus/dbus-gproxy.c	2006-11-14 16:15:11.082313384 +0200
+@@ -717,18 +717,21 @@ dbus_g_proxy_manager_replace_name_owner 
+ 
+       names = g_hash_table_lookup (manager->owner_names, prev_owner);
+ 
+-      link = g_slist_find_custom (names, name, find_name_in_info);
+-
+       info = NULL;
+-      if (link != NULL)
+-	{
+-	  info = link->data;
++      if (names != NULL)
++        {
++	  link = g_slist_find_custom (names, name, find_name_in_info);
++
++	  if (link != NULL)
++	    {
++	      info = link->data;
+ 	  
+-	  names = g_slist_delete_link (names, link);
++	      names = g_slist_delete_link (names, link);
+ 
+-	  if (names == NULL)
+-	    g_hash_table_remove (manager->owner_names, prev_owner);
+-	}
++	      if (names == NULL)
++	        g_hash_table_remove (manager->owner_names, prev_owner);
++	    }
++        }
+ 
+       if (new_owner[0] == '\0')
+ 	{
+@@ -757,8 +760,14 @@ dbus_g_proxy_manager_replace_name_owner 
+ 	  g_slist_free (data.destroyed);
+ 
+ 	  LOCK_MANAGER (manager);
++
++	  if (info)
++	    {
++	      g_free (info->name);
++	      g_free (info);
++	    }
+ 	}
+-      else
++      else if (info)
+ 	{
+ 	  insert_nameinfo (manager, new_owner, info);
+ 	}
+