Multiple fixes, close bugs #98029 and #115775.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 238 insertions, 2 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index a703f58de96f..f1551d4a6ccf 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.98 2006/01/21 11:47:35 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.99 2006/01/22 16:35:23 nattfodd Exp $
+
+*tetex-3.0_p1-r1 (22 Jan 2006)
+
+  22 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/tetex-3.0_p1-fmtutil-etex.patch,
+  +files/tetex-3.0_p1-xpdf-vulnerabilities.patch, +tetex-3.0_p1-r1.ebuild:
+  Fixes fmtutil problems with elatex not being found and texi2dvi/etex
+  complaining about being stymied, closing bug #98029. Thanks to Tupone
+  Alfredo for one of the patches. Also security fixes of xpdf code from bug
+  #115775.
 
   21 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
   +files/tetex-2.0.2-dvi-draw-conflicting-types.patch,
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index ec333f680a1e..41ab737e4dd1 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,4 +1,4 @@
-MD5 3d91e872237f4dbc2a8fe6cac90e36ea ChangeLog 17800
+MD5 d14030405a61a00589c718c3ac93c497 ChangeLog 18234
 MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
 MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r5 282
 MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r6 282
@@ -6,13 +6,16 @@ MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r7 282
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r3 202
 MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r4 202
 MD5 ca5c96c960d2e8845588f273359e3dc9 files/digest-tetex-3.0_p1 207
+MD5 ca5c96c960d2e8845588f273359e3dc9 files/digest-tetex-3.0_p1-r1 207
 MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
 MD5 912aea791088e715e491a7ccaa7eb25f files/tetex-2.0.2-dvi-draw-conflicting-types.patch 410
 MD5 ce3900d8a86ef6eb7c20dc2d445f16ff files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
 MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 MD5 0e727f58dac2997f22e90f51b2d79da3 files/tetex-3.0-kpathsea-pic.patch 1590
 MD5 c7d5fd4cce846a7f7e5845ede7b839c9 files/tetex-3.0_p1-amd64-xdvik-wp.patch 847
+MD5 c64f8d574550522ea5d8e3b41f886eb2 files/tetex-3.0_p1-fmtutil-etex.patch 809
 MD5 87ed2925ecec1c2a53cbfb5f5f32160d files/tetex-3.0_p1-mptest.patch 367
+MD5 e70ba402012ed53ab6c0f0d5df28f3df files/tetex-3.0_p1-xpdf-vulnerabilities.patch 4069
 MD5 1c3401dbbc9d478e94c98e44b9b68e38 files/tetex-no-readlink-manpage.diff 542
 MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
 MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
@@ -28,4 +31,5 @@ MD5 6e15190448b2788a3fd3f57afdcd2120 tetex-2.0.2-r6.ebuild 1282
 MD5 2d83c92048930d3bf7a72999100f1a21 tetex-2.0.2-r7.ebuild 1378
 MD5 6d84991ef4fd00210a9eb68fdb393bd8 tetex-3.0-r3.ebuild 1272
 MD5 1fe71bbc946829906e955a0380bbbcef tetex-3.0-r4.ebuild 1345
+MD5 5a2a4686b5586b98469959979d34ca76 tetex-3.0_p1-r1.ebuild 1886
 MD5 d140b2a9bcdb3c2b0776b12488a19065 tetex-3.0_p1.ebuild 1528
diff --git a/app-text/tetex/files/digest-tetex-3.0_p1-r1 b/app-text/tetex/files/digest-tetex-3.0_p1-r1
new file mode 100644
index 000000000000..d4a9cab73343
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-3.0_p1-r1
@@ -0,0 +1,3 @@
+MD5 24568263880f911452936573211fa4e8 tetex-3.0_p1-gentoo.tar.gz 604
+MD5 0f82ade673335256226d0321e6c5e2cf tetex-src-3.0_p1.tar.gz 13357541
+MD5 11aa15c8d3e28ee7815e0d5fcdf43fd4 tetex-texmf-3.0.tar.gz 91762123
diff --git a/app-text/tetex/files/tetex-3.0_p1-fmtutil-etex.patch b/app-text/tetex/files/tetex-3.0_p1-fmtutil-etex.patch
new file mode 100644
index 000000000000..4f6d394cb3be
--- /dev/null
+++ b/app-text/tetex/files/tetex-3.0_p1-fmtutil-etex.patch
@@ -0,0 +1,12 @@
+--- tetex-src-3.0/texk/web2c/fmtutil.in.old	2006-01-14 15:28:25.000000000 +0100
++++ tetex-src-3.0/texk/web2c/fmtutil.in	2006-01-14 15:29:09.000000000 +0100
+@@ -40,7 +40,8 @@
+ # if you want babel support in tex:
+ tex		tex		language.dat		-translate-file=cp227.tcx tex.ini
+ @PETEX@latex		pdfetex		language.dat	-etex -translate-file=cp227.tcx latex.ini
+-@PETEX@etex		pdfetex		language.def	-etex -translate-file=cp227.tcx etex.ini
++@PETEX@etex		etex		language.def	-etex -translate-file=cp227.tcx etex.ini
++@PETEX@elatex		etex		language.def	-translate-file=cp227.tcx *latex.ini
+ @PETEX@pdftex		pdfetex		-	-etex -translate-file=cp227.tcx pdftex.ini
+ @PETEX@pdflatex	pdfetex		language.dat	-etex -translate-file=cp227.tcx pdflatex.ini
+ @PETEX@pdfetex		pdfetex		language.def	-etex -translate-file=cp227.tcx pdfetex.ini
diff --git a/app-text/tetex/files/tetex-3.0_p1-xpdf-vulnerabilities.patch b/app-text/tetex/files/tetex-3.0_p1-xpdf-vulnerabilities.patch
new file mode 100644
index 000000000000..199cd1af3d4e
--- /dev/null
+++ b/app-text/tetex/files/tetex-3.0_p1-xpdf-vulnerabilities.patch
@@ -0,0 +1,140 @@
+--- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.old	2006-01-22 16:55:56.000000000 +0100
++++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc	2006-01-22 16:56:09.000000000 +0100
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+--- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.old	2006-01-22 16:57:41.000000000 +0100
++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc	2006-01-22 17:08:11.000000000 +0100
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -1275,8 +1276,9 @@
+   endOfLine = endOfLineA;
+   byteAlign = byteAlignA;
+   columns = columnsA;
+-  if (columns < 1) {
+-    columns = 1;
++  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
++    error (-1, "invalid number of columns: %d\n", columns);
++    exit (1);
+   }
+   rows = rowsA;
+   endOfBlock = endOfBlockA;
+@@ -2952,6 +2954,10 @@
+   height = read16();
+   width = read16();
+   numComps = str->getChar();
++  if (numComps <= 0 || numComps > 4) {
++    error(getPos(), "Bad number of components in DCT stream", prec);
++    return gFalse;
++  }
+   if (prec != 8) {
+     error(getPos(), "Bad DCT precision %d", prec);
+     return gFalse;
+@@ -2974,6 +2979,11 @@
+ 
+   length = read16() - 2;
+   scanInfo.numComps = str->getChar();
++  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++    scanInfo.numComps = 0;
++    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");
+@@ -3058,12 +3068,12 @@
+   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];
+@@ -3181,9 +3191,11 @@
+   do {
+     do {
+       c = str->getChar();
++      if (c == EOF) return EOF;
+     } while (c != 0xff && c != EOF);
+     do {
+       c = str->getChar();
++      if (c == EOF) return EOF;
+     } while (c == 0xff);
+   } while (c == 0x00);
+   return c;
+--- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.old	2006-01-22 17:08:49.000000000 +0100
++++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc	2006-01-22 17:15:41.000000000 +0100
+@@ -7,6 +7,7 @@
+ //========================================================================
+ 
+ #include <aconf.h>
++#include <limits.h>
+ 
+ #ifdef USE_GCC_PRAGMAS
+ #pragma implementation
+@@ -681,6 +682,11 @@
+   w = wA;
+   h = hA;
+   line = (wA + 7) >> 3;
++  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;
+@@ -692,6 +698,11 @@
+   w = bitmap->w;
+   h = bitmap->h;
+   line = bitmap->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);
+@@ -720,7 +731,10 @@
+ }
+ 
+ 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;
+   }
+   // need to allocate one extra guard byte for use in combine()
+@@ -2936,6 +2950,11 @@
+   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();
+ 
diff --git a/app-text/tetex/tetex-3.0_p1-r1.ebuild b/app-text/tetex/tetex-3.0_p1-r1.ebuild
new file mode 100644
index 000000000000..b1197fd5a2ff
--- /dev/null
+++ b/app-text/tetex/tetex-3.0_p1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0_p1-r1.ebuild,v 1.1 2006/01/22 16:35:23 nattfodd Exp $
+
+inherit tetex-3 flag-o-matic versionator
+
+SMALL_PV=$(get_version_component_range 1-2 ${PV})
+TETEX_TEXMF_PV=${SMALL_PV}
+S=${WORKDIR}/tetex-src-${SMALL_PV}
+
+TETEX_SRC="tetex-src-${PV}.tar.gz"
+TETEX_TEXMF="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}.tar.gz"
+#TETEX_TEXMF_SRC="tetex-texmfsrc-${TETEX_TEXMF_PV:-${TETEX_PV}}.tar.gz"
+TETEX_TEXMF_SRC=""
+
+DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
+
+SRC_PATH_TETEX=ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib
+SRC_URI="http://dev.gentoo.org/~nattfodd/tetex/${TETEX_SRC}
+	${SRC_PATH_TETEX}/${TETEX_TEXMF}
+	http://dev.gentoo.org/~nattfodd/tetex/${P}-gentoo.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+
+# these are defined in tetex.eclass and tetex-3.eclass
+IUSE=""
+DEPEND=""
+
+src_unpack() {
+	tetex-3_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${SMALL_PV}-kpathsea-pic.patch
+
+	# bug 85404
+	epatch ${FILESDIR}/${PN}-${SMALL_PV}-epstopdf-wrong-rotation.patch
+
+	epatch ${FILESDIR}/${P}-amd64-xdvik-wp.patch
+	epatch ${FILESDIR}/${P}-mptest.patch
+
+	#bug 98029
+	epatch ${FILESDIR}/${P}-fmtutil-etex.patch
+
+	#bug 115775
+	epatch ${FILESDIR}/${P}-xpdf-vulnerabilities.patch
+}
+
+src_test() {
+	fmtutil --fmtdir "${S}/texk/web2c" --all
+	make check
+}
+
+src_install() {
+	tetex-3_src_install
+
+	# virtex was removed from tetex-3
+	dosym /usr/bin/tex /usr/bin/virtex
+	dosym /usr/bin/pdftex /usr/bin/pdfvirtex
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "tetex-3.0_p1-r1 makes changes in /etc/texmf/fmtutil/00fmtutil.cnf"
+	einfo "After you update this file, please run as root"
+	einfo "  fmtutil-sys --missing && fmtutil-sys --byfmt etex"
+	einfo ""
+}