[Pkg-utopia-commits] r844 - in packages/unstable/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-05-31 13:33:28 +0000 (Wed, 31 May 2006)
New Revision: 844

Added:
   packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch
   packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch
Modified:
   packages/unstable/dbus/debian/changelog
Log:
* debian/patches/dbus-transport-tcp.patch
  + Added. Fixes crash when using the tcp transport without an host option
  (from dbus CVS) (Closes: #368894)
* debian/patches/dbus-tcp-econreff.patch
  + Added. Make the error which is given when the tcp transport gets a
  connection refused more understandable (from dbus CVS)

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-05-24 13:34:46 UTC (rev 843)
+++ packages/unstable/dbus/debian/changelog	2006-05-31 13:33:28 UTC (rev 844)
@@ -1,5 +1,6 @@
 dbus (0.61-6) unstable; urgency=low
 
+  [ Sebastian Dröge ]
   * debian/patches/dbus-new-monodoc.patch:
     + Call the new monodoc executables for doc generation to really get
       docs (Closes: #361541)
@@ -13,8 +14,16 @@
     + Adjust the location of the .dll in the pkg-config file for the new CLI
       policy.
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Sun, 30 Apr 2006 12:01:27 +0200
+  [ Sjoerd Simons ]
+  * debian/patches/dbus-transport-tcp.patch
+    + Added. Fixes crash when using the tcp transport without an host option
+    (from dbus CVS) (Closes: #368894)
+  * debian/patches/dbus-tcp-econreff.patch
+    + Added. Make the error which is given when the tcp transport gets a
+    connection refused more understandable (from dbus CVS)
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 31 May 2006 15:00:49 +0200
+
 dbus (0.61-5) unstable; urgency=low
 
   * debian/patches/dbus-0.60-mono-return-null-fix.diff:

Added: packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch	2006-05-24 13:34:46 UTC (rev 843)
+++ packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch	2006-05-31 13:33:28 UTC (rev 844)
@@ -0,0 +1,19 @@
+Index: dbus/dbus-sysdeps.c
+===================================================================
+RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
+retrieving revision 1.101
+retrieving revision 1.102
+diff -u -r1.101 -r1.102
+--- dbus/dbus-sysdeps.c	24 Feb 2006 16:13:08 -0000	1.101
++++ dbus/dbus-sysdeps.c	30 May 2006 15:34:10 -0000	1.102
+@@ -678,8 +678,8 @@
+     {      
+       dbus_set_error (error,
+                        _dbus_error_from_errno (errno),
+-                      "Failed to connect to socket %s: %s:%d",
+-                      host, _dbus_strerror (errno), port);
++                      "Failed to connect to socket %s:%d %s",
++                      host, port, _dbus_strerror (errno));
+ 
+       close (fd);
+       fd = -1;

Added: packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch	2006-05-24 13:34:46 UTC (rev 843)
+++ packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch	2006-05-31 13:33:28 UTC (rev 844)
@@ -0,0 +1,48 @@
+Index: dbus/dbus-transport-unix.c
+===================================================================
+RCS file: /cvs/dbus/dbus/dbus/dbus-transport-unix.c,v
+retrieving revision 1.48
+retrieving revision 1.49
+diff -u -r1.48 -r1.49
+--- dbus/dbus-transport-unix.c	25 Oct 2005 15:57:13 -0000	1.48
++++ dbus/dbus-transport-unix.c	30 May 2006 15:34:10 -0000	1.49
+@@ -1272,16 +1272,18 @@
+       return NULL;
+     }
+   
+-  if (!_dbus_string_append (&address, "tcp:host=") ||
+-      !_dbus_string_append (&address, host) ||
+-      !_dbus_string_append (&address, ",port=") ||
++  if (!_dbus_string_append (&address, "tcp:"))
++    goto error;
++
++  if (host != NULL && 
++       (!_dbus_string_append (&address, "host=") ||
++        !_dbus_string_append (&address, host)))
++    goto error;
++
++  if (!_dbus_string_append (&address, ",port=") ||
+       !_dbus_string_append_int (&address, port))
+-    {
+-      _dbus_string_free (&address);
+-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+-      return NULL;
+-    }
+-  
++    goto error;
++
+   fd = _dbus_connect_tcp_socket (host, port, error);
+   if (fd < 0)
+     {
+@@ -1307,6 +1309,11 @@
+   _dbus_string_free (&address);
+   
+   return transport;
++
++error:
++  _dbus_string_free (&address);
++  dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
++  return NULL;
+ }
+ 
+ /** @} */