Fix http leak, bug #256892. Fix obexftp icon, bug #256890.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 279 insertions, 5 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index cd93b81af626..48db279fd250 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.46 2009/01/30 18:52:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.47 2009/02/02 22:36:31 eva Exp $
+
+*gvfs-1.0.3-r11 (02 Feb 2009)
+*gvfs-1.0.3-r1 (02 Feb 2009)
+
+  02 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gvfs-1.0.3-http-leak.patch, +files/gvfs-1.0.3-obexftp-icon.patch,
+  +gvfs-1.0.3-r1.ebuild, +gvfs-1.0.3-r11.ebuild:
+  Fix http leak, bug #256892. Fix obexftp icon, bug #256890.
 
   30 Jan 2009; Alexis Ballier <aballier@gentoo.org> gvfs-1.0.3.ebuild,
   gvfs-1.0.3-r10.ebuild:
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index acfc769c6906..612123fb712b 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -4,18 +4,22 @@ 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
 AUX gvfs-1.0.3-bluez4.patch 15992 RMD160 ce019597f52e3f58bea23e098ffab70ac1f1ed83 SHA1 3734c27032184c956013c46b3915e05d84dd5009 SHA256 e9eb881f06b1b404e0c362c6e66975cdef2e5956b103720364a8fd6db7c9a4ce
+AUX gvfs-1.0.3-http-leak.patch 1550 RMD160 7ba63537fec4368f317e94f9b4bb6d33aef08c09 SHA1 f750d6a48b2cf691cd7cb7a59e6167a59f6c59fa SHA256 7ed10185e18d49db231910a3e629992308ed6d7997c8f2875578e6ed3463f842
+AUX gvfs-1.0.3-obexftp-icon.patch 1007 RMD160 354048e4b1a263e1cb3a9fa3b20cba006cc203dc SHA1 e0ba373437f2a6eb5739fc0410b459236804ca89 SHA256 97cf921786c0af4f57ec0cb31b3f5161843535a985bc3bb560198a44d9269ce3
 AUX gvfs-1.0.3-posixtest.patch 3368 RMD160 75f3d776550b49169066037a8f77489e9dff3389 SHA1 a95f01f041dc51fb3b73f6e920e29507ccfdbc79 SHA256 9f7aaf14305b88f11ebf223cf5212c7a9494c58277031a728dfd210ec7b98325
 DIST gvfs-0.2.5.tar.bz2 826404 RMD160 f1b403c859ce91a5620ca16067d225f8a733857f SHA1 b92b27792fe711319f9f0bba678dc9c074cb5b97 SHA256 f8bb3d32b1fe797190b9d8f2a6b0cdf91e897326a26cf8d9583e41f0d3aae86b
 DIST gvfs-1.0.3.tar.bz2 920742 RMD160 2d12e1f6690773e3aad5d59c826c509fa40a9443 SHA1 2beb736acc7b38e99c9fcb0585de6918fad5e7b7 SHA256 17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
 EBUILD gvfs-0.2.5-r3.ebuild 2105 RMD160 e68bbb0df96a8b4a2878c9b6b2cd912e8ce358c5 SHA1 4437496c23af23de7f61554e622895fb3a794835 SHA256 19fb5c936186681ba7e18070032d4815199063dd942745fa2bfb7cfa22cc6a31
+EBUILD gvfs-1.0.3-r1.ebuild 2353 RMD160 7b58756740ce98aea444b73107498f8234c1b04d SHA1 53578407ed6f2dc1c9f9e7e288179c458c4dc3f4 SHA256 35320c5b5f1383390828f65b3172aa2424f9bd814f810338227ba7b101da9692
 EBUILD gvfs-1.0.3-r10.ebuild 2262 RMD160 5b78e08c06297736405f82f5c4fb52fe84a5d108 SHA1 3bcf8278efbea8cdf1bf831d33b0fda91d7a8738 SHA256 42a5db7f0ef475e6745935d605f2e60dd65011b086d036e436dbee3722464f61
