gnome-base/gvfs: add patch to fix dbus crash when fuse is enabled (see bug #236862)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 115 insertions, 12 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index db07d9391596..d25c34d35475 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.24 2008/09/07 22:46:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.25 2008/09/08 08:55:12 remi Exp $
+
+*gvfs-0.2.5-r3 (08 Sep 2008)
+
+  08 Sep 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gvfs-0.2.5-dbus-crash.patch, +gvfs-0.2.5-r3.ebuild:
+  add patch to fix dbus crash when fuse is enabled (see bug #236862)
 
   07 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-0.2.3.ebuild,
   gvfs-0.2.5.ebuild, gvfs-0.2.5-r1.ebuild, gvfs-0.2.5-r2.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index b4e9cc929f91..cbf1790215dc 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gvfs-0.2.5-bash-completion.patch 2002 RMD160 4be918587bf2e5ed0a05c8aaaca86e38fcc63cd6 SHA1 620b3e22d6b2e0558f632cc1962d95695458ff1a SHA256 04b247915f396734b29398a611d078a972b33a085c53766a56d0053797961fc4
+AUX gvfs-0.2.5-dbus-crash.patch 678 RMD160 01832303f17c260ef4032ee5e17ba9accc8fc688 SHA1 50f1c096b65061586f651cbdfcb24ce2610f3ead SHA256 81d34b013e48bd4ae27e40cf8b699a0e0d1d45ae23c87cee8d153b7b62aad139
 DIST gvfs-0.2.5.tar.bz2 826404 RMD160 f1b403c859ce91a5620ca16067d225f8a733857f SHA1 b92b27792fe711319f9f0bba678dc9c074cb5b97 SHA256 f8bb3d32b1fe797190b9d8f2a6b0cdf91e897326a26cf8d9583e41f0d3aae86b
 EBUILD gvfs-0.2.5-r1.ebuild 1747 RMD160 56311f58394c9e55f46602e11e295612572fb4dd SHA1 d40b799de17e131210d9caf2e860970f74c795f1 SHA256 15c6497bc37592e77610884ccb113937510a96cc81d3b5407d4fae41ca36887b
 EBUILD gvfs-0.2.5-r2.ebuild 2127 RMD160 a371d2e751ee863d789a083528544283a5edc999 SHA1 69961f7863114b1ca133f4f44add6547af37833d SHA256 e963a0fe28146d468b024bf164a8dd3740f89b58ed9cf6659b30087271924975
+EBUILD gvfs-0.2.5-r3.ebuild 2223 RMD160 c3d450b11775e0f3dd3078f1804fc7745bd5696d SHA1 c82688da05441ea5fcc25dc22bad6ac053551360 SHA256 574cd1f0be26e5e6a7d9544a4663d2f12e867d2540b18c42c7853aae6c7adb07
 EBUILD gvfs-0.2.5.ebuild 1616 RMD160 47492821dfc48a59a56463f55687c080b1c33a54 SHA1 e4504e8a51db9f7dbf926951f9a5b06530e1ffb8 SHA256 f532bcf863a9a8f2cf865c29dbf6a65d79ae03d842650487c26dc191d7a1cc9e
-MISC ChangeLog 3496 RMD160 318207416b7db06aad4b1c9b67a909f5213beaf1 SHA1 4461f7465418b2565f8b58083858e59478641594 SHA256 9d0982c3e4bca4f8fedcf0abb4c9add9d5a0e71359e58faca5f38156dd44132f
+MISC ChangeLog 3705 RMD160 f91b9c0146d012a4d289e684885cf535345ba900 SHA1 9303c0229cd9ae2a9d65fa1451d9007b71bd1f0d SHA256 1003478a2592bc076b13c40576f5132032eba6cb6af0fad5e6368172e2988e71
 MISC metadata.xml 736 RMD160 b47be7b5fc5ed00a4e1682f0cdf025eb6af277b3 SHA1 4b9e5e748d8dcc21f950ce8f76bce7d529129c96 SHA256 1079af8695ba6f4e7b8216f76ae1d01c209f7484798530639beea1cc216d34ef
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjEWc4ACgkQ1fmVwcYIWAbX3wCdHlShz9c1kBaByV6lxBtyWl60
-QzoAoOcZy952/kH4YXxYc92LxnjCWoZP
-=My8M
------END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-0.2.5-dbus-crash.patch b/gnome-base/gvfs/files/gvfs-0.2.5-dbus-crash.patch
new file mode 100644
index 000000000000..421fc43b09cd
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-0.2.5-dbus-crash.patch
@@ -0,0 +1,20 @@
+--- gvfs-0.2.4_orig/client/gvfsfusedaemon.c	2008-05-27 07:54:41.000000000 +1000
++++ gvfs-0.2.4/client/gvfsfusedaemon.c	2008-07-29 16:04:33.000000000 +1000
+@@ -2033,6 +2033,7 @@
+   g_signal_handlers_disconnect_by_func (volume_monitor, mount_tracker_unmounted_cb, NULL);
+ 
+   g_main_loop_unref (subthread_main_loop);
++  subthread_main_loop = NULL;
+ 
+   g_object_unref (volume_monitor);
+   volume_monitor = NULL;
+@@ -2144,7 +2145,8 @@
+ vfs_destroy (gpointer param)
+ {
+   mount_list_free ();
+-  g_main_loop_quit (subthread_main_loop);
++  if (subthread_main_loop != NULL) 
++    g_main_loop_quit (subthread_main_loop);
+   g_mutex_free (mount_list_mutex);
+   g_object_unref (gvfs);
+ }
diff --git a/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild
new file mode 100644
index 000000000000..92f5db28a437
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild,v 1.1 2008/09/08 08:55:12 remi Exp $
+
+inherit bash-completion gnome2 eutils autotools
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
+
+RDEPEND=">=dev-libs/glib-2.16
+		 >=sys-apps/dbus-1.0
+		 >=net-libs/libsoup-2.4
+		 dev-libs/libxml2
+		 net-misc/openssh
+		 avahi? ( >=net-dns/avahi-0.6 )
+		 cdda?  (
+					>=sys-apps/hal-0.5.10
+					>=dev-libs/libcdio-0.78.2
+				)
+		 fuse? ( sys-fs/fuse )
+		 gnome? ( >=gnome-base/gconf-2.0 )
+		 hal? ( >=sys-apps/hal-0.5.10 )
+		 bluetooth? (
+			dev-libs/dbus-glib
+			>=net-wireless/bluez-libs-3.12
+			dev-libs/expat
+			)
+		 gphoto2? ( >=media-libs/libgphoto2-2.4 )
+		 gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
+		 samba? ( >=net-fs/samba-3 )"
+DEPEND="${RDEPEND}
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+			--enable-http
+			--disable-bash-completion
+			--disable-archive
+			$(use_enable avahi)
+			$(use_enable bluetooth obexftp)
+			$(use_enable cdda)
+			$(use_enable fuse)
+			$(use_enable gnome gconf)
+			$(use_enable gphoto2)
+			$(use_enable hal)
+			$(use_enable gnome-keyring keyring)
+			$(use_enable samba)"
+
+	if use cdda && built_with_use dev-libs/libcdio minimal; then
+		ewarn
+		ewarn "CDDA support in gvfs requires dev-libs/libcdio to be built"
+		ewarn "without the minimal USE flag."
+		die "Please re-emerge dev-libs/libcdio without the minimal USE flag"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fixes bug #236862 (backport from 0.99*)
+	epatch "${FILESDIR}/${PN}-0.2.5-dbus-crash.patch"
+
+	epatch "${FILESDIR}/${PN}-0.2.5-bash-completion.patch"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	use bash-completion && \
+		dobashcompletion programs/gvfs-bash-completion.sh ${PN}
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use bash-completion && bash-completion_pkg_postinst
+}