"Fix" crash when running gnome-vfs-based programs via sudo/gksudo

(Portage version: 2.1.2_pre1)

4 files changed, 112 insertions, 1 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 79b1d5383af6..accfd3e57e64 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.220 2006/09/19 16:18:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.221 2006/09/21 15:50:50 dang Exp $
+
+*gnome-vfs-2.16.0-r1 (21 Sep 2006)
+
+  21 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-vfs-2.16.0-no-dbus-crash.patch, +gnome-vfs-2.16.0-r1.ebuild:
+  "Fix" crash when running gnome-vfs-based programs via sudo/gksudo
 
   19 Sep 2006; Aron Griffis <agriffis@gentoo.org>
   gnome-vfs-2.14.2-r1.ebuild:
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1
new file mode 100644
index 000000000000..29f11795b592
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1
@@ -0,0 +1,3 @@
+MD5 fdea9d7be42320c3fa6a09e645613480 gnome-vfs-2.16.0.tar.bz2 1890562
+RMD160 9f4008c0e8cae26513006e4c1f1c1c126116d8ef gnome-vfs-2.16.0.tar.bz2 1890562
+SHA256 d1854eed8ef93ac2f111d56367106159153bb5857793a880b13271bb5fb34361 gnome-vfs-2.16.0.tar.bz2 1890562
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
new file mode 100644
index 000000000000..6905060a4f71
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
+--- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-07-07 04:46:39.000000000 -0400
++++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-21 11:22:49.000000000 -0400
+@@ -236,6 +236,8 @@
+ gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client)
+ {
+ 	setup_dbus_connection (volume_monitor_client);
++	if (!volume_monitor_client->dbus_conn)
++		return;
+ 	read_drives_from_daemon (volume_monitor_client);
+ 	read_volumes_from_daemon (volume_monitor_client);
+ }
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..a5d8bebc6e65
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.16.0-r1.ebuild,v 1.1 2006/09/21 15:50:50 dang Exp $
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sh sparc x86"
+IUSE="avahi doc gnutls hal ipv6 samba ssl"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=dev-libs/glib-2.9.3
+	>=gnome-base/orbit-2.12.4
+	>=dev-libs/libxml2-2.6
+	>=net-misc/neon-0.25.3
+	app-arch/bzip2
+	virtual/fam
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+	samba? ( >=net-fs/samba-3 )
+	gnutls?	(
+				net-libs/gnutls
+				!gnome-extra/gnome-vfs-sftp
+			)
+	ssl?	(
+		!gnutls?	(
+				>=dev-libs/openssl-0.9.5
+				!gnome-extra/gnome-vfs-sftp
+				)
+		)
+	hal?	(
+				>=sys-apps/hal-0.5.7
+				>=sys-apps/dbus-0.32
+			)
+	avahi? ( >=net-dns/avahi-0.6 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	if use hal ; then
+		G2CONF="--with-hal-mount=/usr/bin/gnome-mount \
+				--with-hal-umount=/usr/bin/gnome-umount \
+				--with-hal-eject=/usr/bin/gnome-eject"
+	fi
+
+	G2CONF="${G2CONF}                 \
+		--disable-schemas-install     \
+		--disable-cdda                \
+		--disable-howl                \
+		--enable-http-neon            \
+		$(use_enable ssl openssl)     \
+		$(use_enable gnutls)          \
+		$(use_enable samba)           \
+		$(use_enable ipv6)            \
+		$(use_enable hal)             \
+		$(use_enable avahi)"
+
+	# this works because of the order of conifgure parsing
+	# so should always be behind the use_enable options
+	# foser <foser@gentoo.org 19 Apr 2004
+	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Allow the Trash on afs filesystems (#106118)
+	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+	# Fix compiling with headers missing
+	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+	# Fix for crashes running programs via sudo
+	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+	# For gtk-doc macro failure when it's not installed
+	cp aclocal.m4 old_macros.m4
+	AT_M4DIR="."
+	eautoreconf
+}