diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2006-11-11 00:15:38 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2006-11-11 00:15:38 +0000 |
| commit | 9e7d91e76af3323e3ec8227495988657b689f4e8 (patch) | |
| tree | 1d4729105c16d8b275edd54d8080042b74e3c5f6 /net-dns | |
| parent | arm/ia64/s390/sh stable (diff) | |
| download | gentoo-2-9e7d91e76af3323e3ec8227495988657b689f4e8.tar.gz gentoo-2-9e7d91e76af3323e3ec8227495988657b689f4e8.tar.bz2 gentoo-2-9e7d91e76af3323e3ec8227495988657b689f4e8.zip | |
Pull in a patch from upstream, to fix two dbus problems.
(Portage version: 2.1.2_rc1-r5)
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/avahi/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/avahi/avahi-0.6.15.ebuild | 3 | ||||
| -rw-r--r-- | net-dns/avahi/files/0.6.15-dbus-fixes.patch | 57 |
3 files changed, 64 insertions, 2 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/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); + } + |