Revision bump for security patch, see bug 75191

5 files changed, 115 insertions, 14 deletions

diff --git a/app-text/gpdf/ChangeLog b/app-text/gpdf/ChangeLog
index 197566bdd5de..86516a354a71 100644
--- a/app-text/gpdf/ChangeLog
+++ b/app-text/gpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gpdf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.62 2004/12/22 03:11:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.63 2004/12/22 12:51:21 joem Exp $
+
+*gpdf-2.8.1-r1 (22 Dec 2004)
+
+  22 Dec 2004; Joe McCann <joem@gentoo.org>
+  +files/gpdf-xpdf-CAN-2004-1125.patch, +gpdf-2.8.1-r1.ebuild:
+  Revision bump for security patch, see bug 75191
 
   22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> gpdf-2.8.1.ebuild:
   Stable on sparc
diff --git a/app-text/gpdf/Manifest b/app-text/gpdf/Manifest
index 4b6cb95880f5..670a4ec63daf 100644
--- a/app-text/gpdf/Manifest
+++ b/app-text/gpdf/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 51b92bd3be82724d12435968eea8b712 ChangeLog 6780
+MD5 f4a02782dfaa3af8e3161311388000d8 ChangeLog 6964
 MD5 83e87740df883833cb46d90d9955afea gpdf-0.132-r1.ebuild 1021
 MD5 c36bc2ff3cf96fc8de5fa8b1aeaded28 gpdf-0.132-r2.ebuild 1166
-MD5 5c0a87a7195230a8ebe0397dab2d7c8a gpdf-2.8.1.ebuild 1052
 MD5 04bf8f4b6aa6e4c3cad51f129164ec42 gpdf-2.8.0-r2.ebuild 1077
+MD5 5c0a87a7195230a8ebe0397dab2d7c8a gpdf-2.8.1.ebuild 1052
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 e65fd891d8fadaf18dcaf232d18abdd6 files/digest-gpdf-2.8.1 64
+MD5 baf6264e7143ca4054349ba766e76151 gpdf-2.8.1-r1.ebuild 1126
 MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r1 64
 MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r2 64
 MD5 f61386d00d5674f3bbb80b181e8cea3a files/digest-gpdf-2.8.0-r2 64
+MD5 e65fd891d8fadaf18dcaf232d18abdd6 files/digest-gpdf-2.8.1 64
 MD5 9336bbbfbb54ba88fb5e4aba2da1833f files/gpdf-0.112-remove_gtk24_call.patch 607
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/gpdf-xpdf2_underflow.patch 2363
 MD5 b32f90fc9249d1f7434659642b36f9d9 files/gpdf-xpdf_2_CAN-2004-0888.patch 2716
 MD5 5e63c86e19a1c1387cab38b7e2902c9e files/gpdf-xpdf_3_CAN-2004-0889.patch 8115
 MD5 2fce5bedd61300fad1566a41f991a782 files/gpdf-xpdf_goo_sizet.patch 1424
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFByOX7KRy60XGEcJIRAmeOAJ9DQBIik8uhZM7qrVOSSARbL6J0AQCglAxM
-G63IYnANroSLoMWIhR3ROLU=
-=tyS+
------END PGP SIGNATURE-----
+MD5 651529b6e386b3a73ffd9cc0c19e9661 files/gpdf-xpdf-CAN-2004-1125.patch 1666
+MD5 e65fd891d8fadaf18dcaf232d18abdd6 files/digest-gpdf-2.8.1-r1 64
diff --git a/app-text/gpdf/files/digest-gpdf-2.8.1-r1 b/app-text/gpdf/files/digest-gpdf-2.8.1-r1
new file mode 100644
index 000000000000..bab424b38b68
--- /dev/null
+++ b/app-text/gpdf/files/digest-gpdf-2.8.1-r1
@@ -0,0 +1 @@
+MD5 6248d2f0028ea4046250a5f8693e8c1e gpdf-2.8.1.tar.bz2 1053030
diff --git a/app-text/gpdf/files/gpdf-xpdf-CAN-2004-1125.patch b/app-text/gpdf/files/gpdf-xpdf-CAN-2004-1125.patch
new file mode 100644
index 000000000000..2dfd1b0411cd
--- /dev/null
+++ b/app-text/gpdf/files/gpdf-xpdf-CAN-2004-1125.patch
@@ -0,0 +1,55 @@
+*** xpdf/Gfx.cc.orig	Sun Dec 12 16:04:43 2004
+--- xpdf/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();
+*** xpdf/GfxState.cc.orig	Sun Dec 12 16:04:48 2004
+--- xpdf/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) {
+***************
+*** 1054,1060 ****
+    }
+    nCompsA = obj1.arrayGetLength();
+    if (nCompsA > gfxColorMaxComps) {
+!     error(-1, "DeviceN color space with more than %d > %d components",
+  	  nCompsA, gfxColorMaxComps);
+      nCompsA = gfxColorMaxComps;
+    }
+--- 1059,1065 ----
+    }
+    nCompsA = obj1.arrayGetLength();
+    if (nCompsA > gfxColorMaxComps) {
+!     error(-1, "DeviceN color space with too many (%d > %d) components",
+  	  nCompsA, gfxColorMaxComps);
+      nCompsA = gfxColorMaxComps;
+    }
+
diff --git a/app-text/gpdf/gpdf-2.8.1-r1.ebuild b/app-text/gpdf/gpdf-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..a12342939de5
--- /dev/null
+++ b/app-text/gpdf/gpdf-2.8.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/gpdf-2.8.1-r1.ebuild,v 1.1 2004/12/22 12:51:21 joem Exp $
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="Viewer for Portable Document Format (PDF) files"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc alpha sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.3
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libbonobo-2.2.1
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnomeprint-2.6
+	>=gnome-base/libgnomeprintui-2.2
+	>=gnome-base/libglade-2"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+PROVIDE="virtual/pdfviewer"
+
+DOCS="AUTHORS CHANGES ChangeLog NEWS README*"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# fix sec vuln (#69662)
+	epatch ${FILESDIR}/${PN}-xpdf_goo_sizet.patch
+	#fix sec vuln (#75191)
+	epatch ${FILESDIR}/${PN}-xpdf-CAN-2004-1125.patch
+	# disable the tests, see bug #73882
+	sed -i -e "s:test-files::" Makefile.in
+
+}