Cleaned up and applied a patch to fix stack smashing (bug 256539 by Frederic Johansson)

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

7 files changed, 51 insertions, 174 deletions

diff --git a/app-arch/xarchiver/ChangeLog b/app-arch/xarchiver/ChangeLog
index e6d1e694a922..b56df54ee4f2 100644
--- a/app-arch/xarchiver/ChangeLog
+++ b/app-arch/xarchiver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/xarchiver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/ChangeLog,v 1.11 2009/02/04 21:12:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/ChangeLog,v 1.12 2009/02/09 19:35:01 angelos Exp $
+
+  09 Feb 2009; Christoph Mende <angelos@gentoo.org>
+  +files/xarchiver-0.5.2-stack-smash.patch, -xarchiver-0.4.6.ebuild,
+  -xarchiver-0.5.0.ebuild, -xarchiver-0.5.1.ebuild, xarchiver-0.5.2.ebuild:
+  Cleaned up and applied a patch to fix stack smashing (bug 256539 by
+  Frederic Johansson)
 
   04 Feb 2009; Raúl Porcel <armin76@gentoo.org> xarchiver-0.5.2.ebuild:
   arm/ia64/sparc stable wrt #254440
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index bb64af67b9c0..229bf657cef9 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,10 +1,15 @@
-DIST xarchiver-0.4.6.tar.bz2 616101 RMD160 73e951ef9dd1cd6eb347eb0bb96ef8cb7eede602 SHA1 db80abdebf3396ded3cf8d2224e88c987a2d9c32 SHA256 24e26057d1c5754ee0fd32dd2b1ccc1c7f114ce452eef3b7c3928e3e29c79666
-DIST xarchiver-0.5.0.tar.bz2 796429 RMD160 7dc105c1508e1389f0ba80052f9e7a7a93f45bb7 SHA1 f198edf2e5caed55518b662a1cd00abe94d9cb3f SHA256 1c124564607e411473c223587af50152fe8135bcbf73f22a6e96efbe0b56934d
-DIST xarchiver-0.5.1.tar.bz2 755281 RMD160 e5e4c0f9bc822fa601133a306cfde53cdf4febd0 SHA1 148ab90759c71cc69bd551254cb64a32a41a469e SHA256 3eb4d0fbe67717cc823d45adf04be92379712411eb892c0822665c20b00b89f0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+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.4.6.ebuild 1414 RMD160 15f83782e78ad136b7a181920cbb36ca91c2b390 SHA1 3e9a8f92b83ad1247d29d288a10595a18525fc6f SHA256 0d9e9600cdc9334dd2fd5325a8fd6fe81c1d1a0927d9e300bf9163f98a45b095
-EBUILD xarchiver-0.5.0.ebuild 1481 RMD160 afeefdfcb32acfd2d91ec072e59dda180516c237 SHA1 d2393383be6d8a815751c76e8dd843e7d405d7c5 SHA256 f5f9606ffcfc70291178a92bfbd48a076c621e4ae1a47e246efaf6a652378a46
-EBUILD xarchiver-0.5.1.ebuild 1510 RMD160 2041eced18b44fbba2446b2a88eed288b47ea96a SHA1 1b9d3a209959c7006251937e73065c253fd63b19 SHA256 d0de62918a590dee28350ce7d2dcb6279f825b335f630817307f845049a7d3bd
-EBUILD xarchiver-0.5.2.ebuild 1501 RMD160 20260f8e9a6b8c76b6e0141bccfe0be54af0a3ce SHA1 095daa27fe6d0c4e5525270b02729b8a66c8c79a SHA256 153bb936b2c395e554862f43b590673535ec243fdc89c3a2908d6bb764475f69
-MISC ChangeLog 5321 RMD160 0e4fe172461d8a53f8cdc446a1f5afea69512119 SHA1 3f1c721d040cd2410523deba22bacc931e8f3663 SHA256 0f521bfd2c5cd6c583c342b0987a49b4d590a4e758d905b8f66c4df51a548e54
+EBUILD xarchiver-0.5.2.ebuild 1579 RMD160 b8a9e7009473ebf76b82dc6bc2dbdf6ae27e1630 SHA1 b1aa776d03daa1af618896739da2d6b83d62e459 SHA256 c4a6760d2795907a7135dbba15d3998e615f260c1c4982570f0565ad9aaec6ad
+MISC ChangeLog 5611 RMD160 5f6882423dc540219a5a8127a8acd7014db8f02c SHA1 ada2bfd4ffe4921f1be44d009a2acea47fcb5adf SHA256 21d1d687e17c78e9f454178e837d59a86ecbce08bcdb818552d3c068ce4175ea
 MISC metadata.xml 283 RMD160 dd1900ca082bc7001d0727041060dd9c23075113 SHA1 2f174862dd8791b6e72eb5309dcd0c025c3f02b5 SHA256 a5e27ae5df1d9b0003a93d183c6df8454cdadb29fd3ac946b3d301aa9e05ef2b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmQhXAACgkQKhnDs22gwa/rDwCgh+EBQqZmcJrSFijszpEFLUrc
