From c8077ccb26794a80b80df89223c23aa297da55fa Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 19 Mar 2010 09:57:45 +0000 Subject: [PATCH] Fix bug 285706 and bug 309621 Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- gnome-base/gnome-vfs/ChangeLog | 10 +- gnome-base/gnome-vfs/Manifest | 10 +- .../gnome-vfs-2.24.2-symlink-crash.patch | 28 ++++ .../gnome-vfs/gnome-vfs-2.24.2-r1.ebuild | 133 ++++++++++++++++++ 4 files changed, 176 insertions(+), 5 deletions(-) create mode 100644 gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch create mode 100644 gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog index 909612f9738d..60f892ba5b4c 100644 --- a/gnome-base/gnome-vfs/ChangeLog +++ b/gnome-base/gnome-vfs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-vfs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.318 2010/03/16 18:44:00 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.319 2010/03/19 09:57:44 pacho Exp $ + +*gnome-vfs-2.24.2-r1 (19 Mar 2010) + + 19 Mar 2010; Pacho Ramos +gnome-vfs-2.24.2-r1.ebuild, + +files/gnome-vfs-2.24.2-symlink-crash.patch: + Fix crash if a null symlink is got (see bug #309621, thanks to Jacek for + reporting ubuntu/debian patch) and fix tests unsetting XAUTHORITY (see bug + #285706, thanks to Patrick for reporting) 16 Mar 2010; Christian Faulhammer gnome-vfs-2.24.2.ebuild: diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest index 2c7cb2b0a9ad..217cbfd35510 100644 --- a/gnome-base/gnome-vfs/Manifest +++ b/gnome-base/gnome-vfs/Manifest @@ -9,16 +9,18 @@ AUX gnome-vfs-2.20.0-home_dir_fakeroot.patch 5197 RMD160 1d2b5909c8ea2c901597ed3 AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02 AUX gnome-vfs-2.24.0-gnutls27.patch 1334 RMD160 e3de6ae9314255fccdf2e67e05e80c6c25015726 SHA1 6735af4bbd14980354ff2b834b903eca52c16bca SHA256 321453556381b8c7c22fad1786cc09347716fed02e40756b974c59a184c272f4 AUX gnome-vfs-2.24.0-uuid-mount.patch 2162 RMD160 9c92a80b859d322faff6b1239d28dfaa2b5f0bbd SHA1 2a76d49e599681066cb161b3c42630c8e039d5a6 SHA256 40cdac82d48e68ec563da5d13e6116c42c2c18ac972287638e8ff63357e55823 +AUX gnome-vfs-2.24.2-symlink-crash.patch 843 RMD160 81f1783462873dfc56026d9bcf6c75475b8846ca SHA1 81a1704f6e7a0c5c829bb6cc7fb2f2767f98e520 SHA256 a03d6118e6bbf2f9c8e292be3c1c3d78c7f6fa2421f2c284622e74e501c8c3bc DIST gnome-vfs-2.24.1.tar.bz2 1936704 RMD160 e4c6f99b67496a456596b7040aff859ca49a8998 SHA1 0e7b548ffe7b9eddaef3a43cdda47de538715f8b SHA256 bc59144e303b152b84b86f209347a3e87a91d5ed7172d8503ee19c232dcabeb6 DIST gnome-vfs-2.24.2.tar.bz2 1859173 RMD160 af81ef4193821696a2ca26435a6a457d55d5ab5c SHA1 9e8e9387cbf0dd107e16afd95a358581eb610ab8 SHA256 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856 EBUILD gnome-vfs-2.24.1.ebuild 3628 RMD160 aced1c861e92441aace80607b06d37bd958aa82f SHA1 114fd216851a9206fd27a4d0119535b5d1cc3416 SHA256 a9de4eb71bea122cdbfac1c804ce6a6be20a39c1cadd2300b3b3eeffa3961809 +EBUILD gnome-vfs-2.24.2-r1.ebuild 3756 RMD160 aa8d69dd823513da436c4693ad087479b9958050 SHA1 b6df62f1d71bd0a0793d29e7c9c000d5feeb6b56 SHA256 fcd816939ef979d3f6d98ffc937d0abe1a2031b8e6de755ed7f4b72619e097f3 EBUILD gnome-vfs-2.24.2.ebuild 3636 RMD160 b9e9b6ccb34f28be82810b59c51a0ff4f80f7bb3 SHA1 e2d5b8e9ceb2da59264a2b6158b4ce738d199af7 SHA256 b4947a85f47505cbf0c1d960faa85e5e787e045987f20a847eea828c7f50837d -MISC ChangeLog 41513 RMD160 4665d892e24e877af64f614f7960f96e55ca0f01 SHA1 8ef4fa5753e62480e399235769ac06ee1ec4407f SHA256 8bd1aae80971d04968244151033e4f1f9227cda9cfe65a4b047756cec4f7b906 +MISC ChangeLog 41868 RMD160 c9591bc31ed287fcc95a93fc2e3e72bd4fe74318 SHA1 83fea99d0639ea9d219c850a709f619901d777bb SHA256 79f3e0d36fa6d9e587a193f556b58e1e8108e3affa5a3399a5e62619e5f9f474 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuf0XYACgkQNQqtfCuFneMZpgCgilMwN+8lY2QpFSkTKA2xlhDu -DHsAnjE+vBZYJrvia4RoX9GNmVHrYQle -=p4Vm +iEYEARECAAYFAkujSp4ACgkQCaWpQKGI+9QXdQCfW+PRkvhAbk+ShNfeJsQF/tkM +PM4Ani5+bs816CBSCRG+fVVD3Lm5DpNs +=9e9G -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch new file mode 100644 index 000000000000..93a6f628f6ee --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.2-symlink-crash.patch @@ -0,0 +1,28 @@ +From 92869585b2e9ab4e262f1d6b7592fe7e2c3fb327 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Wed, 10 Mar 2010 10:23:24 +0000 +Subject: Don't crash if we get a NULL symlink + +Patch from debian/ubuntu: +http://launchpadlibrarian.net/35571673/gnome-vfs_2.24.2-1ubuntu2.debdiff +--- +diff --git a/modules/ftp-method.c b/modules/ftp-method.c +index c40c323..ac02b56 100644 +--- a/modules/ftp-method.c ++++ b/modules/ftp-method.c +@@ -2678,7 +2678,12 @@ do_read_directory (GnomeVFSMethod *method, + res = GNOME_VFS_ERROR_TOO_MANY_LINKS; + break; + } +- ++ ++ if (symlink_info->symlink_name == NULL) { ++ res = GNOME_VFS_ERROR_BAD_PARAMETERS; ++ break; ++ } ++ + symlink_name = gnome_vfs_escape_path_string (symlink_info->symlink_name); + gnome_vfs_file_info_clear (symlink_info); + +-- +cgit v0.8.3.1 diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild new file mode 100644 index 000000000000..b62d6c411a5a --- /dev/null +++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.2-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2010 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.24.2-r1.ebuild,v 1.1 2010/03/19 09:57:44 pacho Exp $ + +inherit autotools eutils gnome2 + +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 ~x86-fbsd" +IUSE="acl avahi doc fam gnutls hal ipv6 kerberos samba ssl" + +RDEPEND=">=gnome-base/gconf-2 + >=dev-libs/glib-2.9.3 + >=dev-libs/libxml2-2.6 + app-arch/bzip2 + fam? ( virtual/fam ) + gnome-base/gnome-mime-data + >=x11-misc/shared-mime-info-0.14 + >=dev-libs/dbus-glib-0.71 + 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 ) + avahi? ( >=net-dns/avahi-0.6 ) + kerberos? ( virtual/krb5 ) + acl? ( + sys-apps/acl + sys-apps/attr )" +DEPEND="${RDEPEND} + sys-devel/gettext + gnome-base/gnome-common + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.9 + >=dev-util/gtk-doc-am-1.10-r1 + doc? ( >=dev-util/gtk-doc-1 )" +PDEPEND="hal? ( >=gnome-base/gnome-mount-0.6 )" + +DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-schemas-install + --disable-static + --disable-cdda + --disable-howl + $(use_enable acl) + $(use_enable avahi) + $(use_enable fam) + $(use_enable gnutls) + $(use_enable hal) + $(use_enable ipv6) + $(use_enable kerberos krb5) + $(use_enable samba) + $(use_enable ssl openssl)" + # Useless ? --enable-http-neon + + if use hal ; then + G2CONF="${G2CONF} + --with-hal-mount=/usr/bin/gnome-mount + --with-hal-umount=/usr/bin/gnome-umount + --with-hal-eject=/usr/bin/gnome-eject" + fi + + # this works because of the order of configure parsing + # so should always be behind the use_enable options + # foser