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

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

6 files changed, 59 insertions, 179 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/Manifest b/gnome-base/gvfs/Manifest
index 362b298a2dc1..ae0014c560f2 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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-debug.patch 813 RMD160 17173a9a2a1dff295b7ab97ce9eb3910eebd781d SHA1 71790ed4385978188baa78fdb9b496de3ab64057 SHA256 0aec6ed9395f3ebf598613ddc80fab86ff14db1a8f2256fc1355ea864ac4943b
 AUX gvfs-1.0.3-bluez4.patch 15992 RMD160 ce019597f52e3f58bea23e098ffab70ac1f1ed83 SHA1 3734c27032184c956013c46b3915e05d84dd5009 SHA256 e9eb881f06b1b404e0c362c6e66975cdef2e5956b103720364a8fd6db7c9a4ce
 AUX gvfs-1.0.3-gmountspec-SIGSEGV.patch 467 RMD160 17131acfdbe080d283cf4290b338554192c71ea1 SHA1 f4e898d755463f55280ae712935bafb19891c30f SHA256 c93f11cc77de7e8b5e40c61cd7e2edaad7adb30c816087d67370ce49f518be10
 AUX gvfs-1.0.3-http-leak.patch 1550 RMD160 7ba63537fec4368f317e94f9b4bb6d33aef08c09 SHA1 f750d6a48b2cf691cd7cb7a59e6167a59f6c59fa SHA256 7ed10185e18d49db231910a3e629992308ed6d7997c8f2875578e6ed3463f842
@@ -9,10 +13,15 @@ DIST gvfs-0.2.5.tar.bz2 826404 RMD160 f1b403c859ce91a5620ca16067d225f8a733857f S
 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 2260 RMD160 6c4d95cd56921d4887c4d72363fb8867a8133159 SHA1 73bf75a1874b6333d4d6c1c992a2e0a7b008d206 SHA256 cdf350457393732d2322192ee4ea30d4216b38ee9d64e6077bea65d11f14c56e
-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-r12.ebuild 2507 RMD160 8e61026e5aa5c2e357d79bb74b483204dd82493a SHA1 0d5e574343a56362f876725c53abace74087e42d SHA256 40cfc49ea562096fd87d3abbb2b024db7dbbc7d6f7d5c95d2e52394c5d633478
+EBUILD gvfs-1.0.3-r13.ebuild 2620 RMD160 0768f59ff802879a2d6e3823cc5383479fa14185 SHA1 18d57c694293385fecc462e1172adacc62d5af96 SHA256 053a29344ae73ae1c22c6ae1ffeae302eac28f89daa8b9f1e7df221e0f6e06e2
 EBUILD gvfs-1.0.3-r2.ebuild 2346 RMD160 754d5f46ec3f1088702bf162935c6414de27f000 SHA1 1bcbca131de424061be39f0a65dad1cbb5c5f2a2 SHA256 148f30f7c07e657d4703bd68bfba64c478eea391e794d67522fb6156996f7162
-EBUILD gvfs-1.0.3.ebuild 2249 RMD160 efed338aacc56e04a7830f9e859e8ce6c5657a7c SHA1 a4fceb98bc2613dd186de8fbe6e7648c486a4817 SHA256 3a63336caa478cf2ff60155b4051c74d001592216eb232ba1aeead2e6f412eae
-MISC ChangeLog 7781 RMD160 becf0e8c04dd63fcb09eb4cb77c67806510c42d9 SHA1 f64d7be3f91c86ea13f8088e535f5a83718197f4 SHA256 5ba28353e77579e95e7ba6324517b264a2e6d3b236ea8d95b5a9cc2cdb9e7cf0
+MISC ChangeLog 8085 RMD160 a3c982eabe9c8cec2a90b814bd04af21a40b5913 SHA1 6477d44f0ac9cebb2bccfb4d36cf8a97ef6c15d3 SHA256 ca01b5a0de8cf7e9bf67cc57635ab1626ce2a128576acd8f21675a99c7bf6ac0
 MISC metadata.xml 864 RMD160 71f72e397643a884a5df4613040bd7a711ffc8f4 SHA1 2b83f7169d29d389e6aba00812b2dfb25d7f1a77 SHA256 7122d3aa2f01e10a870560059bf8b3a2bec93730d3451e73f9d7e145acce3783
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknFbvgACgkQ1fmVwcYIWAbPxACcD5dd8bsqSoflJB7ze/FAnugs
+jcwAoJCi4jB3QBZ+VIl7LE0td02HkQ5n
+=GB6e
+-----END PGP SIGNATURE-----
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
-}