[Pkg-utopia-commits] r1137 - in packages/unstable/avahi/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-11-13 10:49:45 +0100 (Mon, 13 Nov 2006)
New Revision: 1137

Added:
   packages/unstable/avahi/debian/patches/12_dbus1.0.patch
Modified:
   packages/unstable/avahi/debian/changelog
Log:
* fix dbus version detection and invalid usage of dbus api in avahi-daemon


Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-11-11 13:59:15 UTC (rev 1136)
+++ packages/unstable/avahi/debian/changelog	2006-11-13 09:49:45 UTC (rev 1137)
@@ -1,3 +1,12 @@
+avahi (0.6.15-2) unstable; urgency=low
+
+  * debian/patches/12_dbus1.0.patch:
+    + Fix version detection of dbus with version above 1.0. Also don't ever
+      call dbus_connection_close on shared connections as this is not allowed
+      by the DBus API.
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 13 Nov 2006 10:48:48 +0100
+
 avahi (0.6.15-1) unstable; urgency=high
 
   * New upstream version, urgency=high because of potential security fix:

Added: packages/unstable/avahi/debian/patches/12_dbus1.0.patch
===================================================================
--- packages/unstable/avahi/debian/patches/12_dbus1.0.patch	2006-11-11 13:59:15 UTC (rev 1136)
+++ packages/unstable/avahi/debian/patches/12_dbus1.0.patch	2006-11-13 09:49:45 UTC (rev 1137)
@@ -0,0 +1,47 @@
+Index: trunk/avahi-daemon/dbus-protocol.c
+===================================================================
+--- trunk/avahi-daemon/dbus-protocol.c (revision 1299)
++++ trunk/avahi-daemon/dbus-protocol.c (revision 1333)
+@@ -1068,8 +1068,8 @@
+             server->bus,
+             AVAHI_DBUS_NAME,
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
++            DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++#else
+             DBUS_NAME_FLAG_DO_NOT_QUEUE,
+-#else
+-            DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
+ #endif
+             &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+@@ -1107,9 +1107,4 @@
+ 
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+         server->bus = NULL;
+@@ -1128,9 +1123,4 @@
+ 
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+         server->bus = NULL;
+@@ -1167,9 +1157,4 @@
+ fail:
+     if (server->bus) {
+-#ifdef HAVE_DBUS_CONNECTION_CLOSE
+-        dbus_connection_close(server->bus);
+-#else
+-        dbus_connection_disconnect(server->bus);
+-#endif
+         dbus_connection_unref(server->bus);
+     }
+