Bump to 1.0.3-r13. Remove debug code that turns warnings into crashes, bug #262502.

(Portage version: 2.2_rc25/cvs/Linux x86_64)

5 files changed, 46 insertions, 175 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 5d9dce0260b6..eee2aefee696 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.54 2009/03/18 14:34:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.55 2009/03/21 22:49:22 eva Exp $
+
+*gvfs-1.0.3-r13 (21 Mar 2009)
+
+  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gvfs-1.0.3-bluez4-debug.patch, -gvfs-1.0.3.ebuild,
+  -gvfs-1.0.3-r10.ebuild, -gvfs-1.0.3-r11.ebuild, +gvfs-1.0.3-r13.ebuild:
+  Bump to 1.0.3-r13. Remove debug code that turns warnings into crashes, bug
+  #262502.
 
   18 Mar 2009; Raúl Porcel <armin76@gentoo.org> gvfs-1.0.3-r1.ebuild:
   alpha/ia64 stable wrt #260063
diff --git a/gnome-base/gvfs/files/gvfs-1.0.3-bluez4-debug.patch b/gnome-base/gvfs/files/gvfs-1.0.3-bluez4-debug.patch
new file mode 100644
index 000000000000..553796315282
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.0.3-bluez4-debug.patch
@@ -0,0 +1,30 @@
+From 5874fbdae7d3dbc332a151441547ff7401579327 Mon Sep 17 00:00:00 2001
+From: Mike Lundy <mike@fluffypenguin.org>
+Date: Sat, 14 Mar 2009 19:30:22 -0700
+Subject: [PATCH] remove debug code that turns warnings into crashes
+
+https://bugs.gentoo.org/show_bug.cgi?id=262502
+---
+ daemon/daemon-main.c |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
+index 0a77036..b3b2b47 100644
+--- a/daemon/daemon-main.c
++++ b/daemon/daemon-main.c
+@@ -65,12 +65,6 @@ daemon_init (void)
+       dbus_error_free (&derror);
+       exit (1);
+     }
+-
+-  GLogLevelFlags fatal_mask;
+-
+-  fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
+-  fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
+-  g_log_set_always_fatal (fatal_mask);
+ }
+ 
+ void
+-- 
+1.6.1.2
+
diff --git a/gnome-base/gvfs/gvfs-1.0.3-r10.ebuild b/gnome-base/gvfs/gvfs-1.0.3-r10.ebuild
deleted file mode 100644
index b75583d5a0bd..000000000000
--- a/gnome-base/gvfs/gvfs-1.0.3-r10.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-r10.ebuild,v 1.4 2009/01/30 18:52:15 aballier 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"
-
-	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-r13.ebuild
index ff5c0a482ebc..1a42571fc43e 100644
--- a/gnome-base/gvfs/gvfs-1.0.3-r11.ebuild
+++ b/gnome-base/gvfs/gvfs-1.0.3-r13.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.0.3-r13.ebuild,v 1.1 2009/03/21 22:49:22 eva Exp $
 
 inherit autotools bash-completion gnome2 eutils
 
@@ -69,6 +69,9 @@ src_unpack() {
 	# Add support for bluez 4, bug #250615
 	epatch "${FILESDIR}/${P}-bluez4.patch"
 
+	# Remove debug code that turns warnings into crashes, bug #262502
+	epatch "${FILESDIR}/${P}-bluez4-debug.patch"
+
 	# Fix non posixy tests, bug #256305
 	epatch "${FILESDIR}/${P}-posixtest.patch"
 
@@ -78,6 +81,9 @@ src_unpack() {
 	# Fix HTTP leaks, bug #256892
 	epatch "${FILESDIR}/${P}-http-leak.patch"
 
+	# Fix URL crash, bug #245204
+	epatch "${FILESDIR}/${P}-gmountspec-SIGSEGV.patch"
+
 	eautoreconf
 }
 
diff --git a/gnome-base/gvfs/gvfs-1.0.3.ebuild b/gnome-base/gvfs/gvfs-1.0.3.ebuild
deleted file mode 100644
index 89aeee461ba9..000000000000
--- a/gnome-base/gvfs/gvfs-1.0.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.ebuild,v 1.4 2009/01/30 18:52:15 aballier 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"
-
-	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
-}