Escape path(s) for drag and drop wrt #262519 by Jaromír Cápík and Zsolt Fabok

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 92 insertions, 8 deletions

diff --git a/app-arch/xarchiver/ChangeLog b/app-arch/xarchiver/ChangeLog
index 5fe913031208..dbd22b010dd1 100644
--- a/app-arch/xarchiver/ChangeLog
+++ b/app-arch/xarchiver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/xarchiver
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/ChangeLog,v 1.31 2011/01/25 18:07:17 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/ChangeLog,v 1.32 2012/01/24 12:44:49 ssuominen Exp $
+
+*xarchiver-0.5.2-r3 (24 Jan 2012)
+
+  24 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xarchiver-0.5.2-r3.ebuild,
+  +files/xarchiver-0.5.2-drag-n-drop_escaped_path.patch:
+  Escape path(s) for drag and drop wrt #262519 by Jaromír Cápík and Zsolt
+  Fabok
 
   25 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> xarchiver-0.5.2-r2.ebuild:
   ppc64 stable wrt #349022
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 71a4477aff80..d2a55350a44a 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xarchiver-0.5.2-add_xz_support.patch 14741 RMD160 fc0883c2c9f43bb74c68259bcdbfb26d8fe7e0ce SHA1 095d30622d22d1834290a95c8f82e7e650e5d8fb SHA256 ee5c761073b0065fa62e11302e5f7c81a90d5c896b8bcdadbc0753531fd15a02
+AUX xarchiver-0.5.2-drag-n-drop_escaped_path.patch 795 RMD160 91d3b128968b45e97a00d500c60866a547c146c0 SHA1 68126ef50a85924158eb5fd1ffd55db8778038aa SHA256 7aa83e3eceae9cf5947d2b1f9fa91bc78b62465d8a743eb0b0b2c1538fa72332
 AUX xarchiver-0.5.2-stack-smash.patch 581 RMD160 fec3a7501eaa584295c0118ba27f4ac85baa238b SHA1 990c62541b183594f76b523ba2e7c5c2d6a59307 SHA256 2032d3a7cdafc23b2577a6798af5ca93a913ff2a10ac4cf5adaf176433e9e424
 DIST xarchiver-0.5.2.tar.bz2 755418 RMD160 77b1daadd39fd86c5582c75f774282f4bec41bf7 SHA1 8c8f0ee82c93abcdcf9974fa30611aa05fa51bd0 SHA256 cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa677ad2a
 EBUILD xarchiver-0.5.2-r2.ebuild 1361 RMD160 cda1977642e729d0437b4325bdf26d7c49c259e1 SHA1 5ec1d24648153ed950666fb3d72ea167e1d4b18c SHA256 5fd82dc4b7bb9e40935c750d700622f8246c83f0a58873e12c7aa66c18743550
-MISC ChangeLog 8020 RMD160 f0ef03bbfb4a4c6f0c51aa1bb73d6ad563436445 SHA1 3d78df733e58d415be48f6bacf9c76da17c5a136 SHA256 cbcf988bf8055a6757dcf46cb5175aad8c9d2a16dae5abd32f05cebb223210f4
+EBUILD xarchiver-0.5.2-r3.ebuild 1424 RMD160 d03be7c8ebb9b47d428c42008102d8096227cac2 SHA1 066b0e1c932b5fe584b34ada4a90e7edbecf2e4a SHA256 3ece2b8abcc1b1892cf1b20bcf87241a2a4e7fcc06c1aacdcb1eb9d3894c710c
+MISC ChangeLog 8282 RMD160 633b30ed1630cbc83afbafc002ec39be4d709a93 SHA1 11387ac78777875304b542551f5d45bc975cfeac SHA256 88ab050803495ac2bf3cd961ac4602d007c9098e7f898103781a1b397a2276b0
 MISC metadata.xml 282 RMD160 91094ad401347628de4ab3e48ebbb5d620d6e2dd SHA1 cae64548911eb2bcbaca4e9ffd107b55404080f3 SHA256 e4c094365dccc476d8033116d416b8c037c870c34df1b13260dca4552b0826eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk3VlqUACgkQXkR9YqOcLPEXhAEAk6v8lMEfm90CNYQupCrd3S3F
-EyGfOWarGzRrjs9OxgABAIVrYA3aRjBAiAZR9vNifsZGzB7QqeLstJazGb2KTXWM
-=rKwx
+iQEcBAEBAgAGBQJPHqcxAAoJEEdUh39IaPFNmBcH/iX1+Ih7pugM/BiPTITRqW9n
+gxAnj9N3ogW/3vltDFZemb/Dvf9soXYtB4RAtLa8nVbncAFBmF15Xc7xfz258Xu0
+vV+bMqzSVMFz/JZNWJXBS45dos/oGf5fWnM44B/nCCAj5K2miqkWdM2TE6NzNGOW
+lWCUUnYTEFxY5N8A6MyrL68/9+wOBP8jbXXBXQD0k2ymEYc/rmWptODmg4JwgEq2
+5PNIXMCywhBdt6VkpxGPpuFpaUKJV0MQdeKRacTND+JC2OHSsLMAguySFJyPY5zH
+AXWaj3pt2omfADEQEhJDir9wpUC1AYZYJhH7O2W/cTr/jQ8rdRO6EuLntv3H54Q=
+=28Ku
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.2-drag-n-drop_escaped_path.patch b/app-arch/xarchiver/files/xarchiver-0.5.2-drag-n-drop_escaped_path.patch
new file mode 100644
index 000000000000..ff0d928b935c
--- /dev/null
+++ b/app-arch/xarchiver/files/xarchiver-0.5.2-drag-n-drop_escaped_path.patch
@@ -0,0 +1,15 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=5187
+http://bugs.gentoo.org/show_bug.cgi?id=262519
+
+--- src/window.c
++++ src/window.c
+@@ -1724,6 +1724,9 @@
+ 			gtk_tree_selection_selected_foreach (selection,(GtkTreeSelectionForeachFunc) xa_concat_selected_filenames,&names);
+ 			archive->full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->extract_full));
+ 			archive->overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (extract_window->overwrite_check));
++			gchar *unescaped_extraction_path = archive->extraction_path;
++			archive->extraction_path = xa_escape_filename(unescaped_extraction_path, "$'`\"\\!?* ()[]&|:;<>#");
++			g_free(unescaped_extraction_path);
+ 			(*archive->extract) (archive,names);
+ 
+ 			g_list_foreach (row_list,(GFunc) gtk_tree_path_free,NULL);
diff --git a/app-arch/xarchiver/xarchiver-0.5.2-r3.ebuild b/app-arch/xarchiver/xarchiver-0.5.2-r3.ebuild
new file mode 100644
index 000000000000..6ab4b444adc9
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.2-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.2-r3.ebuild,v 1.1 2012/01/24 12:44:49 ssuominen Exp $
+
+EAPI=4
+inherit xfconf
+
+DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
+HOMEPAGE="http://xarchiver.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.10:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-stack-smash.patch
+		"${FILESDIR}"/${P}-add_xz_support.patch
+		"${FILESDIR}"/${P}-drag-n-drop_escaped_path.patch
+		)
+
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	sed -i -e '/COPYING/d' doc/Makefile.in || die
+	xfconf_src_prepare
+}
+
+src_install() {
+	xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	elog "You need external programs for some formats, including"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}