Bug #75200, security fix, stable on x86.

5 files changed, 85 insertions, 5 deletions

diff --git a/app-text/pdftohtml/ChangeLog b/app-text/pdftohtml/ChangeLog
index d586a4da4d67..f28ea0fb07b2 100644
--- a/app-text/pdftohtml/ChangeLog
+++ b/app-text/pdftohtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/pdftohtml
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.13 2005/01/01 16:30:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/ChangeLog,v 1.14 2005/01/07 11:46:20 robbat2 Exp $
+
+*pdftohtml-0.36-r2 (07 Jan 2005)
+
+  07 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch,
+  +pdftohtml-0.36-r2.ebuild:
+  Bug #75200, security fix, stable on x86.
 
 *pdftohtml-0.36-r1 (22 Nov 2004)
 
diff --git a/app-text/pdftohtml/Manifest b/app-text/pdftohtml/Manifest
index 43f5cbdd6975..b84bf8090019 100644
--- a/app-text/pdftohtml/Manifest
+++ b/app-text/pdftohtml/Manifest
@@ -1,8 +1,11 @@
-MD5 f486416fac9e3229f37d1102346f0d41 ChangeLog 1508
-MD5 89ef7f9c7de9131f44bb5467613d98ed pdftohtml-0.36.ebuild 660
+MD5 df453b3209c30d6b6b2729d7925ea715 pdftohtml-0.36-r2.ebuild 1014
 MD5 205429f970817d3e1f5c7abff1360296 pdftohtml-0.36-r1.ebuild 931
+MD5 89ef7f9c7de9131f44bb5467613d98ed pdftohtml-0.36.ebuild 660
+MD5 f486416fac9e3229f37d1102346f0d41 ChangeLog 1508
 MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36 66
+MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
+MD5 d4de4d643cf7db65c2a6cdbd4ac868e2 files/xpdf-3.00pl2-CAN-2004-1125.patch 1645
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r1 66
+MD5 89167430147d99e86ca445b23be50f1b files/digest-pdftohtml-0.36-r2 66
 MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
-MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
diff --git a/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2 b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2
new file mode 100644
index 000000000000..5ae8348e609f
--- /dev/null
+++ b/app-text/pdftohtml/files/digest-pdftohtml-0.36-r2
@@ -0,0 +1 @@
+MD5 75ad095bb51e1f66c9f7691e6af12f44 pdftohtml-0.36.tar.gz 300922
diff --git a/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch b/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
new file mode 100644
index 000000000000..119de236d50b
--- /dev/null
+++ b/app-text/pdftohtml/files/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
@@ -0,0 +1,37 @@
+*** Gfx.cc.orig	Sun Dec 12 16:04:43 2004
+--- Gfx.cc	Sun Dec 12 16:05:16 2004
+***************
+*** 2654,2660 ****
+      haveMask = gFalse;
+      dict->lookup("Mask", &maskObj);
+      if (maskObj.isArray()) {
+!       for (i = 0; i < maskObj.arrayGetLength(); ++i) {
+  	maskObj.arrayGet(i, &obj1);
+  	maskColors[i] = obj1.getInt();
+  	obj1.free();
+--- 2654,2662 ----
+      haveMask = gFalse;
+      dict->lookup("Mask", &maskObj);
+      if (maskObj.isArray()) {
+!       for (i = 0;
+! 	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
+! 	   ++i) {
+  	maskObj.arrayGet(i, &obj1);
+  	maskColors[i] = obj1.getInt();
+  	obj1.free();
+*** GfxState.cc.orig	Sun Dec 12 16:04:48 2004
+--- GfxState.cc	Sun Dec 12 16:06:38 2004
+***************
+*** 708,713 ****
+--- 708,718 ----
+    }
+    nCompsA = obj2.getInt();
+    obj2.free();
++   if (nCompsA > gfxColorMaxComps) {
++     error(-1, "ICCBased color space with too many (%d > %d) components",
++ 	  nCompsA, gfxColorMaxComps);
++     nCompsA = gfxColorMaxComps;
++   }
+    if (dict->lookup("Alternate", &obj2)->isNull() ||
+        !(altA = GfxColorSpace::parse(&obj2))) {
+      switch (nCompsA) {
diff --git a/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild b/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild
new file mode 100644
index 000000000000..75663feaa1ee
--- /dev/null
+++ b/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftohtml/pdftohtml-0.36-r2.ebuild,v 1.1 2005/01/07 11:46:20 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="pdftohtml is a utility which converts PDF files into HTML and XML formats"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc ~amd64 ~ppc64"
+IUSE=""
+DEPEND="virtual/libc sys-devel/gcc"
+RDEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
+	EPATCH_OPTS="-d ${S}/xpdf -p0" epatch ${FILESDIR}/pdftohtml-xpdf-3.00pl2-CAN-2004-1125.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin pdftohtml
+	dodoc AUTHORS BUGS CHANGES COPYING README pdf2xml.dtd
+}