Pull in a patch from upstream, to fix two dbus problems.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 80 insertions, 14 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index b273379f9eed..952579348e80 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.77 2006/11/10 18:16:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.78 2006/11/11 00:15:37 swegener Exp $
+
+  11 Nov 2006; Sven Wegener <swegener@gentoo.org>
+  +files/0.6.15-dbus-fixes.patch, avahi-0.6.15.ebuild:
+  Pull in a patch from upstream, to fix two dbus problems.
 
   10 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> avahi-0.6.15.ebuild:
   Marked stable on amd64
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 061b22284165..1b9177420531 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -5,6 +5,10 @@ AUX 0.6.13-svn-fixes.patch 1034 RMD160 fb59a184c6fd4830ed043dc1ffe003525b408f82
 MD5 3f0ccefbf52f5844f7cea07a0fcb87d2 files/0.6.13-svn-fixes.patch 1034
 RMD160 fb59a184c6fd4830ed043dc1ffe003525b408f82 files/0.6.13-svn-fixes.patch 1034
 SHA256 1a548cd6ea608c9fd79dfeac93bdb9d89791b845531b515eeab04997a2237e86 files/0.6.13-svn-fixes.patch 1034
+AUX 0.6.15-dbus-fixes.patch 1647 RMD160 5d120cb23fae7d4603456593ef1b07eb842d5e0d SHA1 29ca0c669f1e03b729cd053aba560a775f2685c5 SHA256 733f4a3d5d6e9f10c7e1bec045e566c09fa128ca6043f90190f9235cc4fbcbb4
+MD5 d3d5b3538c1d66c747b02296b957d9fa files/0.6.15-dbus-fixes.patch 1647
+RMD160 5d120cb23fae7d4603456593ef1b07eb842d5e0d files/0.6.15-dbus-fixes.patch 1647
+SHA256 733f4a3d5d6e9f10c7e1bec045e566c09fa128ca6043f90190f9235cc4fbcbb4 files/0.6.15-dbus-fixes.patch 1647
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 MD5 873dca478a6a7bd3931f462becade245 files/autoipd.sh 1271
 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 files/autoipd.sh 1271
@@ -39,14 +43,14 @@ EBUILD avahi-0.6.14.ebuild 4079 RMD160 70c1140b71faa4653987e95ffc486d3dba3ddbcf
 MD5 7a5077c8b9cfa90389e575a09e5507bd avahi-0.6.14.ebuild 4079
 RMD160 70c1140b71faa4653987e95ffc486d3dba3ddbcf avahi-0.6.14.ebuild 4079
 SHA256 24f3c44775f3440bc26b78c315494bc8786de102b6c3c072b3c8b6ab1a577427 avahi-0.6.14.ebuild 4079
-EBUILD avahi-0.6.15.ebuild 4094 RMD160 0fc86a6627f32e43189b8f2f054a9ce40467497d SHA1 02d785d93d9786ee59e40cf01cf4fb2bb1783a34 SHA256 4996da2b4ac72783e712d5004e0252fa92815ca1562d795fe98cf3f3e1c1a34e
-MD5 5969cffdbae9a74be6b342a64f0647b4 avahi-0.6.15.ebuild 4094
-RMD160 0fc86a6627f32e43189b8f2f054a9ce40467497d avahi-0.6.15.ebuild 4094
-SHA256 4996da2b4ac72783e712d5004e0252fa92815ca1562d795fe98cf3f3e1c1a34e avahi-0.6.15.ebuild 4094
-MISC ChangeLog 10149 RMD160 3f81bea5c981209f454e403874e0dce502b85aa6 SHA1 758544de4046e150002146b7f73ec09f85809637 SHA256 b5f1d294ba21bdd632040d410ba4cfc90eb1ba25fe713f0737ee1ba4a8bad674
-MD5 d4b378f43eb0763fc2afd2d7066337fe ChangeLog 10149
-RMD160 3f81bea5c981209f454e403874e0dce502b85aa6 ChangeLog 10149
-SHA256 b5f1d294ba21bdd632040d410ba4cfc90eb1ba25fe713f0737ee1ba4a8bad674 ChangeLog 10149
+EBUILD avahi-0.6.15.ebuild 4143 RMD160 a0bad833d15c8c2687a24ae5c548ed390199b2ca SHA1 5dc092f89518397aa6e9691583223a6ccfd11d79 SHA256 15e9286fad19d04ed037842ec4bd05b5f1a7101b1ff977f1d51723548a66f61a
+MD5 30e40cefba6e8d1121a1749d3f39a4cc avahi-0.6.15.ebuild 4143
+RMD160 a0bad833d15c8c2687a24ae5c548ed390199b2ca avahi-0.6.15.ebuild 4143
+SHA256 15e9286fad19d04ed037842ec4bd05b5f1a7101b1ff977f1d51723548a66f61a avahi-0.6.15.ebuild 4143
+MISC ChangeLog 10318 RMD160 78d132140e10290dc42def508f25daebab6a7e9f SHA1 8b162e686ccbda40fdd0f0db50333185f92f7ee4 SHA256 2d4931b9b1f6a007a710ef7fb27b6dd2792add8311a052467d56c110b8300632
+MD5 1cccf1083795b40a7ee03ce40dec2f8c ChangeLog 10318
+RMD160 78d132140e10290dc42def508f25daebab6a7e9f ChangeLog 10318
+SHA256 2d4931b9b1f6a007a710ef7fb27b6dd2792add8311a052467d56c110b8300632 ChangeLog 10318
 MISC metadata.xml 223 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 SHA1 bd4caecc4cecdd93cb0e935e8f4ff92272aae978 SHA256 87de3da2e3f5d81839d9e3658af1703267195984bdee92aa032f1d429acc096d
 MD5 b8a99a5b7fa586fe9cabbacc87d88bfe metadata.xml 223
 RMD160 93a79d3a583130d803a2a8da0052f43d102ecfc2 metadata.xml 223
