Corrects most recent tetex-2 issues.

Package-Manager: portage-2.1_pre4-r1

8 files changed, 447 insertions, 12 deletions

diff --git a/app-text/cstetex/ChangeLog b/app-text/cstetex/ChangeLog
index 31b2d0e606b7..e427466e8fb4 100644
--- a/app-text/cstetex/ChangeLog
+++ b/app-text/cstetex/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/cstetex
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cstetex/ChangeLog,v 1.10 2005/04/21 20:16:53 blubb Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cstetex/ChangeLog,v 1.11 2006/02/18 16:50:16 nattfodd Exp $
+
+*cstetex-2.0.2-r2 (18 Feb 2006)
+
+  18 Feb 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/cstetex-2.0.2-dvi-draw-conflicting-types.patch,
+  +files/cstetex-2.0.2-flex-unput.patch,
+  +files/xpdf-2.02pl1-CAN-2005-3191-3.patch, +cstetex-2.0.2-r2.ebuild:
+  Backport recent tetex-2 patches (from bugs #115775, #122365 and #118264).
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> cstetex-2.0.2-r1.ebuild:
   stable on amd64
diff --git a/app-text/cstetex/Manifest b/app-text/cstetex/Manifest
index 158018445dff..6b7a82e32146 100644
--- a/app-text/cstetex/Manifest
+++ b/app-text/cstetex/Manifest
@@ -1,11 +1,48 @@
-MD5 5f08993cf2da80a3f39febcdd61e3371 ChangeLog 1495
+MD5 7c9eed43c7b531c4a8e31a7d0d06b8b2 ChangeLog 1831
+RMD160 8cc2b2bf308bf43702c11c5206ac33d813124214 ChangeLog 1831
+SHA256 7e11dc508b3daf7e6d822fbcb834422cbf4e74c95696d7d6b857fb48c3510bd6 ChangeLog 1831
 MD5 7f1fd9d5b656ffd51b823389f8cb1419 cstetex-2.0.2-r1.ebuild 1719
-MD5 d9dc13509a20a79585e3586c5d749c26 metadata.xml 454
+RMD160 af7b4fb22eb2d357364115ffa7cedc48404eeecf cstetex-2.0.2-r1.ebuild 1719
+SHA256 b148a68cdd8caf14396f35133d01b02c89831516307b8638a314040fb97b32f6 cstetex-2.0.2-r1.ebuild 1719
+MD5 eeedd78773e4e9535a26cc604f8c3933 cstetex-2.0.2-r2.ebuild 2023
+RMD160 a2150da2804be2b598e98055714591aaae12026d cstetex-2.0.2-r2.ebuild 2023
+SHA256 a8ca4cb94fc8c279c63c2f912f6ed027ceb3d012c9b102582689336a817d962d cstetex-2.0.2-r2.ebuild 2023
+MD5 912aea791088e715e491a7ccaa7eb25f files/cstetex-2.0.2-dvi-draw-conflicting-types.patch 410
+RMD160 8417f8ee01a46fe1c066d7fd2cd20c7f33ab0a52 files/cstetex-2.0.2-dvi-draw-conflicting-types.patch 410
+SHA256 5f6a525bb57f25a722178716e142a6555058903be0ce3944263b424896941126 files/cstetex-2.0.2-dvi-draw-conflicting-types.patch 410
+MD5 56e1062f89330aad64afa0208ea09b30 files/cstetex-2.0.2-flex-unput.patch 498
+RMD160 834d9c73bcbd2cecedd51c31b38e742e6919b31f files/cstetex-2.0.2-flex-unput.patch 498
+SHA256 40305736699ab42b68203b43483f669aee57b98dad5ee60eb05d19d8e5d7652d files/cstetex-2.0.2-flex-unput.patch 498
 MD5 fae07756d7cfe6b479ae7346c83514b0 files/cstetex-2.0.2.diff 658
-MD5 4237ab1861c88c20b2301cabd838ca07 files/digest-cstetex-2.0.2-r1 639
+RMD160 49d019eb5adb7f6cc60480edf93b57dad1afec27 files/cstetex-2.0.2.diff 658
+SHA256 47a99bdbacc74397071b2a9c7f415ad8fbce046aea6e2e5be6c763eddfa07275 files/cstetex-2.0.2.diff 658
+MD5 6747b6f15f71979cc431c60cdc39dd37 files/digest-cstetex-2.0.2-r1 2377
+RMD160 55f4d1c9726ee7a30f07d71e710a7de405804d76 files/digest-cstetex-2.0.2-r1 2377
+SHA256 ed18a3a77ba2ccfd053b87f3d8360ea5a5a52364914dc000c04bd0f2ef5d4ac5 files/digest-cstetex-2.0.2-r1 2377
+MD5 6747b6f15f71979cc431c60cdc39dd37 files/digest-cstetex-2.0.2-r2 2377
+RMD160 55f4d1c9726ee7a30f07d71e710a7de405804d76 files/digest-cstetex-2.0.2-r2 2377
+SHA256 ed18a3a77ba2ccfd053b87f3d8360ea5a5a52364914dc000c04bd0f2ef5d4ac5 files/digest-cstetex-2.0.2-r2 2377
 MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
+RMD160 79bf98f5b05cdc4e99147809e1ec6895e8843097 files/xdvizilla.patch 912
+SHA256 cb7f0ca4758cd20d5a0a819dd87caa8f2d1df64aaac458e13b4bb3c43deb5204 files/xdvizilla.patch 912
+MD5 34a6a462f630bab703319681b675a92d files/xpdf-2.02pl1-CAN-2005-3191-3.patch 7060
+RMD160 3aa0387ac8bb005193bf4d5e190c8e43b2729a09 files/xpdf-2.02pl1-CAN-2005-3191-3.patch 7060
+SHA256 d96036af3be0bab42b42abad600c7ef49f62b079b3deaa4108c999269be0c6f3 files/xpdf-2.02pl1-CAN-2005-3191-3.patch 7060
 MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
+RMD160 f11de185e9f7893b0bfb744db01739af13b5741e files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
+SHA256 47dc9849b67313c7c7b6545ea8df4a9f97ceeffe818eb1a8e5eeeb3339bcb9ea files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
 MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-CAN-2005-0064.patch 346
+RMD160 7fb5521b698589245f9e0ccea753a6d4e30badf8 files/xpdf-3.00pl3-CAN-2005-0064.patch 346
+SHA256 c51f769fcac31cbb95dd3124deb1b658e0874a3a90fe17d9752c9be937773621 files/xpdf-3.00pl3-CAN-2005-0064.patch 346
 MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
+RMD160 0cf60c817b9868896c7d6fa678978c2c1244618c files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
+SHA256 7df6d659edd6c79f89e0b2a54c65b9ae27dca57c00e7650fd3ae6273e7dc2ed1 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+RMD160 c52769d3ac95b372593e22d46ad4742dc44e47d3 files/xpdf-goo-sizet.patch 1424
+SHA256 d1a75bcb1764383ee1f5bd1c2d678cdadc69cd123069657f1dced0825964cbb0 files/xpdf-goo-sizet.patch 1424
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
+RMD160 110c32f97715d3eb0bcdf19db41a0ac7465d75d1 files/xpdf2-underflow.patch 2363
+SHA256 88a06ef62c423805a0fed011db59e9c170a2482c29f0359dec8ae962395a28ba files/xpdf2-underflow.patch 2363
+MD5 d9dc13509a20a79585e3586c5d749c26 metadata.xml 454
+RMD160 e47b158718be57d58b835ab2f842cc698e2dc9f0 metadata.xml 454
+SHA256 e2b6db816fd1f2e6fdea09ab79c774add3781c6695fb7cc0c85cad66264a02e6 metadata.xml 454
diff --git a/app-text/cstetex/cstetex-2.0.2-r2.ebuild b/app-text/cstetex/cstetex-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..335926d2d822
--- /dev/null
+++ b/app-text/cstetex/cstetex-2.0.2-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cstetex/cstetex-2.0.2-r2.ebuild,v 1.1 2006/02/18 16:50:16 nattfodd Exp $
+
+inherit tetex-2
+
+IUSE=""
+DESCRIPTION="a complete TeX distribution with Czech and Slovak support"
+HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
+
+CSTEX="csfonts.tar.gz csplain.tar.gz cslatex.tar.gz cspsfonts.tar.gz csfonts-t1.tar.gz"
+ENCTEX="enctex.tar.gz"
+SRC_URI="${SRC_URI} ftp://math.feld.cvut.cz/pub/olsak/enctex/${ENCTEX}"
+for FILE in ${CSTEX}; do
+	SRC_URI="${SRC_URI} ftp://math.feld.cvut.cz/pub/cstex/base/${FILE}"
+done
+
+KEYWORDS="~x86 ~amd64"
+
+src_unpack() {
+	tetex-2_src_unpack
+
+	cd ${S}
+	for FILE in ${CSTEX}; do
+		unpack ${FILE}
+	done
+	epatch ${FILESDIR}/${P}.diff
+	cd ${S}/texk/web2c
+	unpack ${ENCTEX}
+	epatch enctex/enctex.patch-to-7.5
+
+	# bug 75801
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
+	EPATCH_OPTS="-d ${S}/libs/xpdf -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl2-CAN-2004-1125.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
+
+	#bug 115775
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p2" epatch ${FILESDIR}/xpdf-2.02pl1-CAN-2005-3191-3.patch
+
+	#bug 122365
+	EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/${P}-flex-unput.patch
+
+	# bug 118264
+	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch ${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
+}
+
+src_install() {
+	tetex-2_src_install
+
+	einfo "Installing Czech files..."
+	dodir /usr/share/texmf/tex/enctex
+	cd ${S}
+	cp -v texk/web2c/enctex/*.tex ${D}/usr/share/texmf/tex/enctex
+}
+
+pkg_postrm() {
+	if [ ! -f ${ROOT}/usr/bin/tex ] ; then
+		for i in cslatex csplain pdfcslatex pdfcsplain; do
+			rm ${ROOT}/usr/bin/$i
+		done
+	fi
+}
diff --git a/app-text/cstetex/files/cstetex-2.0.2-dvi-draw-conflicting-types.patch b/app-text/cstetex/files/cstetex-2.0.2-dvi-draw-conflicting-types.patch
new file mode 100644
index 000000000000..c38a8e01bc71
--- /dev/null
+++ b/app-text/cstetex/files/cstetex-2.0.2-dvi-draw-conflicting-types.patch
@@ -0,0 +1,11 @@
+--- tetex-src-2.0.2.old/texk/xdvik/dvi-draw.c      2003-01-25 05:16:33.000000000 -0500
++++ tetex-src-2.0.2/texk/xdvik/dvi-draw.c  2006-01-08 04:52:44.000000000 -0500
+@@ -518,7 +518,7 @@
+
+ #endif /* T1LIB */
+
+-extern void home();  /* from events.c */
++extern void home(wide_bool scrl);  /* from events.c */
+ extern int fallbacktfm; /* from tfmload.c */
+
+ static struct frame frame0;    /* dummy head of list */
diff --git a/app-text/cstetex/files/cstetex-2.0.2-flex-unput.patch b/app-text/cstetex/files/cstetex-2.0.2-flex-unput.patch
new file mode 100644
index 000000000000..57a037e09ba6
--- /dev/null
+++ b/app-text/cstetex/files/cstetex-2.0.2-flex-unput.patch
@@ -0,0 +1,12 @@
+diff -uNr tetex-src-2.0.2.old/texk/web2c/omegafonts/Makefile.in tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in
+--- tetex-src-2.0.2.old/texk/web2c/omegafonts/Makefile.in	2001-11-10 14:42:37.000000000 +0100
++++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2006-02-13 12:38:48.000000000 +0100
+@@ -40,7 +40,7 @@
+ 	-test -f y.tab.h && mv -f y.tab.h y_tab.h
+ $(LEX_OUTPUT_ROOT).o: parser.h
+ $(LEX_OUTPUT_ROOT).c: pl.l
+-	$(LEX) $(srcdir)/pl.l
++	cp $(srcdir)/lex.yy.c-dist $(srcdir)/lex.yy.c
+ 
+ 
+ 
diff --git a/app-text/cstetex/files/digest-cstetex-2.0.2-r1 b/app-text/cstetex/files/digest-cstetex-2.0.2-r1
index 32addaf82ffc..65fcb8e6a93f 100644
--- a/app-text/cstetex/files/digest-cstetex-2.0.2-r1
+++ b/app-text/cstetex/files/digest-cstetex-2.0.2-r1
@@ -1,10 +1,30 @@
-MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
-MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
-MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
-MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
-MD5 af601a147d5402023c35d0c4745066a8 enctex.tar.gz 379258
+MD5 13004322faea34c3580232fe438e56f5 csfonts-t1.tar.gz 1726183
+RMD160 b4d8ecfef3e31f920b956a95c6c1144eee84b879 csfonts-t1.tar.gz 1726183
+SHA256 9d2fe8efa5e892f5015ff6ac02c8a4ba2192daa562be2d0bc3ef4ea62ffd3b12 csfonts-t1.tar.gz 1726183
 MD5 ef0758d7e263150a39a7ff6376a95df8 csfonts.tar.gz 187106
-MD5 5f0c05f9f0acf2ad2fea79f49335cc77 csplain.tar.gz 55776
+RMD160 ca9c47f14219330e61afa60223d97da08841eacf csfonts.tar.gz 187106
+SHA256 77183e92ab5661d8d82c1a5e1bd4e4c1ce5ff878cd33f670b74877ee64083c41 csfonts.tar.gz 187106
 MD5 64947e5b71c100f3d018da9b11d8cee3 cslatex.tar.gz 18310
+RMD160 371ac9f8ca5740258f660ec96a4cfb0e8713d6cb cslatex.tar.gz 18310
+SHA256 c0ea53ea630a72adaba4ee29cb55558f39f0ef7435de769d4ec4d823ff703330 cslatex.tar.gz 18310
+MD5 5f0c05f9f0acf2ad2fea79f49335cc77 csplain.tar.gz 55776
+RMD160 78059af19a738539a968c16ee8ee8de3fd712007 csplain.tar.gz 55776
+SHA256 4fcd5cc67808a8b1b5ae1503cb2a86166f7d44336360f8b9eaba88576d17c884 csplain.tar.gz 55776
 MD5 fbcacfb1e8ff234be8fc7fffef0514d6 cspsfonts.tar.gz 122248
-MD5 13004322faea34c3580232fe438e56f5 csfonts-t1.tar.gz 1726183
+RMD160 c55aa702be5c5e5871b2248e1fc1c8747a21e843 cspsfonts.tar.gz 122248
+SHA256 725d99f1c42ad7a2480d3d6e8be1ffe41afff53b567addacc8f45382635533ed cspsfonts.tar.gz 122248
+MD5 af601a147d5402023c35d0c4745066a8 enctex.tar.gz 379258
+RMD160 aa9389b8660f7ba04314e578ba01937c1beb6edf enctex.tar.gz 379258
+SHA256 e1d042f9928612653785faa41846b969fa5684ba4b48d712e38de0026b8ff807 enctex.tar.gz 379258
+MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
+RMD160 f32700bfe389c9c15a72344770c7abe2ee048c38 tetex-2.0.2-gentoo.tar.gz 1704
+SHA256 331ac072cf658c22b983b16439dc0e6f95cac0cc95f4d993fcb4bad883ea2622 tetex-2.0.2-gentoo.tar.gz 1704
+MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+RMD160 9bbb274c0598547bcecb00ff48e459d41bc65e93 tetex-src-2.0.2.tar.gz 11745933
+SHA256 9f8a35b3abd293d71fa6785a4c3e6aa4fdaeff03ae71863ad5ec9e1a9fc087f5 tetex-src-2.0.2.tar.gz 11745933
+MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
+RMD160 ff88622c2d97416a4f67fbdf7a00d837af35d94e tetex-texmf-2.0.2.tar.gz 52424280
+SHA256 0d5c4adb7a72a33fffa9eeb5e3137e0094c912eafc45e358ca20cd9257f79f0d tetex-texmf-2.0.2.tar.gz 52424280
+MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
+RMD160 bc444152b2f45cf3c0a743f6416134e31e8635b4 tetex-texmfsrc-2.0.2.tar.gz 22909537
+SHA256 9348f10c9e95fdb5e9a9702956cfce38be42c48621fcfc6c9ae192363e08d267 tetex-texmfsrc-2.0.2.tar.gz 22909537
diff --git a/app-text/cstetex/files/digest-cstetex-2.0.2-r2 b/app-text/cstetex/files/digest-cstetex-2.0.2-r2
new file mode 100644
index 000000000000..65fcb8e6a93f
--- /dev/null
+++ b/app-text/cstetex/files/digest-cstetex-2.0.2-r2
@@ -0,0 +1,30 @@
+MD5 13004322faea34c3580232fe438e56f5 csfonts-t1.tar.gz 1726183
+RMD160 b4d8ecfef3e31f920b956a95c6c1144eee84b879 csfonts-t1.tar.gz 1726183
+SHA256 9d2fe8efa5e892f5015ff6ac02c8a4ba2192daa562be2d0bc3ef4ea62ffd3b12 csfonts-t1.tar.gz 1726183
+MD5 ef0758d7e263150a39a7ff6376a95df8 csfonts.tar.gz 187106
+RMD160 ca9c47f14219330e61afa60223d97da08841eacf csfonts.tar.gz 187106
+SHA256 77183e92ab5661d8d82c1a5e1bd4e4c1ce5ff878cd33f670b74877ee64083c41 csfonts.tar.gz 187106
+MD5 64947e5b71c100f3d018da9b11d8cee3 cslatex.tar.gz 18310
+RMD160 371ac9f8ca5740258f660ec96a4cfb0e8713d6cb cslatex.tar.gz 18310
+SHA256 c0ea53ea630a72adaba4ee29cb55558f39f0ef7435de769d4ec4d823ff703330 cslatex.tar.gz 18310
+MD5 5f0c05f9f0acf2ad2fea79f49335cc77 csplain.tar.gz 55776
+RMD160 78059af19a738539a968c16ee8ee8de3fd712007 csplain.tar.gz 55776
+SHA256 4fcd5cc67808a8b1b5ae1503cb2a86166f7d44336360f8b9eaba88576d17c884 csplain.tar.gz 55776
+MD5 fbcacfb1e8ff234be8fc7fffef0514d6 cspsfonts.tar.gz 122248
+RMD160 c55aa702be5c5e5871b2248e1fc1c8747a21e843 cspsfonts.tar.gz 122248
+SHA256 725d99f1c42ad7a2480d3d6e8be1ffe41afff53b567addacc8f45382635533ed cspsfonts.tar.gz 122248
+MD5 af601a147d5402023c35d0c4745066a8 enctex.tar.gz 379258
+RMD160 aa9389b8660f7ba04314e578ba01937c1beb6edf enctex.tar.gz 379258
+SHA256 e1d042f9928612653785faa41846b969fa5684ba4b48d712e38de0026b8ff807 enctex.tar.gz 379258
+MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
+RMD160 f32700bfe389c9c15a72344770c7abe2ee048c38 tetex-2.0.2-gentoo.tar.gz 1704
+SHA256 331ac072cf658c22b983b16439dc0e6f95cac0cc95f4d993fcb4bad883ea2622 tetex-2.0.2-gentoo.tar.gz 1704
+MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+RMD160 9bbb274c0598547bcecb00ff48e459d41bc65e93 tetex-src-2.0.2.tar.gz 11745933
+SHA256 9f8a35b3abd293d71fa6785a4c3e6aa4fdaeff03ae71863ad5ec9e1a9fc087f5 tetex-src-2.0.2.tar.gz 11745933
+MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
+RMD160 ff88622c2d97416a4f67fbdf7a00d837af35d94e tetex-texmf-2.0.2.tar.gz 52424280
+SHA256 0d5c4adb7a72a33fffa9eeb5e3137e0094c912eafc45e358ca20cd9257f79f0d tetex-texmf-2.0.2.tar.gz 52424280
+MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
+RMD160 bc444152b2f45cf3c0a743f6416134e31e8635b4 tetex-texmfsrc-2.0.2.tar.gz 22909537
+SHA256 9348f10c9e95fdb5e9a9702956cfce38be42c48621fcfc6c9ae192363e08d267 tetex-texmfsrc-2.0.2.tar.gz 22909537
diff --git a/app-text/cstetex/files/xpdf-2.02pl1-CAN-2005-3191-3.patch b/app-text/cstetex/files/xpdf-2.02pl1-CAN-2005-3191-3.patch
new file mode 100644
index 000000000000..6e2531318df7
--- /dev/null
+++ b/app-text/cstetex/files/xpdf-2.02pl1-CAN-2005-3191-3.patch
@@ -0,0 +1,252 @@
+Index: xpdf-2.02pl1/xpdf/Stream.h
+===================================================================
+--- xpdf-2.02pl1.orig/xpdf/Stream.h
++++ xpdf-2.02pl1/xpdf/Stream.h
+@@ -225,6 +225,8 @@ public:
+ 
+   ~StreamPredictor();
+ 
++  GBool isOk() { return ok; }
++
+   int lookChar();
+   int getChar();
+ 
+@@ -242,6 +244,7 @@ private:
+   int rowBytes;			// bytes per line
+   Guchar *predLine;		// line buffer
+   int predIdx;			// current index in predLine
++  GBool ok;
+ };
+ 
+ //------------------------------------------------------------------------
+Index: xpdf-2.02pl1/xpdf/Stream.cc
+===================================================================
+--- xpdf-2.02pl1.orig/xpdf/Stream.cc
++++ xpdf-2.02pl1/xpdf/Stream.cc
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+@@ -409,13 +410,28 @@ StreamPredictor::StreamPredictor(Stream 
+   width = widthA;
+   nComps = nCompsA;
+   nBits = nBitsA;
++  predLine = NULL;
++  ok = gFalse;
+ 
++  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++      nComps >= INT_MAX/nBits ||
++      width >= INT_MAX/nComps/nBits) {
++    return;
++  }
+   nVals = width * nComps;
++  if (nVals * nBits + 7 <= 0) {
++    return;
++  }
+   pixBytes = (nComps * nBits + 7) >> 3;
+   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++  if (rowBytes < 0) {
++    return;
++  }
+   predLine = (Guchar *)gmalloc(rowBytes);
+   memset(predLine, 0, rowBytes);
+   predIdx = rowBytes;
++
++  ok = gTrue;
+ }
+ 
+ StreamPredictor::~StreamPredictor() {
+@@ -981,6 +997,10 @@ LZWStream::LZWStream(Stream *strA, int p
+     FilterStream(strA) {
+   if (predictor != 1) {
+     pred = new StreamPredictor(this, predictor, columns, colors, bits);
++    if (!pred->isOk()) {
++      delete pred;
++      pred = NULL;
++    }
+   } else {
+     pred = NULL;
+   }
+@@ -1226,6 +1246,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
+   endOfLine = endOfLineA;
+   byteAlign = byteAlignA;
+   columns = columnsA;
++  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
++    error(-1, "invalid number of columns");
++    exit(1);
++  }
+   rows = rowsA;
+   endOfBlock = endOfBlockA;
+   black = blackA;
+@@ -2864,6 +2888,11 @@ GBool DCTStream::readBaselineSOF() {
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
++  if (numComps <= 0 || numComps > 4) {
++    numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream");
++    return gFalse;
++  }
+   if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+@@ -2890,6 +2919,11 @@ GBool DCTStream::readProgressiveSOF() {
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
++  if (numComps <= 0 || numComps > 4) {
++    numComps = 0;
++    error(getPos(), "Bad number of components in DCT stream");
++    return gFalse;
++  }
+   if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+@@ -2912,6 +2946,10 @@ GBool DCTStream::readScanInfo() {
+ 
+   length = read16() - 2;
+   scanInfo.numComps = str->getChar();
++  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++    error(getPos(), "Bad number of components in DCT stream");
++    return gFalse;
++  }
+   --length;
+   if (length != 2 * scanInfo.numComps + 3) {
+     error(getPos(), "Bad DCT scan info block");
+@@ -2979,12 +3017,12 @@ GBool DCTStream::readHuffmanTables() {
+   while (length > 0) {
+     index = str->getChar();
+     --length;
+-    if ((index & 0x0f) >= 4) {
++    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
+       error(getPos(), "Bad DCT Huffman table");
+       return gFalse;
+     }
+     if (index & 0x10) {
+-      index &= 0x0f;
++      index &= 0x03;
+       if (index >= numACHuffTables)
+ 	numACHuffTables = index+1;
+       tbl = &acHuffTables[index];
+@@ -3072,9 +3110,11 @@ int DCTStream::readMarker() {
+   do {
+     do {
+       c = str->getChar();
++      if(c == EOF) return EOF;
+     } while (c != 0xff);
+     do {
+       c = str->getChar();
++      if(c == EOF) return EOF;
+     } while (c == 0xff);
+   } while (c == 0x00);
+   return c;
+@@ -3182,6 +3222,10 @@ FlateStream::FlateStream(Stream *strA, i
+     FilterStream(strA) {
+   if (predictor != 1) {
+     pred = new StreamPredictor(this, predictor, columns, colors, bits);
++    if (!pred->isOk()) {
++      delete pred;
++      pred = NULL;
++    }
+   } else {
+     pred = NULL;
+   }
+Index: xpdf-2.02pl1/xpdf/JBIG2Stream.cc
+===================================================================
+--- xpdf-2.02pl1.orig/xpdf/JBIG2Stream.cc
++++ xpdf-2.02pl1/xpdf/JBIG2Stream.cc
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -1001,7 +1002,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
+   w = wA;
+   h = hA;
+   line = (wA + 7) >> 3;
+-  data = (Guchar *)gmalloc(h * line);
++
++  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++    error(-1, "invalid width/height");
++    data = NULL;
++    return;
++  }
++
++  // need to allocate one extra guard byte for use in combine()
++  data = (Guchar *)gmalloc(h * line + 1);
++  data[h * line] = 0;
+ }
+ 
+ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
+@@ -1010,8 +1020,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
+   w = bitmap->w;
+   h = bitmap->h;
+   line = bitmap->line;
+-  data = (Guchar *)gmalloc(h * line);
++
++  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
++    error(-1, "invalid width/height");
++    data = NULL;
++    return;
++  }
++
++  // need to allocate one extra guard byte for use in combine()
++  data = (Guchar *)gmalloc(h * line + 1);
+   memcpy(data, bitmap->data, h * line);
++  data[h * line] = 0;
+ }
+ 
+ JBIG2Bitmap::~JBIG2Bitmap() {
+@@ -1036,10 +1055,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
+ }
+ 
+ void JBIG2Bitmap::expand(int newH, Guint pixel) {
+-  if (newH <= h) {
++  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1)/ line) {
++    error(-1, "invalid width/height");
++    gfree(data);
++    data = NULL;
+     return;
+   }
+-  data = (Guchar *)grealloc(data, newH * line);
++  // need to allocate one extra guard byte for use in combine()
++  data = (Guchar *)grealloc(data, newH * line + 1);
+   if (pixel) {
+     memset(data + h * line, 0xff, (newH - h) * line);
+   } else {
+@@ -2576,6 +2599,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
+     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
+     return;
+   }
++  if (gridH == 0 || gridW >= INT_MAX / gridH) {
++    error(getPos(), "Bad size in JBIG2 halftone segment");
++    return;
++  }
++  if (w == 0 || h >= INT_MAX / w) {
++     error(getPos(), "Bad size in JBIG2 bitmap segment");
++    return;
++  }
++
+   patternDict = (JBIG2PatternDict *)seg;
+   bpp = 0;
+   i = 1;
+@@ -3205,6 +3237,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
+   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
+   int x, y, pix;
+ 
++  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
++    error(-1, "invalid width/height");
++    return NULL;
++  }
++
+   bitmap = new JBIG2Bitmap(0, w, h);
+   bitmap->clearToZero();
+ 
+# vim: syntax=diff