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

Package-Manager: portage-2.1.2_pre1

5 files changed, 137 insertions, 5 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/Manifest b/gnome-base/gnome-vfs/Manifest
index 19184873c80f..68daca8bf79c 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0/gnome-vfs-1.0.5-codeset.patch 1762 RMD160 b65d4b43bed4432d093744ee35ef0bfe44774a71 SHA1 5306fffc2f9d6a2b9e58bc240c808d3c7435468c SHA256 8ca4b5e145aa6ae9e497f2bce54a1a168b2836c5ffde08145961c5e3f523af86
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 RMD160 b65d4b43bed4432d093744ee35ef0bfe44774a71 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
@@ -50,6 +53,10 @@ AUX gnome-vfs-2.15.2-headers-define.patch 569 RMD160 5ff16b2fc13ef170a39dad9c300
 MD5 19fc84405207179961c81f9c8ca3eaa4 files/gnome-vfs-2.15.2-headers-define.patch 569
 RMD160 5ff16b2fc13ef170a39dad9c300a8fb1581f8f93 files/gnome-vfs-2.15.2-headers-define.patch 569
 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918 files/gnome-vfs-2.15.2-headers-define.patch 569
+AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 SHA1 a3011624f5078b468c0a67023109723f9455bd83 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345
+MD5 83ce05e705bb1615ecc14c41d848ab96 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
+RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
+SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710
 AUX gnome-vfs-2.8.3-reiser4_support.patch 710 RMD160 62c33efed3b6dc44e283174b03fa577dcae98022 SHA1 87258bfba606d76719d6e946ceaa8a7b13e51733 SHA256 e13e61cb02eeeed5bb654fb203cb47c6da9dca4fa7f317e3bdcaf22d4d379bf5
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
 RMD160 62c33efed3b6dc44e283174b03fa577dcae98022 files/gnome-vfs-2.8.3-reiser4_support.patch 710
@@ -79,14 +86,18 @@ EBUILD gnome-vfs-2.14.2.ebuild 1858 RMD160 dfce09e80ef925261242238408da62019149c
 MD5 60dc204e2204eead0a179e3f6ec479a4 gnome-vfs-2.14.2.ebuild 1858
 RMD160 dfce09e80ef925261242238408da62019149c2cb gnome-vfs-2.14.2.ebuild 1858
 SHA256 c4753afff8a8bf7b9f3a6cfb9fbe037c90eab505dc24d68ede2b057dc6110f2b gnome-vfs-2.14.2.ebuild 1858
+EBUILD gnome-vfs-2.16.0-r1.ebuild 2402 RMD160 0ae4d03b50c1b11402b67ed6fced632392698426 SHA1 05306e05b6535bfa87e378a8c162653b38782442 SHA256 e6ab4a2e7132c433411c912afe8e9032f825787f66598724bb6f9b0059f901ee
+MD5 26b9999d5e692856e606b3de0fefb52b gnome-vfs-2.16.0-r1.ebuild 2402
+RMD160 0ae4d03b50c1b11402b67ed6fced632392698426 gnome-vfs-2.16.0-r1.ebuild 2402
+SHA256 e6ab4a2e7132c433411c912afe8e9032f825787f66598724bb6f9b0059f901ee gnome-vfs-2.16.0-r1.ebuild 2402
 EBUILD gnome-vfs-2.16.0.ebuild 2300 RMD160 b2823c5420cf1583e09a5dc9231c8c3f7fdedab2 SHA1 6ca676b73179284c4ffd75bafd530eb4ac12cd65 SHA256 ab91d7d286a1cfad67185f4608ed27f0281de1f2f18f8eb4a8efba5bccf4981e
 MD5 65f06a3a3fc80c0889323b35c7c521ca gnome-vfs-2.16.0.ebuild 2300
 RMD160 b2823c5420cf1583e09a5dc9231c8c3f7fdedab2 gnome-vfs-2.16.0.ebuild 2300
 SHA256 ab91d7d286a1cfad67185f4608ed27f0281de1f2f18f8eb4a8efba5bccf4981e gnome-vfs-2.16.0.ebuild 2300
-MISC ChangeLog 27842 RMD160 4cdcfb92eed05dd6ead809022238a3ceb5ea6806 SHA1 56d058d6dfa665c8e9bd8af9fc2c46af9ecbc544 SHA256 0f9743d2a0c6d4e7d33be7d0a8d912e1555f63947b47277368f9792b4f84c867
-MD5 544d30510cf93a39b54bb1c643c2464c ChangeLog 27842
-RMD160 4cdcfb92eed05dd6ead809022238a3ceb5ea6806 ChangeLog 27842
-SHA256 0f9743d2a0c6d4e7d33be7d0a8d912e1555f63947b47277368f9792b4f84c867 ChangeLog 27842
+MISC ChangeLog 28070 RMD160 079233034894882f51cf21912555d09ae10dc54d SHA1 6cb65179cafb413290d365cdd5636ff30c24b6d8 SHA256 2d78c645f372b001fd6dc016a456333d9cdd0ae61ea714a4b93c847a8f5487ad
+MD5 7945d02ce9cded356f39a8b235e28ecd ChangeLog 28070
+RMD160 079233034894882f51cf21912555d09ae10dc54d ChangeLog 28070
+SHA256 2d78c645f372b001fd6dc016a456333d9cdd0ae61ea714a4b93c847a8f5487ad ChangeLog 28070
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -109,3 +120,13 @@ SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/di
 MD5 159d51b5a3c189bee847cd80eeb309ce files/digest-gnome-vfs-2.16.0 256
 RMD160 7260a5f39064295fe4e11d6572b0c4203f10b180 files/digest-gnome-vfs-2.16.0 256
 SHA256 74dddd6b6a6332cab3a356cf0656795443dbeb2ba66317c54dc3b5ee6fdf5b64 files/digest-gnome-vfs-2.16.0 256
+MD5 159d51b5a3c189bee847cd80eeb309ce files/digest-gnome-vfs-2.16.0-r1 256
+RMD160 7260a5f39064295fe4e11d6572b0c4203f10b180 files/digest-gnome-vfs-2.16.0-r1 256
+SHA256 74dddd6b6a6332cab3a356cf0656795443dbeb2ba66317c54dc3b5ee6fdf5b64 files/digest-gnome-vfs-2.16.0-r1 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFErThomPajV0RnrERAr8VAJ9sSSiVLEmmewYsHPJdU6zfjo7HoACfeiIZ
+D0AKMGcVFXB3dgQfwwsrk0k=
+=lsWN
+-----END PGP SIGNATURE-----
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
+}