Bump for bug# 121511

(Portage version: 2.1_pre4-r1)

5 files changed, 132 insertions, 11 deletions

diff --git a/app-text/gpdf/ChangeLog b/app-text/gpdf/ChangeLog
index 7f6d1071b803..a7638bf3722c 100644
--- a/app-text/gpdf/ChangeLog
+++ b/app-text/gpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gpdf
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.120 2006/02/06 05:23:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.121 2006/02/12 19:50:27 dang Exp $
+
+*gpdf-2.10.0-r4 (12 Feb 2006)
+
+  12 Feb 2006; <dang@gentoo.org> +files/gpdf-2.10.0-CVE-2006-0301.patch,
+  +gpdf-2.10.0-r4.ebuild:
+  Bump for bug# 121511
 
   06 Feb 2006; Aron Griffis <agriffis@gentoo.org> gpdf-2.10.0-r3.ebuild:
   Mark 2.10.0-r3 stable on ia64
diff --git a/app-text/gpdf/Manifest b/app-text/gpdf/Manifest
index 10f3dc8dd0b5..3fec54da0288 100644
--- a/app-text/gpdf/Manifest
+++ b/app-text/gpdf/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d425e5ad402c216674848e420aa88fd2 ChangeLog 13211
 RMD160 d8d472fbff3107e2e16add60711517de70c81b2b ChangeLog 13211
 SHA256 d5409331548e5dbd7d062ccc2880a17a2388e4e51c6269a1f557514f811f2219 ChangeLog 13211
@@ -22,6 +19,9 @@ SHA256 3ab9d83e1c38dea38dd6499279bc5298ec7a7a0d065f4d177afa837928a723ea files/di
 MD5 388d05f1aabd1c48c3536ac69d0d8505 files/digest-gpdf-2.10.0-r3 65
 RMD160 79966280b5425d9aad8b513fcf5747a009d5ccdc files/digest-gpdf-2.10.0-r3 65
 SHA256 3ab9d83e1c38dea38dd6499279bc5298ec7a7a0d065f4d177afa837928a723ea files/digest-gpdf-2.10.0-r3 65
+MD5 5b0ad5487e7dab55964a9a683580a260 files/digest-gpdf-2.10.0-r4 241
+RMD160 6ac8510ded757d7234cb337ca536f8479d98d958 files/digest-gpdf-2.10.0-r4 241
+SHA256 cfc070440c906933905a06b6b5aa1e99deb06e3070ed30c9a2dff6b1c4e603dd files/digest-gpdf-2.10.0-r4 241
 MD5 2a2fc64147e806f72bdda9e2e66731a0 files/digest-gpdf-2.8.2 64
 RMD160 e6c6836aa9eec477fbfe46bb85f777817ef09549 files/digest-gpdf-2.8.2 64
 SHA256 46feefdd75ecb68895e4ae7146812db20f4608a0e50e085d155719da8f24e34a files/digest-gpdf-2.8.2 64
@@ -37,6 +37,9 @@ SHA256 b8dc2b738bcca67f15eeabd558d9156f4d6e571c3ae2c6e567716ed3efcf0154 files/gp
 MD5 791fcfed94116d7bd13ff7868b9727d5 files/gpdf-2.10.0-CAN-2005-3193.patch 3880
 RMD160 d3e44442d9882be9e602cfd237cb39176c1e10cd files/gpdf-2.10.0-CAN-2005-3193.patch 3880
 SHA256 19aaa055b54b6d72f21ddd31779ce39ed87724c565a92b27cb3a5c94fc0438bb files/gpdf-2.10.0-CAN-2005-3193.patch 3880
+MD5 a42c11b00d51089c21bb53c38400f9e4 files/gpdf-2.10.0-CVE-2006-0301.patch 1778
+RMD160 9612f62611cecda1b191688e81b862912326028b files/gpdf-2.10.0-CVE-2006-0301.patch 1778
+SHA256 73961095b8516cf5ecda9d2923587accad056df99183cbb471ee81b0de07891d files/gpdf-2.10.0-CVE-2006-0301.patch 1778
 MD5 ba500e3211d62fc797db36fdcf1e2b76 files/gpdf-2.10.0-amd64-gcc4.patch 945
 RMD160 82176e013b51e8df4dcd078ac744710188946849 files/gpdf-2.10.0-amd64-gcc4.patch 945
 SHA256 27b3afa826d00ddc5ac3822d8dfd69489c2509da4df55bd847a868ddf5ade8c2 files/gpdf-2.10.0-amd64-gcc4.patch 945
@@ -76,6 +79,9 @@ SHA256 f301994decc14bd9d53f2d80fe88df998404e29944bb418cc47b82592898b0c8 gpdf-2.1
 MD5 751ffb04e894b1c7d7324daef11e26e8 gpdf-2.10.0-r3.ebuild 1410
 RMD160 dcc237d941f9d31915667d27b5a6e6db754f6e7f gpdf-2.10.0-r3.ebuild 1410
 SHA256 b5c054b3ccb51a6e35070f1a092b4e026b65aedf3025985a490545f61a187f16 gpdf-2.10.0-r3.ebuild 1410