@@ -70,9 +74,9 @@ MD5 23815a4887561501c51eb7b6a63646b8 files/digest-avahi-0.6.15 238
 RMD160 a8269968c6333ac231f868cf577f6899be16300b files/digest-avahi-0.6.15 238
 SHA256 0d0868d27f53d49fc385a54124696193f69ae5b8a7de3c8496df5af227594bce files/digest-avahi-0.6.15 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVMHTomPajV0RnrERAmmlAJ9OqYUg6g1IFcKx9CTJdYk98Z37IACfeMEe
-U3YIieiFxIS8A+4NmwhuG6s=
-=BItk
+iD8DBQFFVRY1I1lqEGTUzyQRAl1XAKCl8xwTF+B7+N/TRUV24oRtlyocgACfRfFH
+VWLe2ZPK+zFUBc6Gxgl6Ijk=
+=z5ua
 -----END PGP SIGNATURE-----
diff --git a/net-dns/avahi/avahi-0.6.15.ebuild b/net-dns/avahi/avahi-0.6.15.ebuild
index e5dbbf03626e..9f3f99337f65 100644
--- a/net-dns/avahi/avahi-0.6.15.ebuild
+++ b/net-dns/avahi/avahi-0.6.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2000-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.15.ebuild,v 1.5 2006/11/10 18:16:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.15.ebuild,v 1.6 2006/11/11 00:15:37 swegener Exp $
 
 inherit eutils mono python qt3 qt4
 
@@ -90,6 +90,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-0.6.1-no-ipv6.patch
+	epatch "${FILESDIR}"/${PV}-dbus-fixes.patch
 }
 
 src_compile() {
diff --git a/net-dns/avahi/files/0.6.15-dbus-fixes.patch b/net-dns/avahi/files/0.6.15-dbus-fixes.patch
new file mode 100644
index 000000000000..efd489fd9023
--- /dev/null
+++ b/net-dns/avahi/files/0.6.15-dbus-fixes.patch
@@ -0,0 +1,57 @@
+http://avahi.org/ticket/68
+http://avahi.org/ticket/71
+
+Index: trunk/avahi-daemon/dbus-protocol.c
+===================================================================
+--- trunk/avahi-daemon/dbus-protocol.c	(revision 1299)
++++ trunk/avahi-daemon/dbus-protocol.c	(revision 1333)
+@@ -1067,10 +1067,10 @@
+     if (dbus_bus_request_name(
+             server->bus,
+             AVAHI_DBUS_NAME,
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
+-            DBUS_NAME_FLAG_DO_NOT_QUEUE,
+-#else
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
+             DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++#else
++            DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ #endif
+             &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+         if (dbus_error_is_set(&error)) {
+@@ -1106,11 +1106,6 @@
+         dbus_error_free(&error);
+ 
+     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;
+     }
+@@ -1127,11 +1122,6 @@
+     assert(server->n_clients == 0);
+ 
+     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;
+     }
+@@ -1166,11 +1156,6 @@
+ 
+ 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);
+     }
+