summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-12-02 22:35:22 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-12-02 22:35:22 +0000
commit8a4a1f7a473151c57bc1ea43aa7816d38dc24b22 (patch)
treefa1b3fb80a1e9b9c31fd7eb91336347ad98b0baf /app-text/texlive-core
parentpam_mount bump (diff)
downloadhistorical-8a4a1f7a473151c57bc1ea43aa7816d38dc24b22.tar.gz
historical-8a4a1f7a473151c57bc1ea43aa7816d38dc24b22.tar.bz2
historical-8a4a1f7a473151c57bc1ea43aa7816d38dc24b22.zip
make a patchset tarball
Package-Manager: portage-2.1.4_rc4
Diffstat (limited to 'app-text/texlive-core')
-rw-r--r--app-text/texlive-core/ChangeLog13
-rw-r--r--app-text/texlive-core/Manifest62
-rw-r--r--app-text/texlive-core/files/2007/tetex-3.0-CVE-2007-0650.patch80
-rw-r--r--app-text/texlive-core/files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch16
-rw-r--r--app-text/texlive-core/files/2007/texlive-core-2007-bump_makeindex_limitations.patch33
-rw-r--r--app-text/texlive-core/files/2007/texlive-core-2007-dvips_bufferoverflow.patch87
-rw-r--r--app-text/texlive-core/files/2007/texlive-core-2007-icu-xetex-execstacks.patch12
-rw-r--r--app-text/texlive-core/files/2007/texlive-core-2007-libteckit-asneeded.patch13
-rw-r--r--app-text/texlive-core/files/2007/texlive-core-2007-mpware.patch11
-rw-r--r--app-text/texlive-core/files/2007/xpdf-3.02pl2.patch640
-rw-r--r--app-text/texlive-core/files/digest-texlive-core-2007-r86
-rw-r--r--app-text/texlive-core/texlive-core-2007-r8.ebuild36
12 files changed, 38 insertions, 971 deletions
diff --git a/app-text/texlive-core/ChangeLog b/app-text/texlive-core/ChangeLog
index 1230a2c0db35..fd42ab2eb1fe 100644
--- a/app-text/texlive-core/ChangeLog
+++ b/app-text/texlive-core/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for app-text/texlive-core
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.30 2007/11/21 20:45:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/ChangeLog,v 1.31 2007/12/02 22:35:21 aballier Exp $
+
+ 02 Dec 2007; Alexis Ballier <aballier@gentoo.org>
+ -files/2007/tetex-3.0-CVE-2007-0650.patch,
+ -files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch,
+ -files/2007/xpdf-3.02pl2.patch,
+ -files/2007/texlive-core-2007-bump_makeindex_limitations.patch,
+ -files/2007/texlive-core-2007-dvips_bufferoverflow.patch,
+ -files/2007/texlive-core-2007-icu-xetex-execstacks.patch,
+ -files/2007/texlive-core-2007-libteckit-asneeded.patch,
+ -files/2007/texlive-core-2007-mpware.patch, texlive-core-2007-r8.ebuild:
+ make a patchset tarball
21 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+files/2007/texlive-core-2007-bump_makeindex_limitations.patch,
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index c82b57ffb2e2..28eaabd2610b 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,34 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX 2007/tetex-3.0-CVE-2007-0650.patch 2615 RMD160 3e3f55a17e35e3da3a6f77d62939ed66d8ae5222 SHA1 28208eb13f493c1c9c6538f254f04fc0c2aaff1e SHA256 9cb5525070bc4ea0685ac8a2f87df1dbbd2dcee4989e7b22c9897acfe6b67628
-MD5 8c2f3c2c87a5ec82869059df57af27c8 files/2007/tetex-3.0-CVE-2007-0650.patch 2615
-RMD160 3e3f55a17e35e3da3a6f77d62939ed66d8ae5222 files/2007/tetex-3.0-CVE-2007-0650.patch 2615
-SHA256 9cb5525070bc4ea0685ac8a2f87df1dbbd2dcee4989e7b22c9897acfe6b67628 files/2007/tetex-3.0-CVE-2007-0650.patch 2615
-AUX 2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch 516 RMD160 fcfa307061c6052cec241adda6d7541105afa5bf SHA1 4435c9ccda332826c61d4a839fc608b5857d6cd6 SHA256 7cebc7643f54462de5504aeb6c331860beb9aae947bc80132d0ac8f9b0a2f109
-MD5 ab265d1313af1348b7f431ab5accbcbe files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch 516
-RMD160 fcfa307061c6052cec241adda6d7541105afa5bf files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch 516
-SHA256 7cebc7643f54462de5504aeb6c331860beb9aae947bc80132d0ac8f9b0a2f109 files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch 516
-AUX 2007/texlive-core-2007-bump_makeindex_limitations.patch 1080 RMD160 b2b69602f2cb463c5c0cd4e1a02e1803f15502e4 SHA1 f872e03d0e9cd918e6affac6f6c8399220f75014 SHA256 aa18e2dab32923259f6314bfa9ada1e8d470d7d0ac0406ca5326f4ffc3fcb774
-MD5 03139ca2928f57a9b948663f4e292d55 files/2007/texlive-core-2007-bump_makeindex_limitations.patch 1080
-RMD160 b2b69602f2cb463c5c0cd4e1a02e1803f15502e4 files/2007/texlive-core-2007-bump_makeindex_limitations.patch 1080
-SHA256 aa18e2dab32923259f6314bfa9ada1e8d470d7d0ac0406ca5326f4ffc3fcb774 files/2007/texlive-core-2007-bump_makeindex_limitations.patch 1080
-AUX 2007/texlive-core-2007-dvips_bufferoverflow.patch 3032 RMD160 d82c40767b8614180e1487a95c923b99e92161b5 SHA1 1616aff45e9412ad861d75019a2c88a5122e5b23 SHA256 d5942c40589199d19dd4407b9bcdfeb13a2559de59e70ca986c3c16040788f6b
-MD5 65b84b563d53e426b5a78f1302c45863 files/2007/texlive-core-2007-dvips_bufferoverflow.patch 3032
-RMD160 d82c40767b8614180e1487a95c923b99e92161b5 files/2007/texlive-core-2007-dvips_bufferoverflow.patch 3032
-SHA256 d5942c40589199d19dd4407b9bcdfeb13a2559de59e70ca986c3c16040788f6b files/2007/texlive-core-2007-dvips_bufferoverflow.patch 3032
-AUX 2007/texlive-core-2007-icu-xetex-execstacks.patch 550 RMD160 85ed534a2eb2b77fd8bafa1db405c904167712cb SHA1 fc9a44364ddebfb732be4d3d7e39ba3a547dbc2b SHA256 854b108962c6b42e74ae34658b3b18199618b80a86c677ed01a56fc43e6b6de4
-MD5 a3cb6ff84b0bd80e82d7224ea5b39740 files/2007/texlive-core-2007-icu-xetex-execstacks.patch 550
-RMD160 85ed534a2eb2b77fd8bafa1db405c904167712cb files/2007/texlive-core-2007-icu-xetex-execstacks.patch 550
-SHA256 854b108962c6b42e74ae34658b3b18199618b80a86c677ed01a56fc43e6b6de4 files/2007/texlive-core-2007-icu-xetex-execstacks.patch 550
-AUX 2007/texlive-core-2007-libteckit-asneeded.patch 401 RMD160 563696cfa46efcc6c663f80bf7947e05968bf42d SHA1 7dc1a736441c25199edc9be66ac97d0c8d12432d SHA256 10f303f5fe66d8633d9b952d601a367519b5d46c10c06cc81cdfee0880c4846d
-MD5 356e1244191cd7c7f9aa07dcdbf9c1a2 files/2007/texlive-core-2007-libteckit-asneeded.patch 401
-RMD160 563696cfa46efcc6c663f80bf7947e05968bf42d files/2007/texlive-core-2007-libteckit-asneeded.patch 401
-SHA256 10f303f5fe66d8633d9b952d601a367519b5d46c10c06cc81cdfee0880c4846d files/2007/texlive-core-2007-libteckit-asneeded.patch 401
-AUX 2007/texlive-core-2007-mpware.patch 440 RMD160 4e8a2ef4da656481e03cf6372f7e108c9932a223 SHA1 9b9e1dc5fd4e20d6ed8cd502c35a38e5aeeb02f9 SHA256 2478177a99e811c664872ea92626f0ef15253a2cb12a983388cae7aa6b14e628
-MD5 b0d7fd810b8d6b069a8c5b578c6388aa files/2007/texlive-core-2007-mpware.patch 440
-RMD160 4e8a2ef4da656481e03cf6372f7e108c9932a223 files/2007/texlive-core-2007-mpware.patch 440
-SHA256 2478177a99e811c664872ea92626f0ef15253a2cb12a983388cae7aa6b14e628 files/2007/texlive-core-2007-mpware.patch 440
AUX 2007/texmf.d/00header.cnf 2276 RMD160 b6aae097a17689928ddf3fc61d6457174bbc5016 SHA1 92df2523474081e85250e7e19c0a7a8229310303 SHA256 9138b320884f84239575a6033421f45ffdb1f748c9f7e67646509b2a6d4e6aa7
MD5 a1a20fa3b8f3764694cf9f99ff34b3b2 files/2007/texmf.d/00header.cnf 2276
RMD160 b6aae097a17689928ddf3fc61d6457174bbc5016 files/2007/texmf.d/00header.cnf 2276
@@ -53,17 +25,13 @@ AUX 2007/texmf.d/25misc.cnf 3189 RMD160 934dab4267d66e5652eb4a5bf2f243affe6c751c
MD5 f9b20a8646e199fa04410c2dc82cb171 files/2007/texmf.d/25misc.cnf 3189
RMD160 934dab4267d66e5652eb4a5bf2f243affe6c751c files/2007/texmf.d/25misc.cnf 3189
SHA256 9c70635fbb40c8a70d0f7c1531630e788d6b7da38bed1ee8396278849de953dc files/2007/texmf.d/25misc.cnf 3189
-AUX 2007/xpdf-3.02pl2.patch 16908 RMD160 bc1fd86527442f44ec5cfec754f2053b700a3dbf SHA1 620ec9fe4a4d63766b35bbeaa3261fd772e54a15 SHA256 a7e993257d8ad3b03f9d509973db141823496873c192ed4335ce66f744c468a6
-MD5 1f55d4489c7a8fa21b3e59e152b1514d files/2007/xpdf-3.02pl2.patch 16908
-RMD160 bc1fd86527442f44ec5cfec754f2053b700a3dbf files/2007/xpdf-3.02pl2.patch 16908
-SHA256 a7e993257d8ad3b03f9d509973db141823496873c192ed4335ce66f744c468a6 files/2007/xpdf-3.02pl2.patch 16908
AUX texmf-update 2560 RMD160 5dfbf7738496e08305cc51375c1496ab74533a5b SHA1 8b4bda431b2696e3f5af0e781bb2bfc73641b739 SHA256 210f04e374c938e7fb3f08b8b70701f4911c21eca1ef0cd852b796a5cfaf2263
MD5 aa4758afe15fd2366bc20795891db7a8 files/texmf-update 2560
RMD160 5dfbf7738496e08305cc51375c1496ab74533a5b files/texmf-update 2560
SHA256 210f04e374c938e7fb3f08b8b70701f4911c21eca1ef0cd852b796a5cfaf2263 files/texmf-update 2560
-DIST texlive-core-2007-dviljk-security-fixes.patch.bz2 10647 RMD160 6581361038be07139a79d2fa301d47b6e6bfd560 SHA1 43c2506affd57a5064b0510633b4e1ed31a4fda0 SHA256 70fe7b2f87c7850fb2eef95cebcc8b03541d8907ce216b207f5d0f45cc4d7d1f
DIST texlive-core-2007-updated-config.ps.bz2 2981 RMD160 af88bbda9227e718ebf69d007f424c8b985a0404 SHA1 56bbeba1c9566437ffbe138089bc5965d79dc312 SHA256 ff12f1f6a68e45ad8d8f960f5fe76aae159d64074507a4a650973e1e865c8acd
DIST texlive-core-2007.tar.bz2 31078286 RMD160 496cb3fa3c5cd9b2ea5da3b0bced67a2b5afe7b9 SHA1 37286f7b962c18ec5234071a8d2dde1499d9ab71 SHA256 96c12147ea9717539553eb6b3be52c2df6163ca617dccc71282ccd39c2e5773b
+DIST texlive-core-patches-1.tar.bz2 17159 RMD160 38f401727619714fbbf310d822702ce9f0c4afed SHA1 f0b460da068af4bebfa5bbb6150db13b4d61bb77 SHA256 65e37bfa985f5faa3b8ef86fea29e6e1326bff53c795dd6d423df9ad6a790f4a
DIST texlive-module-bin-afm2pl-2007.zip 25453 RMD160 af1597b5ed9ed7bc9766139e3434f5e42b483087 SHA1 6600bf9d592b1e532835890f29b22465b0da3532 SHA256 9efc5a4306a43bf36d9c84ef05d213fcf1d62354b8403eddaf3e4e699a297d31
DIST texlive-module-bin-aleph-2007.zip 14933 RMD160 93945ed4fa3f8db6240b42d5fbf130afa463d9df SHA1 3b05a52046676130524d70256bd65ecc560e50b3 SHA256 a52f4af1dea68e8a1f7da81cb5b49495b3ea04b39bf5fac028ec9c9aca7279ea
DIST texlive-module-bin-bibtex-2007.zip 3196 RMD160 f2afb884be1cc67913ee05e727c35360deadceca SHA1 6ce5ea26b564ec0e6393809c65b63fa050473f1d SHA256 29f486de15d1e18cfcb3d3a6e57c7b295acf157ee2ffe4335938c05a6bbc0c54
@@ -113,25 +81,25 @@ DIST texlive-module-lib-regex-2007.zip 873 RMD160 1525034c3434b534a238b90730fe56
DIST texlive-module-lib-zlib-2007.zip 1221 RMD160 c2dc6572cd09ef2494a8b299334b902df6567f4c SHA1 2c2a4814b2eaba74da4ae35521b521f83f688ab8 SHA256 9f9ab01c861946667c218e0e2ebea7bbb74a65e94ce9cb699b99cfd51fbcfd5a
DIST texlive-module-mft-2007.zip 9083 RMD160 a07d22432636f38a7639a5385ed3e96626041e45 SHA1 fc5585b86daf583779dacc9e25d0e615ba6519e4 SHA256 6d4a52492a03b41fdfc50532a9061ad94723c67ec5ded1d0ea549ee4978511a4
DIST texlive-module-mkind-english-2007.zip 2264 RMD160 c2d9e9164ed10f55bda56247e94d9bf63adf93e6 SHA1 6660cefd619df95f80f63146f0501cc8dc02e344 SHA256 333fb0b1b4b12764fb16a93ced43721a781202cf0fcb71c5eed4a4903dca5d5c
-EBUILD texlive-core-2007-r8.ebuild 8213 RMD160 912f608344a988c3a962118e55913b7789c94586 SHA1 1c6041e488e42ad64c1c303f2553e2dbd618dd70 SHA256 adb2536b8e7eb43a2d96ce2810bb648eacc2f0bf0bd104801ab473e536f9c654
-MD5 c5b46e4bd5b096484a4537d0ab7c7069 texlive-core-2007-r8.ebuild 8213
-RMD160 912f608344a988c3a962118e55913b7789c94586 texlive-core-2007-r8.ebuild 8213
-SHA256 adb2536b8e7eb43a2d96ce2810bb648eacc2f0bf0bd104801ab473e536f9c654 texlive-core-2007-r8.ebuild 8213
-MISC ChangeLog 6122 RMD160 251050380ca4b6f59ab992d126583b6767f0f6b1 SHA1 b2a73adf581817fbcc0dcf13d129ed590ce37378 SHA256 1247854c9f6d6146d45235571b913550178393f1ce8b51e004d01bcb1a05f0cc
-MD5 3c209a652473b411c3acb63b5848fe17 ChangeLog 6122
-RMD160 251050380ca4b6f59ab992d126583b6767f0f6b1 ChangeLog 6122
-SHA256 1247854c9f6d6146d45235571b913550178393f1ce8b51e004d01bcb1a05f0cc ChangeLog 6122
+EBUILD texlive-core-2007-r8.ebuild 7381 RMD160 f6ebaff9cad33c04e9ef256ed963105aaded35db SHA1 b5f005184a668e9a8be14f46c1fd9d512dab80bb SHA256 2947cbe39b665796b17d92939b835a3cb24a2df6fe1cd28777c7e1c048d38f37
+MD5 cdc7724e2658550d5b35af25ce58f8c4 texlive-core-2007-r8.ebuild 7381
+RMD160 f6ebaff9cad33c04e9ef256ed963105aaded35db texlive-core-2007-r8.ebuild 7381
+SHA256 2947cbe39b665796b17d92939b835a3cb24a2df6fe1cd28777c7e1c048d38f37 texlive-core-2007-r8.ebuild 7381
+MISC ChangeLog 6652 RMD160 546dd2f62f9c90b7dca4ab3ce92e6e51b606bf81 SHA1 e662514e1b22daf98df1ee13c38f8c26f959c78a SHA256 eb9e363d38f8e0bdf72d61caeeb7bc15ba0dcb99c3d5273d4451f51d5f2eb4e9
+MD5 b8ca4af22bd6eb8fc23fd66737c7931f ChangeLog 6652
+RMD160 546dd2f62f9c90b7dca4ab3ce92e6e51b606bf81 ChangeLog 6652
+SHA256 eb9e363d38f8e0bdf72d61caeeb7bc15ba0dcb99c3d5273d4451f51d5f2eb4e9 ChangeLog 6652
MISC metadata.xml 327 RMD160 10186cf048d44753bf4cec722eed45d2ade12316 SHA1 0254321c012da0e8f80aec6f29a0fb5b17675d4d SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be
MD5 10ddcc0c6d2a7a76dd92dffa01ca03ca metadata.xml 327
RMD160 10186cf048d44753bf4cec722eed45d2ade12316 metadata.xml 327
SHA256 e520223493249c261b48f7f7460ed7c262d35383484e730cfefba51fde1195be metadata.xml 327
-MD5 2b2f5a687b4ee3c791b2f7a1897807fd files/digest-texlive-core-2007-r8 14527
-RMD160 2e8c8f55370fd2635c596d09aba8032690cb3c3e files/digest-texlive-core-2007-r8 14527
-SHA256 eeafa2cdaa1b7fa1142295b4eb8ece4941ab7e544539baa43416569d8cd7d53b files/digest-texlive-core-2007-r8 14527
+MD5 a9c316b16cecd9d1744ebf021708443d files/digest-texlive-core-2007-r8 14470
+RMD160 66a3695d4232d3e1a7660c8ffd0930749a367f8a files/digest-texlive-core-2007-r8 14470
+SHA256 379c5897447701b40f66af1b756867306507169d03154063be48d57f74aa2b71 files/digest-texlive-core-2007-r8 14470
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHRJkBvFcC4BYPU0oRAtgnAJ95QCh5QwTOoF5tMwGDG3zDuXGWDQCdEu5B
-LMm0fdFzUXqZzFP8faBWYkI=
-=yL+g
+iD8DBQFHUzM2vFcC4BYPU0oRAoPOAJ4jwgQToqBoE/R+3T9SL3hNvHZgDgCfba84
+t+5BZqr71gFYFtSNcVwvcUI=
+=5Hs5
-----END PGP SIGNATURE-----
diff --git a/app-text/texlive-core/files/2007/tetex-3.0-CVE-2007-0650.patch b/app-text/texlive-core/files/2007/tetex-3.0-CVE-2007-0650.patch
deleted file mode 100644
index 4df77e5dd8f1..000000000000
--- a/app-text/texlive-core/files/2007/tetex-3.0-CVE-2007-0650.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- tetex-src-3.0/texk/makeindexk/mkind.c.CVE-2007-0650 2002-10-02 14:26:37.000000000 +0200
-+++ tetex-src-3.0/texk/makeindexk/mkind.c 2007-02-02 12:29:31.000000000 +0100
-@@ -179,7 +179,9 @@
- argc--;
- if (argc <= 0)
- FATAL("Expected -p <num>\n","");
-- strcpy(pageno, *++argv);
-+ if (strlen(*++argv) >= sizeof(pageno))
-+ FATAL("Page number too high\n","");
-+ strcpy(pageno, *argv);
- init_page = TRUE;
- if (STREQ(pageno, EVEN)) {
- log_given = TRUE;
-@@ -230,7 +232,7 @@
- char tmp[STRING_MAX + 5];
-
- /* base set by last call to check_idx */
-- sprintf (tmp, "%s%s", base, INDEX_STY);
-+ snprintf (tmp, sizeof(tmp), "%s%s", base, INDEX_STY);
- if (0 == access(tmp, R_OK)) {
- open_sty (tmp);
- sty_given = TRUE;
-@@ -405,9 +407,9 @@
- STRING_MAX,totmem);
- #endif /* DEBUG */
-
-- if ((idx_fn = (char *) malloc(STRING_MAX)) == NULL)
-+ if ((idx_fn = (char *) malloc(STRING_MAX+5)) == NULL)
- FATAL("Not enough core...abort.\n", "");
-- sprintf(idx_fn, "%s%s", base, INDEX_IDX);
-+ snprintf(idx_fn, STRING_MAX+5, "%s%s", base, INDEX_IDX);
- if ((open_fn &&
- ((idx_fp = OPEN_IN(idx_fn)) == NULL)
- ) ||
-@@ -434,7 +436,7 @@
-
- /* index output file */
- if (!ind_given) {
-- sprintf(ind, "%s%s", base, INDEX_IND);
-+ snprintf(ind, sizeof(ind), "%s%s", base, INDEX_IND);
- ind_fn = ind;
- }
- if ((ind_fp = OPEN_OUT(ind_fn)) == NULL)
-@@ -442,14 +444,14 @@
-
- /* index transcript file */
- if (!ilg_given) {
-- sprintf(ilg, "%s%s", base, INDEX_ILG);
-+ snprintf(ilg, sizeof(ilg), "%s%s", base, INDEX_ILG);
- ilg_fn = ilg;
- }
- if ((ilg_fp = OPEN_OUT(ilg_fn)) == NULL)
- FATAL("Can't create transcript file %s.\n", ilg_fn);
-
- if (log_given) {
-- sprintf(log_fn, "%s%s", base, INDEX_LOG);
-+ snprintf(log_fn, sizeof(log_fn), "%s%s", base, INDEX_LOG);
- if ((log_fp = OPEN_IN(log_fn)) == NULL) {
- FATAL("Source log file %s not found.\n", log_fn);
- } else {
-@@ -505,6 +507,9 @@
- if ((found = kpse_find_file (fn, kpse_ist_format, 1)) == NULL) {
- FATAL("Index style file %s not found.\n", fn);
- } else {
-+ if (strlen(found) >= sizeof(sty_fn)) {
-+ FATAL("Style file %s too long.\n", found);
-+ }
- strcpy(sty_fn,found);
- if ((sty_fp = OPEN_IN(sty_fn)) == NULL) {
- FATAL("Could not open style file %s.\n", sty_fn);
-@@ -512,6 +517,9 @@
- }
- #else
- if ((path = getenv(STYLE_PATH)) == NULL) {
-+ if (strlen(fn) >= sizeof(sty_fn)) {
-+ FATAL("Style file %s too long.\n", fn);
-+ }
- /* style input path not defined */
- strcpy(sty_fn, fn);
- sty_fp = OPEN_IN(sty_fn);
diff --git a/app-text/texlive-core/files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch b/app-text/texlive-core/files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch
deleted file mode 100644
index da3c7a6d19f7..000000000000
--- a/app-text/texlive-core/files/2007/tetex-3.0_p1-xpdf-CVE-2007-3387.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc Tue Feb 27 14:05:52 2007
-+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc Thu Jul 12 15:55:49 2007
-@@ -421,7 +421,12 @@
- }
- pixBytes = (nComps * nBits + 7) >> 3;
- rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-- if (rowBytes < 0) {
-+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+ nComps > gfxColorMaxComps ||
-+ nBits > 16 ||
-+ nVals <= 0 ||
-+ nVals * nBits + 7 <= 0 ||
-+ rowBytes <= 0) {
- return;
- }
- predLine = (Guchar *)gmalloc(rowBytes);
diff --git a/app-text/texlive-core/files/2007/texlive-core-2007-bump_makeindex_limitations.patch b/app-text/texlive-core/files/2007/texlive-core-2007-bump_makeindex_limitations.patch
deleted file mode 100644
index 7f6fed22f7c3..000000000000
--- a/app-text/texlive-core/files/2007/texlive-core-2007-bump_makeindex_limitations.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-2007-11-20 Karl Berry <karl@tug.org>
-
- * mkind.c (sty_fn): use STRING_MAX, not LINE_MAX.
- From Peter Ansell, 19 Nov 2007 10:11:40.
-
- * mkind.h (STRING_MAX): bump again to 999.
-
-Index: source/texk/makeindexk/mkind.c
-===================================================================
---- source/texk/makeindexk/mkind.c (revision 5516)
-+++ source/texk/makeindexk/mkind.c (revision 5517)
-@@ -53,7 +53,7 @@
- FILE *ilg_fp;
-
- char *pgm_fn;
--char sty_fn[LINE_MAX];
-+char sty_fn[STRING_MAX];
- char *idx_fn;
- char ind[STRING_MAX];
- char *ind_fn;
-Index: source/texk/makeindexk/mkind.h
-===================================================================
---- source/texk/makeindexk/mkind.h (revision 5516)
-+++ source/texk/makeindexk/mkind.h (revision 5517)
-@@ -337,7 +337,7 @@
- #define ROMAN_MAX 16 /* maximum length of Roman page number */
- /* field */
-
--#define STRING_MAX 256 /* maximum length of host filename */
-+#define STRING_MAX 999 /* maximum length of host filename */
-
- /*====================================================================*/
-
diff --git a/app-text/texlive-core/files/2007/texlive-core-2007-dvips_bufferoverflow.patch b/app-text/texlive-core/files/2007/texlive-core-2007-dvips_bufferoverflow.patch
deleted file mode 100644
index 3f4732f1a249..000000000000
--- a/app-text/texlive-core/files/2007/texlive-core-2007-dvips_bufferoverflow.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-hps.c (stamp_external, stamp_hps): protext against long strings.
- From Bastien Roucaries via Norbert, 21 Oct 2007 13:22:19,
- Debian bug 447081.
-
-Index: texk/dvipsk/hps.c
-===================================================================
---- texk/dvipsk/hps.c (revision 5253)
-+++ texk/dvipsk/hps.c (revision 5254)
-@@ -441,20 +441,29 @@
-
- void stamp_hps P1C(Hps_link *, pl)
- {
-- char tmpbuf[200] ;
-+ char * tmpbuf;
- if (pl == NULL) {
-- error("Null pointer, oh no!") ;
-+ error("stamp_hps: null pl pointer, oh no!") ;
- return ;
-- } else {
-- /* print out the proper pdfm with local page info only
-- * target info will be in the target dictionary */
-- (void)sprintf(tmpbuf,
-- " (%s) [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] pdfm ", pl->title, pl->rect.llx, pl->rect.lly, pl->rect.urx, pl->rect.ury,
-- pl->border[0], pl->border[1], pl->border[2], pl->border[3],pl->border[4],
-- pl->color[0], pl->color[1], pl->color[2]) ;
-- cmdout(tmpbuf) ;
-- }
-+ }
-+ if(pl->title == NULL) {
-+ error("stamp_hps: null pl->title pointer, oh no!") ;
-+ return ;
-+ }
-+
-+ tmpbuf = (char *) xmalloc(strlen(pl->title)+200);
-+
-+ /* print out the proper pdfm with local page info only
-+ * target info will be in the target dictionary */
-+ (void)sprintf(tmpbuf,
-+ " (%s) [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] pdfm ",
-+ pl->title, pl->rect.llx, pl->rect.lly, pl->rect.urx, pl->rect.ury,
-+ pl->border[0], pl->border[1], pl->border[2], pl->border[3],pl->border[4],
-+ pl->color[0], pl->color[1], pl->color[2]) ;
-+ cmdout(tmpbuf) ;
-+ free(tmpbuf);
-
-+
- }
-
- /* For external URL's, we just pass them through as a string. The hyperps
-@@ -462,18 +471,27 @@
- */
- void stamp_external P2C(char *, s, Hps_link *, pl)
- {
-- char tmpbuf[200];
-+ char *tmpbuf;
- if (pl == NULL) {
-- error("Null pointer, oh no!") ;
-+ error("stamp_external: null pl pointer, oh no!") ;
- return ;
-- } else {
-- /* print out the proper pdfm with local page info only
-- * target info will be in the target dictionary */
-- (void)sprintf(tmpbuf," [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] (%s) pdfm ", pl->rect.llx, pl->rect.lly, pl->rect.urx, pl->rect.ury,
-- pl->border[0], pl->border[1], pl->border[2], pl->border[3],pl->border[4],
-- pl->color[0], pl->color[1], pl->color[2], s) ;
-- cmdout(tmpbuf) ;
-- }
-+ }
-+
-+ if (s == NULL) {
-+ error("stamp_external: null s pointer, oh no!") ;
-+ return ;
-+ }
-+
-+ tmpbuf = (char *) xmalloc(strlen(s) + 200);
-+
-+ /* print out the proper pdfm with local page info only
-+ * target info will be in the target dictionary */
-+ (void)sprintf(tmpbuf," [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] (%s) pdfm ",
-+ pl->rect.llx, pl->rect.lly, pl->rect.urx, pl->rect.ury,
-+ pl->border[0], pl->border[1], pl->border[2], pl->border[3],pl->border[4],
-+ pl->color[0], pl->color[1], pl->color[2], s) ;
-+ cmdout(tmpbuf) ;
-+ free(tmpbuf);
- }
-
- void finish_hps P1H(void) {
diff --git a/app-text/texlive-core/files/2007/texlive-core-2007-icu-xetex-execstacks.patch b/app-text/texlive-core/files/2007/texlive-core-2007-icu-xetex-execstacks.patch
deleted file mode 100644
index c84238532dbe..000000000000
--- a/app-text/texlive-core/files/2007/texlive-core-2007-icu-xetex-execstacks.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: work/libs/icu-xetex/tools/genccode/genccode.c
-===================================================================
---- work.orig/libs/icu-xetex/tools/genccode/genccode.c
-+++ work/libs/icu-xetex/tools/genccode/genccode.c
-@@ -149,6 +149,7 @@ static const struct AssemblyType {
- } assemblyHeader[] = {
- {"gcc",
- ".globl %s\n"
-+ "\t.section .note.GNU-stack,\"\",@progbits\n"
- "\t.section .rodata\n"
- "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
- "\t.type %s,@object\n"
diff --git a/app-text/texlive-core/files/2007/texlive-core-2007-libteckit-asneeded.patch b/app-text/texlive-core/files/2007/texlive-core-2007-libteckit-asneeded.patch
deleted file mode 100644
index f1215b6bd378..000000000000
--- a/app-text/texlive-core/files/2007/texlive-core-2007-libteckit-asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: work/libs/teckit/lib/Makefile.am
-===================================================================
---- work.orig/libs/teckit/lib/Makefile.am
-+++ work/libs/teckit/lib/Makefile.am
-@@ -10,5 +10,8 @@ AM_CFLAGS = $(AM_CPPFLAGS)
-
- lib_LTLIBRARIES = libTECkit_Compiler.la libTECkit.la
-
-+libTECkit_Compiler_la_LIBADD = @LDZLIB@
-+libTECkit_la_LIBADD = @LDZLIB@
-+
- include ../source/Makefile.am
-
diff --git a/app-text/texlive-core/files/2007/texlive-core-2007-mpware.patch b/app-text/texlive-core/files/2007/texlive-core-2007-mpware.patch
deleted file mode 100644
index d3cbebcab8f7..000000000000
--- a/app-text/texlive-core/files/2007/texlive-core-2007-mpware.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- TeX.orig/texk/web2c/mpware/Makefile.in 2007-05-26 20:40:14.000000000 +0200
-+++ TeX/texk/web2c/mpware/Makefile.in 2007-05-26 20:40:57.000000000 +0200
-@@ -49,7 +49,7 @@
- $(INSTALL_PROGRAM) newer $(bindir)/newer
- $(INSTALL_LIBTOOL_PROG) dmp $(bindir)
- $(INSTALL_LIBTOOL_PROG) mpto $(bindir)
-- $(INSTALL_SCRIPT) makempx $(scriptdir)/makempx
-+ $(INSTALL_LIBTOOL_PROG) makempx $(bindir)
- install-data:
-
- kpse_include ../make/tkpathsea.mk
diff --git a/app-text/texlive-core/files/2007/xpdf-3.02pl2.patch b/app-text/texlive-core/files/2007/xpdf-3.02pl2.patch
deleted file mode 100644
index 1d962f328a02..000000000000
--- a/app-text/texlive-core/files/2007/xpdf-3.02pl2.patch
+++ /dev/null
@@ -1,640 +0,0 @@
-Index: tetex-src-3.0/libs/xpdf/xpdf/Stream.cc
-===================================================================
---- tetex-src-3.0.orig/libs/xpdf/xpdf/Stream.cc
-+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc
-@@ -1285,19 +1285,24 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
- error (-1, "invalid number of columns: %d\n", columns);
- exit (1);
- }
-+ else if (columns > INT_MAX - 2) columns = INT_MAX - 2;
- rows = rowsA;
- endOfBlock = endOfBlockA;
- black = blackA;
-- refLine = (short *)gmallocn(columns + 4, sizeof(short));
-- codingLine = (short *)gmallocn(columns + 3, sizeof(short));
-+ // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
-+ // ---> max codingLine size = columns + 1
-+ // refLine has one extra guard entry at the end
-+ // ---> max refLine size = columns + 2
-+ codingLine = (int *)gmallocn(columns + 1, sizeof(int));
-+ refLine = (int *)gmallocn(columns + 2, sizeof(int));
-
- eof = gFalse;
- row = 0;
- nextLine2D = encoding < 0;
- inputBits = 0;
-- codingLine[0] = 0;
-- codingLine[1] = refLine[2] = columns;
-- a0 = 1;
-+ codingLine[0] = columns;
-+ a0i = 0;
-+ outputBits = 0;
-
- buf = EOF;
- }
-@@ -1316,9 +1321,9 @@ void CCITTFaxStream::reset() {
- row = 0;
- nextLine2D = encoding < 0;
- inputBits = 0;
-- codingLine[0] = 0;
-- codingLine[1] = refLine[2] = columns;
-- a0 = 1;
-+ codingLine[0] = columns;
-+ a0i = 0;
-+ outputBits = 0;
- buf = EOF;
-
- // skip any initial zero bits and end-of-line marker, and get the 2D
-@@ -1335,164 +1340,228 @@ void CCITTFaxStream::reset() {
- }
- }
-
-+inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
-+ if (a1 > codingLine[a0i]) {
-+ if (a1 > columns) {
-+ error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+ err = gTrue;
-+ a1 = columns;
-+ }
-+ if ((a0i & 1) ^ blackPixels) {
-+ ++a0i;
-+ }
-+ codingLine[a0i] = a1;
-+ }
-+}
-+
-+inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
-+ if (a1 > codingLine[a0i]) {
-+ if (a1 > columns) {
-+ error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+ err = gTrue;
-+ a1 = columns;
-+ }
-+ if ((a0i & 1) ^ blackPixels) {
-+ ++a0i;
-+ }
-+ codingLine[a0i] = a1;
-+ } else if (a1 < codingLine[a0i]) {
-+ if (a1 < 0) {
-+ error(getPos(), "Invalid CCITTFax code");
-+ err = gTrue;
-+ a1 = 0;
-+ }
-+ while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
-+ --a0i;
-+ }
-+ codingLine[a0i] = a1;
-+ }
-+}
-+
- int CCITTFaxStream::lookChar() {
- short code1, code2, code3;
-- int a0New;
-- GBool err, gotEOL;
-- int ret;
-- int bits, i;
--
-- // if at eof just return EOF
-- if (eof && codingLine[a0] >= columns) {
-- return EOF;
-+ int b1i, blackPixels, i, bits;
-+ GBool gotEOL;
-+
-+ if (buf != EOF) {
-+ return buf;
- }
-
- // read the next row
-- err = gFalse;
-- if (codingLine[a0] >= columns) {
-+ if (outputBits == 0) {
-
-+ // if at eof just return EOF
-+ if (eof) {
-+ return EOF;
-+ }
-+
-+ err = gFalse;
-+
- // 2-D encoding
- if (nextLine2D) {
- for (i = 0; codingLine[i] < columns; ++i)
- refLine[i] = codingLine[i];
-- refLine[i] = refLine[i + 1] = columns;
-- b1 = 1;
-- a0New = codingLine[a0 = 0] = 0;
-- do {
-- code1 = getTwoDimCode();
-+ refLine[i++] = columns;
-+ refLine[i] = columns;
-+ codingLine[0] = 0;
-+ a0i = 0;
-+ b1i = 0;
-+ blackPixels = 0;
-+ // invariant:
-+ // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
-+ // <= columns
-+ // exception at left edge:
-+ // codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
-+ // exception at right edge:
-+ // refLine[b1i] = refLine[b1i+1] = columns is possible
-+ while (codingLine[a0i] < columns) {
-+ code1 = getTwoDimCode();
- switch (code1) {
-- case twoDimPass:
-- if (refLine[b1] < columns) {
-- a0New = refLine[b1 + 1];
-- b1 += 2;
-- }
-- break;
-- case twoDimHoriz:
-- if ((a0 & 1) == 0) {
-- code1 = code2 = 0;
-- do {
-- code1 += code3 = getWhiteCode();
-- } while (code3 >= 64);
-- do {
-- code2 += code3 = getBlackCode();
-- } while (code3 >= 64);
-- } else {
-- code1 = code2 = 0;
-- do {
-- code1 += code3 = getBlackCode();
-- } while (code3 >= 64);
-- do {
-- code2 += code3 = getWhiteCode();
-- } while (code3 >= 64);
-- }
-- if (code1 > 0 || code2 > 0) {
-- codingLine[a0 + 1] = a0New + code1;
-- ++a0;
-- a0New = codingLine[a0 + 1] = codingLine[a0] + code2;
-- ++a0;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVert0:
-- a0New = codingLine[++a0] = refLine[b1];
-- if (refLine[b1] < columns) {
-- ++b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVertR1:
-- a0New = codingLine[++a0] = refLine[b1] + 1;
-- if (refLine[b1] < columns) {
-- ++b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVertL1:
-- if (a0 == 0 || refLine[b1] - 1 > a0New) {
-- a0New = codingLine[++a0] = refLine[b1] - 1;
-- --b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVertR2:
-- a0New = codingLine[++a0] = refLine[b1] + 2;
-- if (refLine[b1] < columns) {
-- ++b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVertL2:
-- if (a0 == 0 || refLine[b1] - 2 > a0New) {
-- a0New = codingLine[++a0] = refLine[b1] - 2;
-- --b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVertR3:
-- a0New = codingLine[++a0] = refLine[b1] + 3;
-- if (refLine[b1] < columns) {
-- ++b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case twoDimVertL3:
-- if (a0 == 0 || refLine[b1] - 3 > a0New) {
-- a0New = codingLine[++a0] = refLine[b1] - 3;
-- --b1;
-- while (refLine[b1] <= codingLine[a0] && refLine[b1] < columns)
-- b1 += 2;
-- }
-- break;
-- case EOF:
-- eof = gTrue;
-- codingLine[a0 = 0] = columns;
-- return EOF;
-- default:
-- error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-- err = gTrue;
-- break;
-+ case twoDimPass:
-+ addPixels(refLine[b1i + 1], blackPixels);
-+ if (refLine[b1i + 1] < columns) {
-+ b1i += 2;
-+ }
-+ break;
-+ case twoDimHoriz:
-+ code1 = code2 = 0;
-+ if (blackPixels) {
-+ do {
-+ code1 += code3 = getBlackCode();
-+ } while (code3 >= 64);
-+ do {
-+ code2 += code3 = getWhiteCode();
-+ } while (code3 >= 64);
-+ } else {
-+ do {
-+ code1 += code3 = getWhiteCode();
-+ } while (code3 >= 64);
-+ do {
-+ code2 += code3 = getBlackCode();
-+ } while (code3 >= 64);
-+ }
-+ addPixels(codingLine[a0i] + code1, blackPixels);
-+ if (codingLine[a0i] < columns) {
-+ addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
-+ }
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ break;
-+ case twoDimVertR3:
-+ addPixels(refLine[b1i] + 3, blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ ++b1i;
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case twoDimVertR2:
-+ addPixels(refLine[b1i] + 2, blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ ++b1i;
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case twoDimVertR1:
-+ addPixels(refLine[b1i] + 1, blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ ++b1i;
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case twoDimVert0:
-+ addPixels(refLine[b1i], blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ ++b1i;
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case twoDimVertL3:
-+ addPixelsNeg(refLine[b1i] - 3, blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ if (b1i > 0) {
-+ --b1i;
-+ } else {
-+ ++b1i;
-+ }
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case twoDimVertL2:
-+ addPixelsNeg(refLine[b1i] - 2, blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ if (b1i > 0) {
-+ --b1i;
-+ } else {
-+ ++b1i;
-+ }
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case twoDimVertL1:
-+ addPixelsNeg(refLine[b1i] - 1, blackPixels);
-+ blackPixels ^= 1;
-+ if (codingLine[a0i] < columns) {
-+ if (b1i > 0) {
-+ --b1i;
-+ } else {
-+ ++b1i;
-+ }
-+ while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-+ b1i += 2;
-+ }
-+ }
-+ break;
-+ case EOF:
-+ addPixels(columns, 0);
-+ eof = gTrue;
-+ break;
-+ default:
-+ error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-+ addPixels(columns, 0);
-+ err = gTrue;
-+ break;
-+ }
- }
-- } while (codingLine[a0] < columns);
-
- // 1-D encoding
- } else {
-- codingLine[a0 = 0] = 0;
-- while (1) {
-- code1 = 0;
-- do {
-- code1 += code3 = getWhiteCode();
-- } while (code3 >= 64);
-- codingLine[a0+1] = codingLine[a0] + code1;
-- ++a0;
-- if (codingLine[a0] >= columns)
-- break;
-- code2 = 0;
-- do {
-- code2 += code3 = getBlackCode();
-- } while (code3 >= 64);
-- codingLine[a0+1] = codingLine[a0] + code2;
-- ++a0;
-- if (codingLine[a0] >= columns)
-- break;
-- }
-- }
--
-- if (codingLine[a0] != columns) {
-- error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
-- // force the row to be the correct length
-- while (codingLine[a0] > columns) {
-- --a0;
-+ codingLine[0] = 0;
-+ a0i = 0;
-+ blackPixels = 0;
-+ while (codingLine[a0i] < columns) {
-+ code1 = 0;
-+ if (blackPixels) {
-+ do {
-+ code1 += code3 = getBlackCode();
-+ } while (code3 >= 64);
-+ } else {
-+ do {
-+ code1 += code3 = getWhiteCode();
-+ } while (code3 >= 64);
-+ }
-+ addPixels(codingLine[a0i] + code1, blackPixels);
-+ blackPixels ^= 1;
-+ }
- }
-- codingLine[++a0] = columns;
-- err = gTrue;
-- }
-
- // byte-align the row
- if (byteAlign) {
-@@ -1552,14 +1621,17 @@ int CCITTFaxStream::lookChar() {
- // this if we know the stream contains end-of-line markers because
- // the "just plow on" technique tends to work better otherwise
- } else if (err && endOfLine) {
-- do {
-+ while (1) {
-+ code1 = lookBits(13);
- if (code1 == EOF) {
- eof = gTrue;
- return EOF;
- }
-+ if ((code1 >> 1) == 0x001) {
-+ break;
-+ }
- eatBits(1);
-- code1 = lookBits(13);
-- } while ((code1 >> 1) != 0x001);
-+ }
- eatBits(12);
- if (encoding > 0) {
- eatBits(1);
-@@ -1567,11 +1639,11 @@ int CCITTFaxStream::lookChar() {
- }
- }
-
-- a0 = 0;
-- outputBits = codingLine[1] - codingLine[0];
-- if (outputBits == 0) {
-- a0 = 1;
-- outputBits = codingLine[2] - codingLine[1];
-+ // set up for output
-+ if (codingLine[0] > 0) {
-+ outputBits = codingLine[a0i = 0];
-+ } else {
-+ outputBits = codingLine[a0i = 1];
- }
-
- ++row;
-@@ -1579,39 +1651,43 @@ int CCITTFaxStream::lookChar() {
-
- // get a byte
- if (outputBits >= 8) {
-- ret = ((a0 & 1) == 0) ? 0xff : 0x00;
-- if ((outputBits -= 8) == 0) {
-- ++a0;
-- if (codingLine[a0] < columns) {
-- outputBits = codingLine[a0 + 1] - codingLine[a0];
-- }
-+ buf = (a0i & 1) ? 0x00 : 0xff;
-+ outputBits -= 8;
-+ if (outputBits == 0 && codingLine[a0i] < columns) {
-+ ++a0i;
-+ outputBits = codingLine[a0i] - codingLine[a0i - 1];
- }
- } else {
- bits = 8;
-- ret = 0;
-+ buf = 0;
- do {
- if (outputBits > bits) {
-- i = bits;
-- bits = 0;
-- if ((a0 & 1) == 0) {
-- ret |= 0xff >> (8 - i);
-+ buf <<= bits;
-+ if (!(a0i & 1)) {
-+ buf |= 0xff >> (8 - bits);
- }
-- outputBits -= i;
-+ outputBits -= bits;
-+ bits = 0;
- } else {
-- i = outputBits;
-- bits -= outputBits;
-- if ((a0 & 1) == 0) {
-- ret |= (0xff >> (8 - i)) << bits;
-+ buf <<= outputBits;
-+ if (!(a0i & 1)) {
-+ buf |= 0xff >> (8 - outputBits);
- }
-+ bits -= outputBits;
- outputBits = 0;
-- ++a0;
-- if (codingLine[a0] < columns) {
-- outputBits = codingLine[a0 + 1] - codingLine[a0];
-+ if (codingLine[a0i] < columns) {
-+ ++a0i;
-+ outputBits = codingLine[a0i] - codingLine[a0i - 1];
-+ } else if (bits > 0) {
-+ buf <<= bits;
-+ bits = 0;
- }
- }
-- } while (bits > 0 && codingLine[a0] < columns);
-+ } while (bits);
-+ }
-+ if (black) {
-+ buf ^= 0xff;
- }
-- buf = black ? (ret ^ 0xff) : ret;
- return buf;
- }
-
-@@ -1653,6 +1729,9 @@ short CCITTFaxStream::getWhiteCode() {
- code = 0; // make gcc happy
- if (endOfBlock) {
- code = lookBits(12);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if ((code >> 5) == 0) {
- p = &whiteTab1[code];
- } else {
-@@ -1665,6 +1744,9 @@ short CCITTFaxStream::getWhiteCode() {
- } else {
- for (n = 1; n <= 9; ++n) {
- code = lookBits(n);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if (n < 9) {
- code <<= 9 - n;
- }
-@@ -1676,6 +1758,9 @@ short CCITTFaxStream::getWhiteCode() {
- }
- for (n = 11; n <= 12; ++n) {
- code = lookBits(n);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if (n < 12) {
- code <<= 12 - n;
- }
-@@ -1701,6 +1786,9 @@ short CCITTFaxStream::getBlackCode() {
- code = 0; // make gcc happy
- if (endOfBlock) {
- code = lookBits(13);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if ((code >> 7) == 0) {
- p = &blackTab1[code];
- } else if ((code >> 9) == 0) {
-@@ -1715,6 +1803,9 @@ short CCITTFaxStream::getBlackCode() {
- } else {
- for (n = 2; n <= 6; ++n) {
- code = lookBits(n);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if (n < 6) {
- code <<= 6 - n;
- }
-@@ -1726,6 +1817,9 @@ short CCITTFaxStream::getBlackCode() {
- }
- for (n = 7; n <= 12; ++n) {
- code = lookBits(n);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if (n < 12) {
- code <<= 12 - n;
- }
-@@ -1739,6 +1833,9 @@ short CCITTFaxStream::getBlackCode() {
- }
- for (n = 10; n <= 13; ++n) {
- code = lookBits(n);
-+ if (code == EOF) {
-+ return 1;
-+ }
- if (n < 13) {
- code <<= 13 - n;
- }
-@@ -1961,6 +2058,12 @@ void DCTStream::reset() {
- // allocate a buffer for the whole image
- bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
- bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
-+ if (bufWidth <= 0 || bufHeight <= 0 ||
-+ bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
-+ error(getPos(), "Invalid image size in DCT stream");
-+ y = height;
-+ return;
-+ }
- for (i = 0; i < numComps; ++i) {
- frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int));
- memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
-@@ -3024,6 +3127,11 @@ GBool DCTStream::readScanInfo() {
- }
- scanInfo.firstCoeff = str->getChar();
- scanInfo.lastCoeff = str->getChar();
-+ if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
-+ scanInfo.firstCoeff > scanInfo.lastCoeff) {
-+ error(getPos(), "Bad DCT coefficient numbers in scan info block");
-+ return gFalse;
-+ }
- c = str->getChar();
- scanInfo.ah = (c >> 4) & 0x0f;
- scanInfo.al = c & 0x0f;
-Index: tetex-src-3.0/libs/xpdf/xpdf/Stream.h
-===================================================================
---- tetex-src-3.0.orig/libs/xpdf/xpdf/Stream.h
-+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h
-@@ -519,13 +519,15 @@ private:
- int row; // current row
- int inputBuf; // input buffer
- int inputBits; // number of bits in input buffer
-- short *refLine; // reference line changing elements
-- int b1; // index into refLine
-- short *codingLine; // coding line changing elements
-- int a0; // index into codingLine
-+ int *codingLine; // coding line changing elements
-+ int *refLine; // reference line changing elements
-+ int a0i; // index into codingLine
-+ GBool err; // error on current line
- int outputBits; // remaining ouput bits
- int buf; // character buffer
-
-+ void addPixels(int a1, int black);
-+ void addPixelsNeg(int a1, int black);
- short getTwoDimCode();
- short getWhiteCode();
- short getBlackCode();
diff --git a/app-text/texlive-core/files/digest-texlive-core-2007-r8 b/app-text/texlive-core/files/digest-texlive-core-2007-r8
index 5c20835cdcb8..b5eb1ede838c 100644
--- a/app-text/texlive-core/files/digest-texlive-core-2007-r8
+++ b/app-text/texlive-core/files/digest-texlive-core-2007-r8
@@ -1,12 +1,12 @@
-MD5 195188f2a025ff8e4ccd00f7c73ab0fe texlive-core-2007-dviljk-security-fixes.patch.bz2 10647
-RMD160 6581361038be07139a79d2fa301d47b6e6bfd560 texlive-core-2007-dviljk-security-fixes.patch.bz2 10647
-SHA256 70fe7b2f87c7850fb2eef95cebcc8b03541d8907ce216b207f5d0f45cc4d7d1f texlive-core-2007-dviljk-security-fixes.patch.bz2 10647
MD5 9b6348b8f54a9e94e8b6b50b821fcdc3 texlive-core-2007-updated-config.ps.bz2 2981
RMD160 af88bbda9227e718ebf69d007f424c8b985a0404 texlive-core-2007-updated-config.ps.bz2 2981
SHA256 ff12f1f6a68e45ad8d8f960f5fe76aae159d64074507a4a650973e1e865c8acd texlive-core-2007-updated-config.ps.bz2 2981
MD5 d539b5a6b9f96cc2616f09f4543394c8 texlive-core-2007.tar.bz2 31078286
RMD160 496cb3fa3c5cd9b2ea5da3b0bced67a2b5afe7b9 texlive-core-2007.tar.bz2 31078286
SHA256 96c12147ea9717539553eb6b3be52c2df6163ca617dccc71282ccd39c2e5773b texlive-core-2007.tar.bz2 31078286
+MD5 a4fd38982d0b991cb53c99cba91c7ba4 texlive-core-patches-1.tar.bz2 17159
+RMD160 38f401727619714fbbf310d822702ce9f0c4afed texlive-core-patches-1.tar.bz2 17159
+SHA256 65e37bfa985f5faa3b8ef86fea29e6e1326bff53c795dd6d423df9ad6a790f4a texlive-core-patches-1.tar.bz2 17159
MD5 04850af5320c53804353a072f6b0ff30 texlive-module-bin-afm2pl-2007.zip 25453
RMD160 af1597b5ed9ed7bc9766139e3434f5e42b483087 texlive-module-bin-afm2pl-2007.zip 25453
SHA256 9efc5a4306a43bf36d9c84ef05d213fcf1d62354b8403eddaf3e4e699a297d31 texlive-module-bin-afm2pl-2007.zip 25453
diff --git a/app-text/texlive-core/texlive-core-2007-r8.ebuild b/app-text/texlive-core/texlive-core-2007-r8.ebuild
index 5e42460910ff..bb509963200b 100644
--- a/app-text/texlive-core/texlive-core-2007-r8.ebuild
+++ b/app-text/texlive-core/texlive-core-2007-r8.ebuild
@@ -1,9 +1,11 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2007-r8.ebuild,v 1.2 2007/11/21 20:45:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2007-r8.ebuild,v 1.3 2007/12/02 22:35:21 aballier Exp $
inherit eutils flag-o-matic toolchain-funcs libtool autotools texlive-common
+PATCHLEVEL="1"
+
DESCRIPTION="A complete TeX distribution"
HOMEPAGE="http://tug.org/texlive/"
SLOT="0"
@@ -19,8 +21,7 @@ TEXLIVE_CORE_EXTRA_BUILT_BINARIES="bin-xetex bin-aleph bin-omega"
TEXLIVE_CORE_INCLUDED_TEXMF="${TEXLIVE_BASICBIN_CONTENTS} ${TEXLIVE_FONTBIN_CONTENTS} ${TEXLIVE_BINEXTRA_CONTENTS} ${TEXLIVE_CORE_EXTRA_BUILT_BINARIES}"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- mirror://gentoo/${P}-dviljk-security-fixes.patch.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
for i in ${TEXLIVE_CORE_INCLUDED_TEXMF}; do
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.zip"
@@ -30,6 +31,9 @@ done
# Or alternatively: http://tug.org/texlive/bugs.html
SRC_URI="${SRC_URI} mirror://gentoo/${P}-updated-config.ps.bz2"
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
IUSE="X doc"
@@ -67,31 +71,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/${PV}/${P}-mpware.patch"
- epatch "${FILESDIR}/${PV}/${P}-libteckit-asneeded.patch"
-
-# it is also affected by bug 170861
- epatch "${FILESDIR}/${PV}/tetex-3.0-CVE-2007-0650.patch"
-
-# Bug #188172 and bug #185225
- epatch "${FILESDIR}/${PV}/tetex-3.0_p1-xpdf-CVE-2007-3387.patch"
-
-# Do not require exec stacks for asm generated by icu genccode program
-# it would be better to use system icu... but it doesn't seem that well
-# supported
- epatch "${FILESDIR}/${PV}/${P}-icu-xetex-execstacks.patch"
-
-# See http://permalink.gmane.org/gmane.comp.tex.live/14939
- epatch "${FILESDIR}/${PV}/${P}-dvips_bufferoverflow.patch"
-
-# dviljk buffer overflow issues, bug #198229
- epatch "${WORKDIR}/${P}-dviljk-security-fixes.patch"
-
-# Bump makeindex limitations, bug #199590, patch by Peter Ansell
- epatch "${FILESDIR}/${PV}/${P}-bump_makeindex_limitations.patch"
-
-# security bug #196735
- epatch "${FILESDIR}/${PV}/xpdf-3.02pl2.patch"
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
sed -i -e "/mktexlsr/,+3d" -e "s/\(updmap-sys\)/\1 --nohash/" \
Makefile.in || die "sed failed"