Don't fail on unrecognized chunks, bug #237835

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64
RepoMan-Options: --force

4 files changed, 108 insertions, 5 deletions

diff --git a/media-gfx/eog/ChangeLog b/media-gfx/eog/ChangeLog
index 7c48b3f73b52..38468fac37cd 100644
--- a/media-gfx/eog/ChangeLog
+++ b/media-gfx/eog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/eog
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.210 2008/10/06 21:18:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/ChangeLog,v 1.211 2008/10/11 23:35:20 eva Exp $
+
+*eog-2.22.3-r2 (11 Oct 2008)
+
+  11 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/eog-2.22.3-unrecognized-chunks.patch, +eog-2.22.3-r2.ebuild:
+  Don't fail on unrecognized chunks, bug #237835.
 
   06 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> eog-2.20.2.ebuild,
   eog-2.20.4.ebuild:
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index ea72d5c256cc..7ec3db5da647 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX eog-2.22.3-unrecognized-chunks.patch 659 RMD160 ecdbcacb43cdb31ebe868eac30d9f5d89e7579cc SHA1 471eb920a117e374e397e07005c5689faf99e240 SHA256 ba7c2e9c4da137a9d482578e73f6758e093c3b3661da4df0f70aa00a2fb18ca8
 DIST eog-2.20.2.tar.bz2 1656601 RMD160 0c3bd4f85a76910e5c892b27ec02645de990e2fa SHA1 eca46e393cd02bf5156c30a6f64a9341e0a3bcca SHA256 4b18634547cb5cd712a9550f6adb789d1ef49b27406ad60208b6f6bdd6730f62
 DIST eog-2.20.4.tar.bz2 1666532 RMD160 dc7ea74ae89beb3369795a3c8c91538f2b9c679d SHA1 d129f2ac01cc7b8d70c880d4b277d70c3d236e19 SHA256 46678eb6767cb1bcb31a0d2d9af31653c91d7a8d698ec5637655ab9229eb811a
 DIST eog-2.22.2.tar.bz2 1899431 RMD160 1620a97937f521d978a4549b200e815a61bacaa4 SHA1 b9091c25b31fea262c9557d1148f5e6d4af08f9e SHA256 3c6552d2d55317241a6cab9d294c91bed084a957cca84c4b76b059a298ea66fb
@@ -9,12 +10,13 @@ EBUILD eog-2.20.2.ebuild 1396 RMD160 0fb4f35a4d02c0b05bce115c5447547bc6f82efe SH
 EBUILD eog-2.20.4.ebuild 1448 RMD160 364cdb348d3d7205f27affea42848b28ba9d360b SHA1 cecd1e421706762ea05db10bb3f05ecdb85ad2d4 SHA256 f12ff43992c9de5b4ea3b7d6115b5234dc8e978005e7590db214bcb8e5446225
 EBUILD eog-2.22.2.ebuild 1442 RMD160 49c0ec1a7c8216cba25630760c5903df71721672 SHA1 6517669e53db894e734432fb464a449223c9b414 SHA256 68a19133c4e839ca729e3c35e96844e5273d1040dfe9a53b3b5eea49af23a531
 EBUILD eog-2.22.3-r1.ebuild 1831 RMD160 94f07759e06d4cbe5e03b1b270a4999457525107 SHA1 40de3f29e9668a92e27b4e949144f21d5d09694c SHA256 4c9f3421d99b5bb14d1d11b4b222299ddca6ac1b3fd6302a414494452cec05be
-MISC ChangeLog 23932 RMD160 a2a84e89676943be7c69fecb779082abfa0cffe9 SHA1 f5d36591f20174ca47ce7a2a77e716917504cbf5 SHA256 5d6f9cad012e2e076ca907a7c5980d65877962cdcadb0e91e7a37da331cc452c
+EBUILD eog-2.22.3-r2.ebuild 1978 RMD160 33304c7e86f672a1738b8dbf2fb1e054ea49d9c9 SHA1 630b7cc9901070cc98994d70b21d10ffb25f7963 SHA256 30b52cd16974751c1a2b0205ae001ef6ab759f037fbacba4aece8a93dc7e139d
+MISC ChangeLog 24137 RMD160 4bc8ffc75d2ea9215159f8c9e660631636e0bf51 SHA1 d91991ad9113a8b5fbd180a9098be0f269da6bfb SHA256 c496ac1ec3f93cf288f9832c3cc031bda8afc13e1b8308185ff2fd3e963dd3af
 MISC metadata.xml 377 RMD160 72d273853415be617a9d9041a8e976471f5d5d0e SHA1 31212db654340d26addb59e4f5ecdeeaa08e4d06 SHA256 d51779b821ec7ef34d3c040683f4373de52797e453cf90e490343eee3230367f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjqgLUACgkQ1fmVwcYIWAZtXwCeK+kwO8yu/Im1M1CMNZQ8S8Gu
-xYoAn1zAv6qVN741eHCU3lSPXk1M43p1
-=EIo/
+iEYEARECAAYFAkjxOD4ACgkQ1fmVwcYIWAZPOQCgpJ5/fHa4TnnLXb3eff24uoRa
+tlMAnRQkQAKiUNEYc0qixmvz7nacAlix
+=NQVy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/eog/eog-2.22.3-r2.ebuild b/media-gfx/eog/eog-2.22.3-r2.ebuild
new file mode 100644
index 000000000000..057e564c0b36
--- /dev/null
+++ b/media-gfx/eog/eog-2.22.3-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.22.3-r2.ebuild,v 1.1 2008/10/11 23:35:20 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="http://www.gnome.org/projects/eog/"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus exif lcms python"
+
+# FIXME: add exempi to the tree ?
+
+RDEPEND=">=x11-libs/gtk+-2.11.6
+	>=dev-libs/glib-2.15.3
+	>=gnome-base/gnome-vfs-2.10
+	>=gnome-base/libgnomeui-2.10
+	>=gnome-base/libglade-2.3.6
+	>=gnome-base/gconf-2.5.90
+	>=media-libs/libart_lgpl-2.3.16
+	>=gnome-base/gnome-desktop-2.10
+	>=x11-themes/gnome-icon-theme-2.19.1
+	>=x11-misc/shared-mime-info-0.20
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
+	exif? (
+		>=media-libs/libexif-0.6.14
+		media-libs/jpeg )
+	lcms? ( media-libs/lcms )
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygobject-2.11.5
+		>=dev-python/pygtk-2.9.7
+		>=dev-python/gnome-python-2.18.2
+	)"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.17"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with exif libjpeg)
+		$(use_with exif libexif)
+		$(use_with dbus dbus-glib-1)
+		$(use_with lcms cms)
+		$(use_enable python)
+		--without-xmp
+		--disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Don't fail on unrecognized chunks, bug #237835
+	epatch "${FILESDIR}/${P}-unrecognized-chunks.patch"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! built_with_use =x11-libs/gtk+-2* jpeg; then
+		ewarn "For JPEG file support to work, x11-libs/gtk+ must be rebuilt"
+		ewarn "with the 'jpeg' USE flag enabled."
+	fi
+
+	if ! built_with_use =x11-libs/gtk+-2* tiff; then
+		ewarn "For TIFF file support to work, x11-libs/gtk+ must be rebuilt"
+		ewarn "with the 'tiff' USE flag enabled."
+	fi
+}
diff --git a/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch b/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
new file mode 100644
index 000000000000..56df1f913145
--- /dev/null
+++ b/media-gfx/eog/files/eog-2.22.3-unrecognized-chunks.patch
@@ -0,0 +1,19 @@
+---
+	2008-09-30  Felix Riemann  <friemann@svn.gnome.org>
+	
+	* src/eog-metadata-reader-jpg.c: (eog_metadata_reader_jpg_consume):
+	Don't overwrite the last read chunk when skipping over unrecognized
+	APP1 chunks. Avoids memory corruption and subsequent segfaults.
+
+Index: trunk/src/eog-metadata-reader-jpg.c
+====================================================================
+--- trunk/src/eog-metadata-reader-jpg.c	2008/09/30 11:58:28	4810
++++ trunk/src/eog-metadata-reader-jpg.c	2008/09/30 13:49:31	4811
+@@ -321,6 +321,7 @@
+ 			case EJA_OTHER:
+ 			default:
+ 				/* skip unknown data */
++				chunk = NULL;
+ 				priv->state = EMR_SKIP_BYTES;
+ 				break;
+ 			}