+B8wAn3tPgjuNoVaintzD7R9Gt38kLzT8
+=4JLw
+-----END PGP SIGNATURE-----
diff --git a/app-arch/xarchiver/files/xarchiver-0.5.2-stack-smash.patch b/app-arch/xarchiver/files/xarchiver-0.5.2-stack-smash.patch
new file mode 100644
index 000000000000..66104822eae9
--- /dev/null
+++ b/app-arch/xarchiver/files/xarchiver-0.5.2-stack-smash.patch
@@ -0,0 +1,20 @@
+--- xarchiver-0.5.2-old/src/window.c	2008-11-11 09:31:45.000000000 +0100
++++ xarchiver-0.5.2/src/window.c	2009-01-25 16:26:07.000000000 +0100
+@@ -1447,7 +1447,7 @@
+ 	GtkTreeIter iter;
+ 	gint n_elem = 0,pos = 0,dirs = 0;
+ 	unsigned long int total_size = 0;
+-	unsigned long int size = 0;
++	guint64 size = 0;
+ 	XEntry *entry = NULL;
+ 
+ 	path = gtk_tree_path_new_first();
+@@ -1517,7 +1517,7 @@
+ 	GtkTreeModel *model;
+ 	gint selected = 0,pos = 0,dirs = 0;
+ 	unsigned long int total_size = 0;
+-	unsigned long int size = 0;
++	guint64 size = 0;
+ 	XEntry *entry;
+ 
+ 	switch (archive->type)
diff --git a/app-arch/xarchiver/xarchiver-0.4.6.ebuild b/app-arch/xarchiver/xarchiver-0.4.6.ebuild
deleted file mode 100644
index 685fa41c5765..000000000000
--- a/app-arch/xarchiver/xarchiver-0.4.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.4.6.ebuild,v 1.1 2008/05/11 14:07:16 drac Exp $
-
-inherit fdo-mime gnome2-utils
-
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar file manager."
-HOMEPAGE="http://xarchiver.xfce.org"
-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"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.6"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf --disable-dependency-tracking $(use_enable debug)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-	elog "You need external programs for some formats, including"
-	elog "arj - app-arch/unarj app-arch/arj"
-	elog "zip - app-arch/unzip app-arch/zip"
-	elog "rar - app-arch/unrar app-arch/rar"
-	elog "7zip - app-arch/p7zip"
-	elog "lha - app-arch/lha"
-	elog "Make sure to install xfce-extra/thunar-archive plug-in."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-arch/xarchiver/xarchiver-0.5.0.ebuild b/app-arch/xarchiver/xarchiver-0.5.0.ebuild
deleted file mode 100644
index c16788aa027e..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.0.ebuild,v 1.1 2008/11/06 12:50:54 angelos Exp $
-
-EAPI=1
-
-inherit fdo-mime gnome2-utils
-
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar file manager."
-HOMEPAGE="http://xarchiver.xfce.org"
-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"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-libs/glib-2.10:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf --disable-dependency-tracking $(use_enable debug)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-	elog "You need external programs for some formats, including"
-	elog "arj - app-arch/unarj app-arch/arj"
-	elog "zip - app-arch/unzip app-arch/zip"
-	elog "rar - app-arch/unrar app-arch/rar"
-	elog "7zip - app-arch/p7zip"
-	elog "lha - app-arch/lha"
-	elog "Make sure to install xfce-extra/thunar-archive plug-in."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-arch/xarchiver/xarchiver-0.5.1.ebuild b/app-arch/xarchiver/xarchiver-0.5.1.ebuild
deleted file mode 100644
index d5df8a26fb15..000000000000
--- a/app-arch/xarchiver/xarchiver-0.5.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.1.ebuild,v 1.1 2008/11/07 14:02:15 angelos Exp $
-
-EAPI=1
-
-inherit fdo-mime gnome2-utils
-
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar file manager."
-HOMEPAGE="http://xarchiver.xfce.org"
-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"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-libs/glib-2.10:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf --disable-dependency-tracking $(use_enable debug)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-	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"
-	elog "Make sure to install xfce-extra/thunar-archive plug-in."
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-arch/xarchiver/xarchiver-0.5.2.ebuild b/app-arch/xarchiver/xarchiver-0.5.2.ebuild
index f9a478700aeb..44e6e47ac70c 100644
--- a/app-arch/xarchiver/xarchiver-0.5.2.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 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.ebuild,v 1.7 2009/02/04 21:12:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.2.ebuild,v 1.8 2009/02/09 19:35:01 angelos Exp $
 
 EAPI=1
 
-inherit fdo-mime gnome2-utils
+inherit eutils fdo-mime gnome2-utils
 
-DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar file manager."
+DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
 HOMEPAGE="http://xarchiver.xfce.org"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
@@ -21,13 +21,19 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-stack-smash.patch
+}
+
 src_compile() {
 	econf --disable-dependency-tracking $(use_enable debug)
-	emake || die "emake failed."
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }