Bump to 1.8.4-r1. Fix for CVE-2009-0318, bug #257012.

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

4 files changed, 121 insertions, 6 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 463278d3c2ee..22fff1ac1979 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.177 2009/01/26 21:54:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.178 2009/03/09 22:45:32 eva Exp $
+
+*gnumeric-1.8.4-r1 (09 Mar 2009)
+
+  09 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnumeric-1.8.4-CVE-2009-0318.patch, +gnumeric-1.8.4-r1.ebuild:
+  Bump to 1.8.4-r1. Fix for CVE-2009-0318, bug #257012.
 
 *gnumeric-1.8.4 (26 Jan 2009)
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 6bd662f7a700..dc0d079509ff 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnumeric-1.8.4-CVE-2009-0318.patch 626 RMD160 ec133b7ec03d9ea2b14a9d2bcb2798f624173744 SHA1 8a4237843309e1bf5b47dd1fbb3e69ecaccd4aa8 SHA256 fab335e4db5f17f74b110d473ad50b14510d56d43168fc3b84f115d907bba964
 DIST gnumeric-1.8.3.tar.bz2 14087309 RMD160 4cd03c3dd1bfcfc72bed1902caef4ae2cae412f9 SHA1 5a6585549bd705bf1d0e590981c3ef38173f8c08 SHA256 173df749482f7391e50a6eb8339107b2b201582978637c63190c4a79f8e66d07
 DIST gnumeric-1.8.4.tar.bz2 14087780 RMD160 461ea59b2ce30d2ce7dd5bca2cea2c50b955dc57 SHA1 2d765b0d06509e0695c4d3ec96b94f8acba88735 SHA256 a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
 EBUILD gnumeric-1.8.3.ebuild 2392 RMD160 fb805ac723af4798796c1f9012114e55689dd48e SHA1 bd9ba4bda16db6da7e15b50b56e4446abf6c588d SHA256 0f0484f7e686ab2437c2249f94565f52e4032c793c2b6675bf228e412bbd7815
+EBUILD gnumeric-1.8.4-r1.ebuild 1968 RMD160 88b27e5a7969b9655a302879c2ca43b3444e97bc SHA1 f2edf3d5fd6ce03f837e69eff10f5f85cecc24d1 SHA256 c77203b9ded623bb3230c0457dbab2d19c560c4bd35d5ab0239eeb1e295bbe61
 EBUILD gnumeric-1.8.4.ebuild 2399 RMD160 ff4fade38a74d7db25ff8595d4d60aba25afa03e SHA1 18eccafbff10dd9cdb2499d27212f438680c7638 SHA256 b1b56bf5f44adb958d83fc13395cecd6ae85a26b8dd8efd1a48c7bbf5b6fbd1e
-MISC ChangeLog 23759 RMD160 b37cf5c2a97b6f03ffffd98e8936cfbbae7c1465 SHA1 1c47e8b7494066b78dbf25607c6a74ab4db77d57 SHA256 1d6be7cf45df8923071d4a35b3ccdd7fda99aaaed3e83f471c93f723cf9f68f5
+MISC ChangeLog 23976 RMD160 2dcb8a6c988da00f80fc43f5657800d930abe5d6 SHA1 bc8ececa2863b6b4a27b844e4295e9ddc12ab703 SHA256 3797b089e31bde176ea5ee866628119bb820a42721184de1b68ccc508d900306
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkl+PyoACgkQ1fmVwcYIWAZuoQCfVi9W8ReuthE4zuuBwYaYy0+r
-XOgAn26ogHEkESk5g/vVhEsifCB0KbVc
-=t06G
+iEYEARECAAYFAkm1nBMACgkQ1fmVwcYIWAYQ2gCfY40bfLZ5qw42hCX80Bcyw9qe
+C+IAn1vvYfJ2cML7nsLyOI+xzKDDXRDz
+=aOP9
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/files/gnumeric-1.8.4-CVE-2009-0318.patch b/app-office/gnumeric/files/gnumeric-1.8.4-CVE-2009-0318.patch
new file mode 100644
index 000000000000..a4889ce4909e
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.8.4-CVE-2009-0318.patch
@@ -0,0 +1,17 @@
+#
+# Jon Kåre:
+#	* Work around vulnerability in Python. CVE-2009-0318 [#569648]
+#
+# https://bugs.gentoo.org/show_bug.cgi?id=257012
+# https://bugzilla.redhat.com/show_bug.cgi?id=481572
+--- branches/gnumeric-1-8/plugins/python-loader/gnm-py-interpreter.c	2009/01/29 14:08:41	17110
++++ branches/gnumeric-1-8/plugins/python-loader/gnm-py-interpreter.c	2009/01/29 14:33:02	17111
+@@ -79,7 +79,7 @@
+ 		G_TYPE_NONE, 0);
+ }
+ 
+-static char *plugin_argv[] = {(char *) "gnumeric", NULL};
++static char *plugin_argv[] = {(char *) "/dev/null/python/is/buggy/gnumeric", NULL};
+ 
+ GnmPyInterpreter *
+ gnm_py_interpreter_new (GOPlugin *plugin)
diff --git a/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild b/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..5e12beb7f6ea
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild,v 1.1 2009/03/09 22:45:32 eva Exp $
+
+EAPI="2"
+
+inherit gnome2 flag-o-matic python
+
+DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
+HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="gnome perl python"
+# bonobo guile libgda mono (experimental)
+
+# lots of missing files, wait for next release
+RESTRICT="test"
+
+RDEPEND="sys-libs/zlib
+	app-arch/bzip2
+	>=dev-libs/glib-2.6
+	>=gnome-extra/libgsf-1.14.6[gnome]
+	>=x11-libs/goffice-0.6.3
+	>=dev-libs/libxml2-2.4.12
+	>=x11-libs/pango-1.8.1
+
+	>=x11-libs/gtk+-2.10
+	x11-libs/cairo[svg]
+	>=gnome-base/libglade-2.3.6
+	>=media-libs/libart_lgpl-2.3.11
+
+	gnome? (
+		>=gnome-base/gconf-2
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonobo-2.2
+		>=gnome-base/libbonoboui-2.2 )
+	perl? ( dev-lang/perl )
+	python? (
+		>=dev-lang/python-2
+		>=dev-python/pygtk-2 )"
+	# libgda? (
+	#	>=gnome-extra/libgda-3.1.1
+	#	>=gnome-extra/libgnomedb-3.0.1 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.18
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	local will_die=false
+
+	G2CONF="${G2CONF}
+		--enable-ssindex
+		--enable-static
+		--without-gda
+		--without-guile
+		--without-mono
+		$(use_with perl)
+		$(use_with python)
+		$(use_with gnome)"
+
+	# gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
+	replace-flags "-Os" "-O2"
+}
+
+src_prepare() {
+	# Fix for CVE-2009-0318, bug #257012
+	epatch "${FILESDIR}/${P}-CVE-2009-0318.patch"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# make gnumeric find its help
+	dosym \
+		/usr/share/gnome/help/gnumeric \
+		/usr/share/${PN}/${PV}/doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+}