[Pkg-utopia-commits] r638 - packages/unstable/dbus/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-23 11:17:30 +0000 (Thu, 23 Feb 2006)
New Revision: 638

Modified:
   packages/unstable/dbus/debian/patches/dbus-group_info_free.patch
Log:
Updated. _dbus_group_info_free needs to move from -sysdeps-utils to -sysdeps

Modified: packages/unstable/dbus/debian/patches/dbus-group_info_free.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-group_info_free.patch	2006-02-23 10:30:07 UTC (rev 637)
+++ packages/unstable/dbus/debian/patches/dbus-group_info_free.patch	2006-02-23 11:17:30 UTC (rev 638)
@@ -1,9 +1,67 @@
-Index: dbus/dbus-userdb.c
+? .dbus-sysdeps.c.swp
+Index: dbus-sysdeps-util.c
 ===================================================================
+RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-util.c,v
+retrieving revision 1.5
+diff -u -r1.5 dbus-sysdeps-util.c
+--- dbus-sysdeps-util.c	8 Jul 2005 14:36:22 -0000	1.5
++++ dbus-sysdeps-util.c	23 Feb 2006 11:16:38 -0000
+@@ -680,17 +680,6 @@
+   return fill_group_info (info, gid, NULL, error);
+ }
+ 
+-/**
+- * Frees the members of info (but not info itself).
+- *
+- * @param info the group info
+- */
+-void
+-_dbus_group_info_free (DBusGroupInfo    *info)
+-{
+-  dbus_free (info->groupname);
+-}
+-
+ /** @} */ /* End of DBusInternalsUtils functions */
+ 
+ /**
+Index: dbus-sysdeps.c
+===================================================================
+RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
+retrieving revision 1.100
+diff -u -r1.100 dbus-sysdeps.c
+--- dbus-sysdeps.c	22 Nov 2005 20:37:00 -0000	1.100
++++ dbus-sysdeps.c	23 Feb 2006 11:16:38 -0000
+@@ -1754,6 +1754,17 @@
+ }
+ 
+ /**
++ * Frees the members of info (but not info itself).
++ *
++ * @param info the group info
++ */
++void
++_dbus_group_info_free (DBusGroupInfo    *info)
++{
++  dbus_free (info->groupname);
++}
++
++/**
+  * Sets fields in DBusCredentials to DBUS_PID_UNSET,
+  * DBUS_UID_UNSET, DBUS_GID_UNSET.
+  *
+Index: dbus-userdb.c
+===================================================================
 RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.c,v
 retrieving revision 1.17
-diff -r1.17 dbus-userdb.c
-64c64
-<   _dbus_group_info_free_allocated (info);
----
->   _dbus_group_info_free (info);
+diff -u -r1.17 dbus-userdb.c
+--- dbus-userdb.c	22 Mar 2005 17:57:27 -0000	1.17
++++ dbus-userdb.c	23 Feb 2006 11:16:38 -0000
+@@ -61,7 +61,7 @@
+   if (info == NULL) /* hash table will pass NULL */
+     return;
+ 
+-  _dbus_group_info_free_allocated (info);
++  _dbus_group_info_free (info);
+   dbus_free (info);
+ }
+