+EBUILD gvfs-1.0.3-r11.ebuild 2423 RMD160 92d5908b8549b4692bbdc3d33fb1176166c63c9e SHA1 b1ca419267ff9a06f5c92b6babbc69021aa11789 SHA256 45d72be40cad70cebe92ed35775cf9db82d0bc6f192e4d1770580ffb499dd755
 EBUILD gvfs-1.0.3.ebuild 2249 RMD160 efed338aacc56e04a7830f9e859e8ce6c5657a7c SHA1 a4fceb98bc2613dd186de8fbe6e7648c486a4817 SHA256 3a63336caa478cf2ff60155b4051c74d001592216eb232ba1aeead2e6f412eae
-MISC ChangeLog 6489 RMD160 4387f5c65819c602158a7992ff2fd53829925e60 SHA1 06916276ced93ca1fd92f498e6546a722edcb1c1 SHA256 b6e493806b6bbcc2ddb68e926df44f60c2fff825c7a5dee43ca5df92bdbaca1f
+MISC ChangeLog 6784 RMD160 d4bcac3c8b0cd25d55fb6bc3312042ea0e99eb98 SHA1 7af6d9e0d0deeb1234b4b7971a10ff5436db4f2f SHA256 3b9d2b8f6ed9526776c80d7865e8e01647f4655baf8af2836c0307aa7edd8a55
 MISC metadata.xml 864 RMD160 71f72e397643a884a5df4613040bd7a711ffc8f4 SHA1 2b83f7169d29d389e6aba00812b2dfb25d7f1a77 SHA256 7122d3aa2f01e10a870560059bf8b3a2bec93730d3451e73f9d7e145acce3783
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmDTGUACgkQvFcC4BYPU0qjiwCgzbvoeMykAMgY04D+FRtm28Sp
-0OwAnAzQEjyyNnJXQCOO8LLTCNGacRA8
-=mKPs
+iEYEARECAAYFAkmHdXQACgkQ1fmVwcYIWAalugCfT2YrlhWHg33hFlQXnjrHd0ty
+RY4AnRF7vC9uG0F9nCt1U0q8//J5kv7G
+=djcF
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch b/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch
new file mode 100644
index 000000000000..93adf5b043ac
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.0.3-http-leak.patch
@@ -0,0 +1,57 @@
+Index: daemon/gvfsbackendhttp.c
+===================================================================
+--- daemon/gvfsbackendhttp.c	(revision 2129)
++++ daemon/gvfsbackendhttp.c	(revision 2130)
+@@ -346,6 +346,7 @@
+                                 error->message);
+ 
+       g_error_free (error);
++      g_object_unref (stream);
+       return;
+     }
+ 
+@@ -371,6 +372,8 @@
+   msg = soup_message_new_from_uri (SOUP_METHOD_GET, uri);
+   soup_uri_free (uri);
+ 
++  soup_message_body_set_accumulate (msg->response_body, FALSE);
++
+   stream = soup_input_stream_new (op_backend->session_async, msg);
+   g_object_unref (msg);
+ 
+Index: daemon/soup-input-stream.c
+===================================================================
+--- daemon/soup-input-stream.c	(revision 2129)
++++ daemon/soup-input-stream.c	(revision 2130)
+@@ -714,6 +714,7 @@
+   soup_input_stream_done_io (stream);
+ 
+   g_simple_async_result_complete (result);
++  g_object_unref (result);
+ }
+ 
+ static void
+@@ -748,6 +749,7 @@
+     {
+       g_simple_async_result_set_op_res_gssize (result, 0);
+       g_simple_async_result_complete_in_idle (result);
++      g_object_unref (result);
+       return;
+     }
+ 
+@@ -756,6 +758,7 @@
+       gsize nread = read_from_leftover (priv, buffer, count);
+       g_simple_async_result_set_op_res_gssize (result, nread);
+       g_simple_async_result_complete_in_idle (result);
++      g_object_unref (result);
+       return;
+     }
+ 
+@@ -804,6 +807,7 @@
+     }
+ 
+   g_simple_async_result_complete_in_idle (result);
++  g_object_unref (result);
+ }
+ 
+ static gboolean
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch b/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch
new file mode 100644
index 000000000000..6ae45e9d4004
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.0.3-obexftp-icon.patch
@@ -0,0 +1,22 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=256890
+# https://bugzilla.gnome.org/show_bug.cgi?id=542687
+Index: b/daemon/gvfsbackendobexftp.c
+===================================================================
+--- a/daemon/gvfsbackendobexftp.c	(revision 2125)
++++ b/daemon/gvfsbackendobexftp.c	(working copy)
+@@ -376,7 +376,14 @@
+       g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
+       g_file_info_set_content_type (info, "inode/directory");
+       g_file_info_set_name (info, "/");
+-      g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
++      if (op_backend->icon_name) {
++          GIcon *icon;
++
++          g_vfs_backend_set_icon_name (backend, op_backend->icon_name);
++          icon = g_themed_icon_new (op_backend->icon_name);
++          g_file_info_set_icon (info, icon);
++          g_object_unref (icon);
++      }
+       display = g_strdup_printf (_("%s on %s"), "/", op_backend->display_name);
+       g_file_info_set_display_name (info, display);
+       g_free (display);
diff --git a/gnome-base/gvfs/gvfs-1.0.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..e7ddc30cc779
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.0.3-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.0.3-r1.ebuild,v 1.1 2009/02/02 22:36:31 eva Exp $
+
+inherit autotools bash-completion gnome2 eutils
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="archive avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
+
+RDEPEND=">=dev-libs/glib-2.17.6
+	>=sys-apps/dbus-1.0
+	>=net-libs/libsoup-2.23.91
+	dev-libs/libxml2
+	net-misc/openssh
+	archive? ( app-arch/libarchive )
+	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.40
+	>=dev-util/pkgconfig-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-http
+		--disable-bash-completion
+		$(use_enable 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
+
+	# Fix non posixy tests, bug #256305
+	epatch "${FILESDIR}/${P}-posixtest.patch"
+
+	# Fix themed icon for obexftp, bug #256890
+	epatch "${FILESDIR}/${P}-obexftp-icon.patch"
+
+	# Fix HTTP leaks, bug #256892
+	epatch "${FILESDIR}/${P}-http-leak.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
+}
diff --git a/gnome-base/gvfs/gvfs-1.0.3-r11.ebuild b/gnome-base/gvfs/gvfs-1.0.3-r11.ebuild
new file mode 100644
index 000000000000..ff5c0a482ebc
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.0.3-r11.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.0.3-r11.ebuild,v 1.1 2009/02/02 22:36:31 eva Exp $
+
+inherit autotools bash-completion gnome2 eutils
+
+DESCRIPTION="GNOME Virtual Filesystem Layer"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="archive avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
+
+RDEPEND=">=dev-libs/glib-2.17.6
+	>=sys-apps/dbus-1.0
+	>=net-libs/libsoup-2.23.91
+	dev-libs/libxml2
+	net-misc/openssh
+	archive? ( app-arch/libarchive )
+	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
+		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.40
+	>=dev-util/pkgconfig-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-http
+		--disable-bash-completion
+		$(use_enable 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
+
+	# Add support for bluez 4, bug #250615
+	epatch "${FILESDIR}/${P}-bluez4.patch"
+
+	# Fix non posixy tests, bug #256305
+	epatch "${FILESDIR}/${P}-posixtest.patch"
+
+	# Fix themed icon for obexftp, bug #256890
+	epatch "${FILESDIR}/${P}-obexftp-icon.patch"
+
+	# Fix HTTP leaks, bug #256892
+	epatch "${FILESDIR}/${P}-http-leak.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
+}