New revisions including a patch to fix a vulnerability inside gdk-pixbuf (bug #112608).

(Portage version: 2.0.53_rc7)

7 files changed, 58 insertions, 20 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index cd69ed6c058f..e3033f88c5fd 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.198 2005/11/11 23:21:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.199 2005/11/15 16:58:27 leonardop Exp $
+
+*gtk+-2.8.6-r1 (15 Nov 2005)
+*gtk+-2.6.10-r1 (15 Nov 2005)
+
+  15 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gtk+-2-xpm_loader.patch, -gtk+-2.6.10.ebuild,
+  +gtk+-2.6.10-r1.ebuild, -gtk+-2.8.6.ebuild, +gtk+-2.8.6-r1.ebuild:
+  Added patch to fix a probem inside gdk-pixbuf regarding the XPM loader
+  (bug #112608). Marked 2.6.10-r1 stable on all arches that reported back
+  successful testing.
 
   11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> gtk+-2.6.10.ebuild:
   Stable on hppa, ppc.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 47567be521c8..e8f9d7eb44dc 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -2,10 +2,12 @@ MD5 823fe5d38a9564f9c97ad95da5754a21 ChangeLog 28272
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
 MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
+MD5 f0e0f202bdf17540985215d5384480ed files/digest-gtk+-2.6.10-r1 212
 MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
-MD5 e9729297feed3e63e6176140ee4cb463 files/digest-gtk+-2.8.6 140
+MD5 e9729297feed3e63e6176140ee4cb463 files/digest-gtk+-2.8.6-r1 140
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
 MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+MD5 cd1c96c0a81026a3af29449389e455d5 files/gtk+-2-xpm_loader.patch 920
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
 MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
@@ -13,7 +15,8 @@ MD5 88f458873590e6a355d2bcb76fa859f7 files/gtk+-2.8.6-freebsd.patch 507
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
 MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
+MD5 6cffef6d580b57b5d6817b233470040b gtk+-2.6.10-r1.ebuild 3131
 MD5 fdb299cf5baed0029831b89b864f0933 gtk+-2.6.10.ebuild 2963
 MD5 5033b22f68c770cc1738680edc951abf gtk+-2.6.8.ebuild 2884
-MD5 545a7e3859a6cae85dea63a55b7ebe05 gtk+-2.8.6.ebuild 4097
+MD5 503f51e5b2871f77dccabed839715ef1 gtk+-2.8.6-r1.ebuild 4214
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.10 b/x11-libs/gtk+/files/digest-gtk+-2.6.10-r1
index f3f4f1bb20b3..c0f338a43afc 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.6.10
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.10-r1
@@ -1,3 +1,3 @@
-MD5 520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 11521380
 MD5 598d2c1e53c44e87b70199621f2cf65c gtk+-2.6-smoothscroll-r5.patch.bz2 3758
 MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
+MD5 520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 11521380
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.6 b/x11-libs/gtk+/files/digest-gtk+-2.8.6-r1
index 51aff4a62e1e..51aff4a62e1e 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.6
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.6-r1
diff --git a/x11-libs/gtk+/files/gtk+-2-xpm_loader.patch b/x11-libs/gtk+/files/gtk+-2-xpm_loader.patch
new file mode 100644
index 000000000000..62c375060b8b
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2-xpm_loader.patch
@@ -0,0 +1,24 @@
+diff -NurdB gtk+-2.8.6/gdk-pixbuf/io-xpm.c gtk+-2.8.6-patched/gdk-pixbuf/io-xpm.c
+--- gtk+-2.8.6/gdk-pixbuf/io-xpm.c	2005-03-07 22:59:45.000000000 -0500
++++ gtk+-2.8.6-patched/gdk-pixbuf/io-xpm.c	2005-10-27 11:41:12.000000000 -0500
+@@ -405,7 +405,8 @@
+ 		/* Fall through to the xpm_read_string. */
+ 
+ 	case op_body:
+-		xpm_read_string (h->infile, &h->buffer, &h->buffer_size);
++		if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size))
++			return NULL;
+ 		return h->buffer;
+ 
+ 	default:
+@@ -500,7 +501,9 @@
+                              _("XPM has invalid number of chars per pixel"));
+ 		return NULL;
+ 	}
+-	if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) {
++	if (n_col <= 0 || 
++	    n_col >= G_MAXINT / (cpp + 1) || 
++	    n_col >= G_MAXINT / sizeof (XPMColor)) {
+                 g_set_error (error,
+                              GDK_PIXBUF_ERROR,
+                              GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
diff --git a/x11-libs/gtk+/gtk+-2.6.10.ebuild b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
index f1e29bd8b74b..4f065f097874 100644
--- a/x11-libs/gtk+/gtk+-2.6.10.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10.ebuild,v 1.7 2005/11/11 23:21:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10-r1.ebuild,v 1.1 2005/11/15 16:58:27 leonardop Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,8 +12,8 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="doc tiff jpeg static"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="doc tiff jpeg"
 
 RDEPEND="virtual/x11
 	>=dev-libs/glib-2.6
@@ -40,15 +40,16 @@ set_gtk2_confdir() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
+	# Fix problems in gdk-pixbuf's code regarding XPM files. Bug #112608.
+	epatch "${FILESDIR}"/${PN}-2-xpm_loader.patch
 	# beautifying patch for disabled icons
-	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
+	epatch "${FILESDIR}"/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r5.patch.bz2
+	epatch "${DISTDIR}"/${PN}-2.6-smoothscroll-r5.patch.bz2
 
-	cd ${S}
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
 	has_multilib_profile && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
@@ -60,11 +61,10 @@ src_unpack() {
 	use ppc64 && ! has_version '>=dev-libs/glib-2.8' && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
 	use ppc64 && append-flags -mminimal-toc
 
-	autoconf || die
-	automake || die
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
 
 	epunt_cxx
-
 }
 
 src_compile() {
@@ -76,14 +76,13 @@ src_compile() {
 		`use_enable doc gtk-doc` \
 		`use_with jpeg libjpeg` \
 		`use_with tiff libtiff` \
-		`use_enable static` \
 		--with-libpng \
 		--with-gdktarget=x11 \
 		--with-xinput \
 		|| die
 
 	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	emake -j1 || die
+	emake -j1 || die "Compilation failed"
 
 }
 
@@ -92,7 +91,7 @@ src_install() {
 	dodir ${GTK2_CONFDIR}
 	keepdir ${GTK2_CONFDIR}
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "Installation failed"
 
 	# Enable xft in environment as suggested by <utx@gentoo.org>
 	dodir /etc/env.d
diff --git a/x11-libs/gtk+/gtk+-2.8.6.ebuild b/x11-libs/gtk+/gtk+-2.8.6-r1.ebuild
index 347f05f47078..2ab519e221cb 100644
--- a/x11-libs/gtk+/gtk+-2.8.6.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.6.ebuild,v 1.5 2005/11/04 20:36:10 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.6-r1.ebuild,v 1.1 2005/11/15 16:58:27 leonardop Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -52,13 +52,13 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.4
 		~app-text/docbook-xml-dtd-4.1.2 )"
 
+
 pkg_setup() {
 	if ! built_with_use x11-libs/cairo X; then
 		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
 		die "cairo needs the X flag set"
 	fi
-	}
-
+}
 
 set_gtk2_confdir() {
 	# An arch specific config directory is used on multilib systems
@@ -71,6 +71,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Fix problems in gdk-pixbuf's code regarding XPM files. Bug #112608.
+	epatch "${FILESDIR}"/${PN}-2-xpm_loader.patch
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons