CAN-2005-0706, see bug #84936. Please mark 2.8.4-r1 stable over 2.8.4

Package-Manager: portage-2.0.51.19

7 files changed, 220 insertions, 15 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index be97d05e9b08..423297d18089 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.130 2005/04/02 03:57:40 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.131 2005/04/05 02:12:13 obz Exp $
+
+*gnome-vfs-2.8.4-r1 (05 Apr 2005)
+
+  05 Apr 2005; Mike Gardiner <obz@gentoo.org>
+  +files/gnome-vfs-2-CAN-2005-0706.patch, +gnome-vfs-2.10.0-r1.ebuild,
+  +gnome-vfs-2.8.4-r1.ebuild:
+  CAN-2005-0706, see bug #84936. Please mark 2.8.4-r1 stable over 2.8.4
 
   02 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
   gnome-vfs-2.8.3-r1.ebuild:
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index cbfe54379661..f9038fc88e3e 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,23 +1,28 @@
+MD5 eafeb585b01deef893043390f128587b ChangeLog 15685
+MD5 e5c392a89829e864886bf08bd05a4919 gnome-vfs-1.0.5-r3.ebuild 1943
 MD5 d29d9cf8d7faf835e2e59cf2d64eabcc gnome-vfs-2.8.3-r1.ebuild 2204
-MD5 3f31e708c7ae2f7d071eae7e08197c0c gnome-vfs-2.8.4.ebuild 2229
-MD5 a6c0e4fd5056d056279862d6730500da gnome-vfs-2.8.1-r2.ebuild 2224
-MD5 4def153476697efaf9a0ef379b5d2f01 gnome-vfs-2.10.0.ebuild 1898
 MD5 ce61b31cbeaa511b66b4e4eab483e282 gnome-vfs-2.6.1.1.ebuild 1751
-MD5 e5c392a89829e864886bf08bd05a4919 gnome-vfs-1.0.5-r3.ebuild 1943
-MD5 37cf6c1a2ffe7665237e2ce0e374c207 ChangeLog 15433
+MD5 4def153476697efaf9a0ef379b5d2f01 gnome-vfs-2.10.0.ebuild 1898
+MD5 a6c0e4fd5056d056279862d6730500da gnome-vfs-2.8.1-r2.ebuild 2224
+MD5 3f31e708c7ae2f7d071eae7e08197c0c gnome-vfs-2.8.4.ebuild 2229
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r2 69
+MD5 e77c78abdddca4a02fd259b927623ad0 gnome-vfs-2.10.0-r1.ebuild 1973
+MD5 7f85050614712e8fd4c9cd377f5d6877 gnome-vfs-2.8.4-r1.ebuild 2305
+MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
 MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3-r1 154
-MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
-MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
-MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
-MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
+MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r2 69
 MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4 154
+MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
+MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
 MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432
-MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
-MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
-MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
+MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4-r1 154
+MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r1 70
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
 MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
+MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
+MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
+MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r1
new file mode 100644
index 000000000000..df5f68f8b43d
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r1
@@ -0,0 +1 @@
+MD5 bb9df65d6a77414bbde9f1bc429c9d97 gnome-vfs-2.10.0.tar.bz2 1901027
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.4-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.4-r1
new file mode 100644
index 000000000000..ea5326076a52
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.4-r1
@@ -0,0 +1,2 @@
+MD5 42d3505e9ef9c26a7aae4e511b9b4c34 gnome-vfs-2.8.4.tar.bz2 1892413
+MD5 9bca818543777c41004e9bd512f73753 gnome-vfs-2.8.3-updated_hal_support.patch 75389
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2-CAN-2005-0706.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2-CAN-2005-0706.patch
new file mode 100644
index 000000000000..97a4ffbfad2c
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2-CAN-2005-0706.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs/modules/cdda-cddb.c.orig	2005-03-11 21:26:03.789158107 -0500
++++ gnome-vfs/modules/cdda-cddb.c	2005-03-11 21:26:47.324426192 -0500
+@@ -440,7 +440,7 @@
+     query->query_match=MATCH_INEXACT;
+     query->query_matches=0;
+ 
+-    while(!CDDBReadLine(socket,inbuffer,256)) {
++    while(query->query_matches < MAX_INEXACT_MATCHES && !CDDBReadLine(socket,inbuffer,256)) {
+       query->query_list[query->query_matches].list_genre=
+ 	CDDBGenreValue(ChopWhite(strtok(inbuffer," ")));
+
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..b49400f17556
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 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.10.0-r1.ebuild,v 1.1 2005/04/05 02:12:14 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm"
+IUSE="doc ssl gnutls samba ipv6 hal howl"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=gnome-base/gconf-1.2
+	>=gnome-base/orbit-2.9
+	>=gnome-base/libbonobo-2
+	>=dev-libs/libxml2-2.6
+	app-arch/bzip2
+	dev-libs/popt
+
+	virtual/fam
+
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+
+	ssl? ( >=dev-libs/openssl-0.9.5
+		!gnome-extra/gnome-vfs-sftp )
+	gnutls? ( !ssl? ( net-libs/gnutls
+			!gnome-extra/gnome-vfs-sftp ) )
+	samba? ( >=net-fs/samba-3
+		!gnome-extra/gnome-vfs-extras )
+	hal? ( >=sys-apps/hal-0.4
+		>=sys-apps/dbus-0.22 )
+	howl? ( >=net-misc/howl-0.9.6-r1 )"
+
+# ssl/gnutls USE deps : if both are enabled choose openssl
+# foser <foser@gentoo.org> 19 Apr 2004
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} \
+	$(use_enable ssl openssl) \
+	$(use_enable gnutls) \
+	$(use_enable samba) \
+	$(use_enable ipv6) \
+	$(use_enable hal) \
+	$(use_enable howl) \
+	--disable-schemas-install
+	--without-gtk"
+
+# 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-gnutls"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# reiser4 patch, c'mon (#57756)
+	epatch ${FILESDIR}/${PN}-2.8.3-reiser4_support.patch
+	# CAN-2005-0706 (#84936)
+	epatch ${FILESDIR}/${PN}-2-CAN-2005-0706.patch
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# remove unused dir (#46567)
+	rmdir ${D}/usr/doc
+
+}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.4-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..0525aa976a72
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.8.4-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2005 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.8.4-r1.ebuild,v 1.1 2005/04/05 02:12:14 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-2.8.3-updated_hal_support.patch"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm"
+IUSE="doc ssl gnutls samba ipv6 hal howl"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/orbit-2.9
+	>=gnome-base/libbonobo-2
+	>=dev-libs/libxml2-2.6
+	app-arch/bzip2
+	dev-libs/popt
+
+	virtual/fam
+
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+
+	ssl? ( >=dev-libs/openssl-0.9.5
+		!gnome-extra/gnome-vfs-sftp )
+	gnutls? ( !ssl? ( net-libs/gnutls
+			!gnome-extra/gnome-vfs-sftp ) )
+	samba? ( >=net-fs/samba-3
+		!gnome-extra/gnome-vfs-extras )
+	hal? ( >=sys-apps/hal-0.4
+		>=sys-apps/dbus-0.22 )
+	howl? ( >=net-misc/howl-0.9.6-r1 )"
+
+# ssl/gnutls USE deps : if both are enabled choose openssl
+# foser <foser@gentoo.org> 19 Apr 2004
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} \
+	$(use_enable ssl openssl) \
+	$(use_enable gnutls) \
+	$(use_enable samba) \
+	$(use_enable ipv6) \
+	$(use_enable hal) \
+	$(use_enable howl) \
+	--disable-schemas-install
+	--without-gtk"
+
+# 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-gnutls"
+
+DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
+
+# Fix bonobo 
+USE_DESTDIR="1"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# updated hal support (#65378)
+	epatch ${DISTDIR}/${PN}-2.8.3-updated_hal_support.patch
+	# reiser4 patch, c'mon (#57756)
+	epatch ${FILESDIR}/${PN}-2.8.3-reiser4_support.patch
+	# CAN-2005-0706 (#84936)
+	epatch ${FILESDIR}/${PN}-2-CAN-2005-0706.patch
+
+	autoconf
+
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# remove unused dir (#46567)
+	rmdir ${D}/usr/doc
+
+	# FIXME: there are cleaner ways to do this
+	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
+
+}
+