[maemo-commits] [maemo-commits] r12794 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-23 18:27:27 +0300 (Mon, 23 Jul 2007)
New Revision: 12794

Added:
   projects/haf/trunk/dbus/debian/patches/16-fix-socket-call-check.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
one more fix from upstream to fix checking return code of a socket call


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-07-23 15:13:08 UTC (rev 12793)
+++ projects/haf/trunk/dbus/debian/changelog	2007-07-23 15:27:27 UTC (rev 12794)
@@ -7,6 +7,8 @@
     used as locks).
   * Fix from the CVS to increase default limits in config-parser.c.
   * Fix from the CVS to increase default limits in session.conf.in.
+  * Fix from the CVS for upstream bug
+    https://bugs.freedesktop.org/show_bug.cgi?id=10781.
   * Patch from Leonid to enable hard-floats. Fixes: NB#61974
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 23 Jul 2007 17:31:21 +0300

Added: projects/haf/trunk/dbus/debian/patches/16-fix-socket-call-check.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/16-fix-socket-call-check.patch	2007-07-23 15:13:08 UTC (rev 12793)
+++ projects/haf/trunk/dbus/debian/patches/16-fix-socket-call-check.patch	2007-07-23 15:27:27 UTC (rev 12794)
@@ -0,0 +1,21 @@
+diff -pur dbus-1.0.2/dbus/dbus-sysdeps-unix.c dbus-1.0.2.new/dbus/dbus-sysdeps-unix.c
+--- dbus-1.0.2/dbus/dbus-sysdeps-unix.c	2006-12-11 21:21:09.000000000 +0200
++++ dbus-1.0.2.new/dbus/dbus-sysdeps-unix.c	2007-07-23 18:24:50.702721536 +0300
+@@ -76,14 +76,14 @@
+ #endif
+ 
+ static dbus_bool_t
+-_dbus_open_socket (int              *fd,
++_dbus_open_socket (int              *fd_p,
+                    int               domain,
+                    int               type,
+                    int               protocol,
+                    DBusError        *error)
+ {
+-  *fd = socket (domain, type, protocol);
+-  if (fd >= 0)
++  *fd_p = socket (domain, type, protocol);
++  if (*fd_p >= 0)
+     {
+       return TRUE;
+     }