+MD5 536e0f11a884a55f7741dc87d3226f51 gpdf-2.10.0-r4.ebuild 1478
+RMD160 ca7f7d0f892ae89a95d0e26891893b20be8f0f52 gpdf-2.10.0-r4.ebuild 1478
+SHA256 0d29e40b13e5b54ef7bd505e615306737060327ff025d5a327465a9f58475be5 gpdf-2.10.0-r4.ebuild 1478
 MD5 87c5a4b5771c292e1dbcc39fee7d4a55 gpdf-2.10.0.ebuild 1264
 RMD160 2b2f14ad423e7dc14db4670264b51b82e0a8aae6 gpdf-2.10.0.ebuild 1264
 SHA256 b55a3d0238953f5cef30a7221b9c3f40d19593b1d0d9c65c4f614d86eabd6927 gpdf-2.10.0.ebuild 1264
@@ -88,10 +94,3 @@ SHA256 47f6d96f67ecbc5dfc83a90ed3e0600d774efcbb2c96685a108edc05779aab76 gpdf-2.8
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD5t1LJrHF4yAQTrARAqrPAKC8ADL9IEQNQzaCAHaZb9oEScpPswCg0D8i
-z4COHz3OJZPFsYjt+O1aXG0=
-=i7Fk
------END PGP SIGNATURE-----
diff --git a/app-text/gpdf/files/digest-gpdf-2.10.0-r4 b/app-text/gpdf/files/digest-gpdf-2.10.0-r4
new file mode 100644
index 000000000000..8c60a01a4ee9
--- /dev/null
+++ b/app-text/gpdf/files/digest-gpdf-2.10.0-r4
@@ -0,0 +1,3 @@
+MD5 9278cd3b9d06e3b1d364452f0e512fa9 gpdf-2.10.0.tar.bz2 1079944
+RMD160 16cb9413e012c2c5268082d8322d1468e5c30907 gpdf-2.10.0.tar.bz2 1079944
+SHA256 b6a5abf78363205e01bf1d238eaf4c349c9725f57aa18e2adc0445268540c7e6 gpdf-2.10.0.tar.bz2 1079944
diff --git a/app-text/gpdf/files/gpdf-2.10.0-CVE-2006-0301.patch b/app-text/gpdf/files/gpdf-2.10.0-CVE-2006-0301.patch
new file mode 100644
index 000000000000..a2591c4df790
--- /dev/null
+++ b/app-text/gpdf/files/gpdf-2.10.0-CVE-2006-0301.patch
@@ -0,0 +1,52 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gpdf-2.10.0.orig/splash/SplashXPathScanner.cc gpdf-2.10.0/splash/SplashXPathScanner.cc
+--- gpdf-2.10.0.orig/splash/SplashXPathScanner.cc	2004-05-17 14:10:56.000000000 -0400
++++ gpdf-2.10.0/splash/SplashXPathScanner.cc	2006-02-12 14:35:09.000000000 -0500
+@@ -182,7 +182,7 @@
+ }
+ 
+ void SplashXPathScanner::computeIntersections(int y) {
+-  SplashCoord ySegMin, ySegMax, xx0, xx1;
++  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
+   SplashXPathSeg *seg;
+   int i, j;
+ 
+@@ -232,19 +232,27 @@
+     } else if (seg->flags & splashXPathVert) {
+       xx0 = xx1 = seg->x0;
+     } else {
+-      if (ySegMin <= y) {
+-	// intersection with top edge
+-	xx0 = seg->x0 + (y - seg->y0) * seg->dxdy;
+-      } else {
+-	// x coord of segment endpoint with min y coord
+-	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
++      if (seg->x0 < seg->x1) {
++	xSegMin = seg->x0;
++	xSegMax = seg->x1;
++        } else {
++	xSegMin = seg->x1;
++	xSegMax = seg->x0;
++        }
++      // intersection with top edge
++      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
++      // intersection with bottom edge
++      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
++      // the segment may not actually extend to the top and/or bottom edges
++      if (xx0 < xSegMin) {
++	xx0 = xSegMin;
++      } else if (xx0 > xSegMax) {
++	xx0 = xSegMax;
+       }
+-      if (ySegMax >= y + 1) {
+-	// intersection with bottom edge
+-	xx1 = seg->x0 + (y + 1 - seg->y0) * seg->dxdy;
+-      } else {
+-	// x coord of segment endpoint with max y coord
+-	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
++      if (xx1 < xSegMin) {
++	xx1 = xSegMin;
++      } else if (xx1 > xSegMax) {
++	xx1 = xSegMax;
+       }
+     }
+     if (xx0 < xx1) {
diff --git a/app-text/gpdf/gpdf-2.10.0-r4.ebuild b/app-text/gpdf/gpdf-2.10.0-r4.ebuild
new file mode 100644
index 000000000000..93659897fce9
--- /dev/null
+++ b/app-text/gpdf/gpdf-2.10.0-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/gpdf-2.10.0-r4.ebuild,v 1.1 2006/02/12 19:50:27 dang Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Viewer for Portable Document Format (PDF) files"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.5.4
+	>=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*"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Fix sec vuln (#69662)
+	epatch ${FILESDIR}/${PN}-xpdf_goo_sizet.patch
+	# Fix building on amd64 with gcc4
+	epatch ${FILESDIR}/${P}-amd64-gcc4.patch
+	# Disable the tests, see bug #73882
+	sed -i -e "s:test-files::" Makefile.in
+	# Fix for bug #100265
+	epatch ${FILESDIR}/${PN}-2.8.2-CAN-2005-2097.patch
+	# fix for bug #117494
+	epatch ${FILESDIR}/${P}-2006-01-16-xpdf.patch
+	# fix for bug #121511
+	epatch ${FILESDIR}/${P}-CVE-2006-0301.patch
+}
+
+src_install() {
+
+	# fix #92920 FIXME
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+}
+