[Pkg-utopia-commits] r857 - in packages/unstable/dbus/debian: .
patches
Sjoerd Simons
sjoerd at costa.debian.org
Sun Jun 18 17:42:21 UTC 2006
Author: sjoerd
Date: 2006-06-18 17:42:20 +0000 (Sun, 18 Jun 2006)
New Revision: 857
Removed:
packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff
packages/unstable/dbus/debian/patches/dbus-pendingcall-deadlock.patch
packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch
packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch
packages/unstable/dbus/debian/patches/dbus-reload-usercache.patch
packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch
packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch
Modified:
packages/unstable/dbus/debian/changelog
packages/unstable/dbus/debian/control
Log:
* New upstream release
* Remove Daniel Stone from uploaders at his request.
the start-stop-daemon --retry option is used to shut dbus down
* Removed patched that aren't needed anymore:
+ debian/patches/dbus-reload-usercache.patch
+ debian/patches/dbus-qt-buildfix.patch
+ debian/patches/dbus-qt-endianness.patch
+ debian/patches/dbus-0.60-mono-return-null-fix.diff
+ debian/patches/dbus-tcp-econreff.patch
+ debian/patches/dbus-transport-tcp.patch
+ debian/patches/dbus-pendingcall-deadlock.patch
Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/changelog 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,9 +1,19 @@
-dbus (0.61-7) UNRELEASED; urgency=low
+dbus (0.62-1) unstable; urgency=low
+ * New upstream release
+ * Remove Daniel Stone from uploaders at his request.
* debian/dbus.init: Remove the sleep 1 when restarting. It's not needed as
- the start-stop-daemon --retry option is used to shut dbus down
+ the start-stop-daemon --retry option is used to shut dbus down
+ * Removed patched that aren't needed anymore:
+ + debian/patches/dbus-reload-usercache.patch
+ + debian/patches/dbus-qt-buildfix.patch
+ + debian/patches/dbus-qt-endianness.patch
+ + debian/patches/dbus-0.60-mono-return-null-fix.diff
+ + debian/patches/dbus-tcp-econreff.patch
+ + debian/patches/dbus-transport-tcp.patch
+ + debian/patches/dbus-pendingcall-deadlock.patch
- -- Sjoerd Simons <sjoerd at debian.org> Fri, 9 Jun 2006 00:27:14 +0200
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 18 Jun 2006 19:40:40 +0200
dbus (0.61-6) unstable; urgency=low
Modified: packages/unstable/dbus/debian/control
===================================================================
--- packages/unstable/dbus/debian/control 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/control 2006-06-18 17:42:20 UTC (rev 857)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
-Uploaders: Daniel Stone <daniels at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
+Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
Build-Depends: cdbs (>= 0.4.5.1), debhelper (>= 4.1.46), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python2.4, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.4-dev, libqt3-mt-dev, libqt4-dev
Build-Depends-Indep: libgtk-cil, cli-common-dev (>= 0.4.0), libmono-dev, mono-mcs, mono-gac, monodoc-base
Standards-Version: 3.6.1.0
Deleted: packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,22 +0,0 @@
---- mono/Connection.cs.old 2006-02-07 18:13:30.886925672 +0100
-+++ mono/Connection.cs 2006-02-07 18:14:07.426370832 +0100
-@@ -116,7 +116,7 @@
- // Maybe we already have a Connection object associated with
- // this rawConnection then return it
- IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
-- if (rawThis != IntPtr.Zero) {
-+ if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) {
- return (DBus.Connection) ((GCHandle)rawThis).Target;
- }
- }
---- mono/Message.cs.old 2006-02-07 18:11:27.917619848 +0100
-+++ mono/Message.cs 2006-02-07 18:12:36.628174256 +0100
-@@ -110,7 +110,7 @@
- if (slot > -1) {
- // If we already have a Message object associated with this rawMessage then return it
- IntPtr rawThis = dbus_message_get_data(rawMessage, slot);
-- if (rawThis != IntPtr.Zero)
-+ if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message))
- return (DBus.Message) ((GCHandle)rawThis).Target;
- }
- // If it doesn't exist then create a new Message around it
Deleted: packages/unstable/dbus/debian/patches/dbus-pendingcall-deadlock.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-pendingcall-deadlock.patch 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-pendingcall-deadlock.patch 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,87 +0,0 @@
-Index: dbus/dbus-connection.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-connection.c,v
-retrieving revision 1.115
-retrieving revision 1.116
-diff -u -r1.115 -r1.116
---- dbus/dbus-connection.c 30 Nov 2005 20:30:02 -0000 1.115
-+++ dbus/dbus-connection.c 2 Mar 2006 22:24:28 -0000 1.116
-@@ -2533,6 +2533,36 @@
- return NULL;
- }
-
-+static dbus_bool_t
-+check_for_reply_and_update_dispatch_unlocked (DBusPendingCall *pending)
-+{
-+ DBusMessage *reply;
-+ DBusDispatchStatus status;
-+ DBusConnection *connection;
-+
-+ connection = pending->connection;
-+
-+ reply = check_for_reply_unlocked (connection, pending->reply_serial);
-+ if (reply != NULL)
-+ {
-+ _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME);
-+
-+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n");
-+
-+ _dbus_pending_call_complete_and_unlock (pending, reply);
-+ dbus_message_unref (reply);
-+
-+ CONNECTION_LOCK (connection);
-+ status = _dbus_connection_get_dispatch_status_unlocked (connection);
-+ _dbus_connection_update_dispatch_status_and_unlock (connection, status);
-+ dbus_pending_call_unref (pending);
-+
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
- /**
- * When a function that blocks has been called with a timeout, and we
- * run out of memory, the time to wait for memory is based on the
-@@ -2616,6 +2646,11 @@
- start_tv_sec, start_tv_usec,
- end_tv_sec, end_tv_usec);
-
-+ /* check to see if we already got the data off the socket */
-+ /* from another blocked pending call */
-+ if (check_for_reply_and_update_dispatch_unlocked (pending))
-+ return;
-+
- /* Now we wait... */
- /* always block at least once as we know we don't have the reply yet */
- _dbus_connection_do_iteration_unlocked (connection,
-@@ -2645,27 +2680,8 @@
- }
-
- if (status == DBUS_DISPATCH_DATA_REMAINS)
-- {
-- DBusMessage *reply;
--
-- reply = check_for_reply_unlocked (connection, client_serial);
-- if (reply != NULL)
-- {
-- _dbus_verbose ("%s checked for reply\n", _DBUS_FUNCTION_NAME);
--
-- _dbus_verbose ("dbus_connection_send_with_reply_and_block(): got reply\n");
--
-- _dbus_pending_call_complete_and_unlock (pending, reply);
-- dbus_message_unref (reply);
--
-- CONNECTION_LOCK (connection);
-- status = _dbus_connection_get_dispatch_status_unlocked (connection);
-- _dbus_connection_update_dispatch_status_and_unlock (connection, status);
-- dbus_pending_call_unref (pending);
--
-- return;
-- }
-- }
-+ if (check_for_reply_and_update_dispatch_unlocked (pending))
-+ return;
-
- _dbus_get_current_time (&tv_sec, &tv_usec);
-
Deleted: packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-qt-buildfix.patch 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,145 +0,0 @@
-Index: qt/Makefile.am
-===================================================================
-RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
-retrieving revision 1.14
-diff -u -r1.14 Makefile.am
---- qt/Makefile.am 17 Feb 2006 00:04:38 -0000 1.14
-+++ qt/Makefile.am 27 Feb 2006 21:29:53 -0000
-@@ -21,46 +21,46 @@
- qdbusabstractadaptor.h
-
- libdbus_qt4_1_la_SOURCES = \
-- $(top_srcdir)/qt/qdbusconnection.cpp \
-- $(top_srcdir)/qt/qdbuserror.cpp \
-- $(top_srcdir)/qt/qdbusintegrator.cpp \
-- $(top_srcdir)/qt/qdbusmarshall.cpp \
-- $(top_srcdir)/qt/qdbusmessage.cpp \
-- $(top_srcdir)/qt/qdbusserver.cpp \
-- $(top_srcdir)/qt/qdbustype.cpp \
-- $(top_srcdir)/qt/qdbusobject.cpp \
-- $(top_srcdir)/qt/qdbusinterface.cpp \
-- $(top_srcdir)/qt/qdbusstandardinterfaces.cpp \
-- $(top_srcdir)/qt/qdbusxmlparser.cpp \
-- $(top_srcdir)/qt/qdbusutil.cpp \
-- $(top_srcdir)/qt/qdbusintrospection.cpp \
-- $(top_srcdir)/qt/qdbusabstractadaptor.cpp \
-- $(top_srcdir)/qt/qdbusthread.cpp \
-+ qdbusconnection.cpp \
-+ qdbuserror.cpp \
-+ qdbusintegrator.cpp \
-+ qdbusmarshall.cpp \
-+ qdbusmessage.cpp \
-+ qdbusserver.cpp \
-+ qdbustype.cpp \
-+ qdbusobject.cpp \
-+ qdbusinterface.cpp \
-+ qdbusstandardinterfaces.cpp \
-+ qdbusxmlparser.cpp \
-+ qdbusutil.cpp \
-+ qdbusintrospection.cpp \
-+ qdbusabstractadaptor.cpp \
-+ qdbusthread.cpp \
- \
-- $(top_srcdir)/dbus/qdbus.h \
-- $(top_srcdir)/qt/qdbusabstractadaptor.h \
-- $(top_srcdir)/qt/qdbusconnection.h \
-- $(top_srcdir)/qt/qdbusconnection_p.h \
-- $(top_srcdir)/qt/qdbuserror.h \
-- $(top_srcdir)/qt/qdbusinterface.h \
-- $(top_srcdir)/qt/qdbusinterface_p.h \
-- $(top_srcdir)/qt/qdbusintrospection.h \
-- $(top_srcdir)/qt/qdbusmacros.h \
-- $(top_srcdir)/qt/qdbusmarshall.h \
-- $(top_srcdir)/qt/qdbusmessage.h \
-- $(top_srcdir)/qt/qdbusmessage_p.h \
-- $(top_srcdir)/qt/qdbusobject.h \
-- $(top_srcdir)/qt/qdbusobject_p.h \
-- $(top_srcdir)/qt/qdbusserver.h \
-- $(top_srcdir)/qt/qdbusstandardinterfaces.h \
-- $(top_srcdir)/qt/qdbustype.h \
-- $(top_srcdir)/qt/qdbusvariant.h \
-- $(top_srcdir)/qt/qdbusxmlparser_p.h
-+ qdbus.h \
-+ qdbusabstractadaptor.h \
-+ qdbusconnection.h \
-+ qdbusconnection_p.h \
-+ qdbuserror.h \
-+ qdbusinterface.h \
-+ qdbusinterface_p.h \
-+ qdbusintrospection.h \
-+ qdbusmacros.h \
-+ qdbusmarshall.h \
-+ qdbusmessage.h \
-+ qdbusmessage_p.h \
-+ qdbusobject.h \
-+ qdbusobject_p.h \
-+ qdbusserver.h \
-+ qdbusstandardinterfaces.h \
-+ qdbustype.h \
-+ qdbusvariant.h \
-+ qdbusxmlparser_p.h
-
-
--$(top_srcdir)/qt/qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
--$(top_srcdir)/qt/qdbusserver.lo: qdbusserver.moc
--$(top_srcdir)/qt/qdbusconnection.lo: qdbusconnection_p.moc
-+qdbusabstractadaptor.lo: qdbusabstractadaptor.moc
-+qdbusserver.lo: qdbusserver.moc
-+qdbusconnection.lo: qdbusconnection_p.moc
-
- CLEANFILES=qdbusabstractadaptor.moc qdbusserver.moc qdbusconnection.moc
-
-Index: dbus/Makefile.am
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/Makefile.am,v
-retrieving revision 1.73
-retrieving revision 1.74
-diff -u -r1.73 -r1.74
---- dbus/Makefile.am 23 Sep 2005 16:24:36 -0000 1.73
-+++ dbus/Makefile.am 25 Feb 2006 18:34:12 -0000 1.74
-@@ -37,6 +37,7 @@
- dbus-protocol.h \
- dbus-server.h \
- dbus-shared.h \
-+ dbus-signature.h \
- dbus-threads.h \
- dbus-types.h \
- $(GLIB_INCLUDES) \
-@@ -84,7 +85,6 @@
- dbus-sha.c \
- dbus-sha.h \
- dbus-signature.c \
-- dbus-signature.h \
- dbus-timeout.c \
- dbus-timeout.h \
- dbus-threads-internal.h \
-Index: dbus/dbus-signature.h
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-signature.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- dbus/dbus-signature.h 11 May 2005 18:07:22 -0000 1.3
-+++ dbus/dbus-signature.h 25 Feb 2006 18:34:12 -0000 1.4
-@@ -71,4 +71,4 @@
-
- DBUS_END_DECLS
-
--#endif /* DBUS_MESSAGE_H */
-+#endif /* DBUS_SIGNATURE_H */
-Index: dbus/dbus.h
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus.h,v
-retrieving revision 1.20
-retrieving revision 1.21
-diff -u -r1.20 -r1.21
---- dbus/dbus.h 21 Jan 2005 05:06:10 -0000 1.20
-+++ dbus/dbus.h 25 Feb 2006 18:34:12 -0000 1.21
-@@ -41,6 +41,7 @@
- #include <dbus/dbus-protocol.h>
- #include <dbus/dbus-server.h>
- #include <dbus/dbus-shared.h>
-+#include <dbus/dbus-signature.h>
- #include <dbus/dbus-threads.h>
- #include <dbus/dbus-types.h>
-
Deleted: packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,36 +0,0 @@
-Index: qt/qdbusintegrator.cpp
-===================================================================
-RCS file: /cvs/dbus/dbus/qt/qdbusintegrator.cpp,v
-retrieving revision 1.3
-diff -u -r1.3 qdbusintegrator.cpp
---- qt/qdbusintegrator.cpp 20 Feb 2006 13:23:11 -0000 1.3
-+++ qt/qdbusintegrator.cpp 28 Feb 2006 09:32:47 -0000
-@@ -39,6 +39,15 @@
-
- int QDBusConnectionPrivate::messageMetaType = 0;
-
-+#if __BYTE_ORDER != __LITTLE_ENDIAN
-+ union integer
-+ {
-+ short s;
-+ unsigned short us;
-+ unsigned char uc;
-+ };
-+#endif
-+
- struct QDBusPendingCall
- {
- QPointer<QObject> receiver;
-@@ -622,12 +631,6 @@
- params.reserve(metaTypes.count());
-
- #if __BYTE_ORDER != __LITTLE_ENDIAN
-- union integer
-- {
-- short s;
-- unsigned short us;
-- unsigned char uc;
-- }
- QVarLengthArray<integer, 4> auxParameters;
- #endif
- // let's create the parameter list
Deleted: packages/unstable/dbus/debian/patches/dbus-reload-usercache.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-reload-usercache.patch 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-reload-usercache.patch 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,103 +0,0 @@
-Index: bus/bus.c
-===================================================================
-RCS file: /cvs/dbus/dbus/bus/bus.c,v
-retrieving revision 1.65
-diff -u -r1.65 bus.c
---- bus/bus.c 14 Nov 2005 20:51:25 -0000 1.65
-+++ bus/bus.c 5 Mar 2006 17:08:15 -0000
-@@ -790,6 +790,9 @@
- DBusString config_file;
- dbus_bool_t ret;
-
-+ /* Flush the user database cache */
-+ _dbus_user_database_flush(context->user_database);
-+
- ret = FALSE;
- _dbus_string_init_const (&config_file, context->config_file);
- parser = bus_config_load (&config_file, TRUE, NULL, error);
-Index: dbus/dbus-hash.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-hash.c,v
-retrieving revision 1.19
-diff -u -r1.19 dbus-hash.c
---- dbus/dbus-hash.c 17 Jan 2005 03:53:40 -0000 1.19
-+++ dbus/dbus-hash.c 5 Mar 2006 17:08:15 -0000
-@@ -422,6 +422,22 @@
- }
- }
-
-+/**
-+ * Removes all entries from a hash table.
-+ *
-+ * @param table the hash table to remove all entries from.
-+ */
-+void
-+_dbus_hash_table_remove_all (DBusHashTable *table)
-+{
-+ DBusHashIter iter;
-+ _dbus_hash_iter_init (table, &iter);
-+ while (_dbus_hash_iter_next (&iter))
-+ {
-+ _dbus_hash_iter_remove_entry(&iter);
-+ }
-+}
-+
- static DBusHashEntry*
- alloc_entry (DBusHashTable *table)
- {
-Index: dbus/dbus-hash.h
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-hash.h,v
-retrieving revision 1.14
-diff -u -r1.14 dbus-hash.h
---- dbus/dbus-hash.h 9 Sep 2004 10:20:17 -0000 1.14
-+++ dbus/dbus-hash.h 5 Mar 2006 17:08:15 -0000
-@@ -63,6 +63,7 @@
- DBusFreeFunction value_free_function);
- DBusHashTable* _dbus_hash_table_ref (DBusHashTable *table);
- void _dbus_hash_table_unref (DBusHashTable *table);
-+void _dbus_hash_table_remove_all (DBusHashTable *table);
- void _dbus_hash_iter_init (DBusHashTable *table,
- DBusHashIter *iter);
- dbus_bool_t _dbus_hash_iter_next (DBusHashIter *iter);
-Index: dbus/dbus-userdb.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.c,v
-retrieving revision 1.18
-diff -u -r1.18 dbus-userdb.c
---- dbus/dbus-userdb.c 24 Feb 2006 16:13:08 -0000 1.18
-+++ dbus/dbus-userdb.c 5 Mar 2006 17:08:15 -0000
-@@ -476,6 +476,18 @@
- return NULL;
- }
-
-+/**
-+ * Flush all information out of the user database.
-+ */
-+void
-+_dbus_user_database_flush (DBusUserDatabase *db)
-+{
-+ _dbus_hash_table_remove_all(db->users_by_name);
-+ _dbus_hash_table_remove_all(db->groups_by_name);
-+ _dbus_hash_table_remove_all(db->users);
-+ _dbus_hash_table_remove_all(db->groups);
-+}
-+
- #ifdef DBUS_BUILD_TESTS
- /**
- * Increments refcount of user database.
-Index: dbus/dbus-userdb.h
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-userdb.h,v
-retrieving revision 1.10
-diff -u -r1.10 dbus-userdb.h
---- dbus/dbus-userdb.h 22 Mar 2005 17:57:27 -0000 1.10
-+++ dbus/dbus-userdb.h 5 Mar 2006 17:08:15 -0000
-@@ -51,6 +51,7 @@
-
- DBusUserDatabase* _dbus_user_database_new (void);
- DBusUserDatabase* _dbus_user_database_ref (DBusUserDatabase *db);
-+void _dbus_user_database_flush (DBusUserDatabase *db);
- void _dbus_user_database_unref (DBusUserDatabase *db);
- dbus_bool_t _dbus_user_database_get_groups (DBusUserDatabase *db,
- dbus_uid_t uid,
Deleted: packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-tcp-econreff.patch 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,19 +0,0 @@
-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;
Deleted: packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch 2006-06-14 15:51:10 UTC (rev 856)
+++ packages/unstable/dbus/debian/patches/dbus-transport-tcp.patch 2006-06-18 17:42:20 UTC (rev 857)
@@ -1,48 +0,0 @@
-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;
- }
-
- /** @} */
More information about the Pkg-utopia-commits
mailing list