Fixed #126092, #223793, #226877, #284825 and #282874.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 538 insertions, 13 deletions

diff --git a/app-text/ptex/ChangeLog b/app-text/ptex/ChangeLog
index 654f932b8370..053ac8184cf7 100644
--- a/app-text/ptex/ChangeLog
+++ b/app-text/ptex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ptex
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.81 2008/10/31 21:08:57 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ChangeLog,v 1.82 2009/09/30 14:25:02 matsuu Exp $
+
+*ptex-3.1.10_p20090610 (30 Sep 2009)
+
+  30 Sep 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +ptex-3.1.10_p20090610.ebuild, +files/ptex-3.1.10_p20090610-gentoo.patch,
+  +files/ptex-3.1.10_p20090610-getline.patch, +files/CVE-2009-1284.patch:
+  Fixed #126092, #223793, #226877, #284825 and #282874.
 
   31 Oct 2008; Ulrich Mueller <ulm@gentoo.org> ptex-3.1.10_p20071203.ebuild,
   ptex-3.1.10_p20080128.ebuild, ptex-3.1.10_p20080414.ebuild:
diff --git a/app-text/ptex/Manifest b/app-text/ptex/Manifest
index ff55315e8021..01dda27f7798 100644
--- a/app-text/ptex/Manifest
+++ b/app-text/ptex/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX CVE-2009-1284.patch 726 RMD160 1f2b609feb777d9c27bdf0deeccb3cc00017effc SHA1 f1862eb25c3d8b362856602e5fa8bde2a011cece SHA256 b13c2047d1ab722cac51cb60acc1285fa7c66c26240730f6d1526217fb0fc035
 AUX psfonts-ja.map 1158 RMD160 3e1953fd9d660bba85030ccac2e3aa7de3d68d99 SHA1 35498510f45bf07f36ce663061a660c0820038d3 SHA256 fa053893be3695cd0b97a0390cfb64d882899b18b56a8552a1d6ca8c2e16ca5c
 AUX ptex-3.1.10_p20071122-epstopdf-wrong-rotation.patch 627 RMD160 73c26696f3efe24271fc609218e85ef332d5611c SHA1 a6c9ed5f9143702da8574c894f927b48232a5775 SHA256 a67a2078d4e320d4a9ef73567b1c8e55aba7a8c6448deed0c1635855c5b778bb
 AUX ptex-3.1.10_p20071122-fmtutil-etex.patch 863 RMD160 9759c4c21155d215e9c2e0b850a9c81910cba61d SHA1 225b2fdeb4ac88061bde595c201d6eac83e1eca7 SHA256 1b035213c3f794a518aba4f109cd0aced2d3f7b3826f6609d91b6e87307693e3
@@ -8,6 +6,8 @@ AUX ptex-3.1.10_p20071122-pdftosrc-install.patch 979 RMD160 08544f56b48be70f974d
 AUX ptex-3.1.10_p20071203-gentoo.patch 4337 RMD160 ffe5b5d6dd9dc203541d99f8249c3bb5f8dd5296 SHA1 14d6686c9ffd47050e3f0281c7bdd242481a4ce7 SHA256 c3d7fab82f264d4aee70ae27aeca2f8c2615a3910715d17894ead9ccca9e6540
 AUX ptex-3.1.10_p20080128-gentoo.patch 4581 RMD160 d357307f274da25dba08862e6c04b26006174afa SHA1 330f274033d2d365b6baf5df245b243c3cbdc16f SHA256 016a45c65141faf0fd2e5f06e96a089c8711a6b0007b1803fa508c85f0bc29f0
 AUX ptex-3.1.10_p20080414-gentoo.patch 5789 RMD160 ecf79ac7ccb8a6c22775af0faa7421788246445e SHA1 ffa9fe1473d8a63ae762d916239e53fea886772f SHA256 43e5ab375d26e66a1c2ed2a1f56ab7fc321e23b09fd149d88167c35ea86f7858
+AUX ptex-3.1.10_p20090610-gentoo.patch 5497 RMD160 2f2c8f53b43416f771a312123c158bdb7ce69922 SHA1 9d31ac401ed73fcce76d87dc6e6d9e9d9f63ccde SHA256 f3fac1a1c60d915882a5f47434ee857e22c77001d2ff9c4fc042de35c2d1456a
+AUX ptex-3.1.10_p20090610-getline.patch 2670 RMD160 5fbc40f7f394bff0a57b16dbbde24f5b6b6bbbbc SHA1 c81b08ac72db0ceadaf9e3eb90272159529f1cc8 SHA256 1f61b5a1dbaea2133ed275df8dcc264f58c648ae6330e8d9270de9304efb71ee
 AUX tetex-3.0-kpathsea-pic.patch 1791 RMD160 30c7da6951977eab26323509b7034a9a1cb6a809 SHA1 d5a894337e87c04daf2f98fdb3fcdab9cf55c8f2 SHA256 d00020bd51264210be5425d2392e373b9f3964302e4f24401c398f3704631691
 AUX tetex-3.0_p1-create-empty-files.patch 1171 RMD160 908bfb3dedd721e021fc16c1ed9bee1159e5f947 SHA1 e929b5d8272ae81a65c726f139d4cfe14ea9a4a5 SHA256 3c2efa2cc82fccd5452e3ba49a9207264bcf06d2a4467158f4d5f45bd84b3268
 AUX tetex-3.0_p1-dvipdfm-timezone.patch 1546 RMD160 9be8bb58b3be7add25ce30acb4eee08b35c85c5f SHA1 e3824f4fefa52927dda1327fb073c256e700ee14 SHA256 a441179d3f09c7faca63ccf85cd84ad64d117835ad925f33b0fcbc882ed9c827
@@ -17,21 +17,17 @@ AUX tetex-3.0_p1-t1lib-SA26241_buffer_overflow.patch 627 RMD160 9c4b663fa960bbac
 AUX texmf-update 2083 RMD160 4f31819f7389c0da09c8f298a788c38be42f58c9 SHA1 5cc2f572ce3bb8450b04731e6ed405b4be32981c SHA256 362506e23e77cf51e2c42738693ac36a323cdb69cb134a62468e959b7012df61
 AUX xpdf-3.02pl2.patch 15838 RMD160 7a2a6ad90450cc66afa5d7ed9ec3c4a705b8e6e6 SHA1 30824919b4482cff625daa2dc789c8a619d59308 SHA256 5c78443b0c87ed16e214964428a4523b8ebbcdf1e7ace00a021ae5e4e94f457f
 DIST ptetex-cmap-20051117.tar.gz 4061363 RMD160 a9b4468979efc8b65161ce7deb7cd00d93dfff06 SHA1 a6f406c519da7c6b866c3c578d06d8b9b817087d SHA256 34e50c63cba5aa1abfb1e4eece95aff9845c0f0c3115b65807670a2579a5a032
+DIST ptetex-cmap-20090506.tar.gz 3506102 RMD160 38a82a3b3eb625bbb959500a2a1e1e3e930ee498 SHA1 0e27aa14fdece2f14604e2c594928d3c1efa9d95 SHA256 97bd8bc0107c6038ba8a921d17ed4074c602fecaf94ee0b87177692ad9b8027b
 DIST ptetex3-20071203.tar.gz 6210522 RMD160 4e4719d81218eb6dfabbb5aab68b21f4a1a54cbd SHA1 79aa0bef26c2ef3c1c2a3093a1363976ca48dabb SHA256 f407ef36b174e23e0a8cbd904ac159348f9cebe958b33c5dff389cc9810d4203
 DIST ptetex3-20080128.tar.gz 6234542 RMD160 452444d1661844064150dd5eedf3527cf73f795d SHA1 383523ad038700494dc37736e37533eb08f1716f SHA256 79d3288ff81d7ee16d8ffba30ad86d2275893818ef02039ae06516c40920bb3e
 DIST ptetex3-20080414.tar.gz 6287829 RMD160 e17ad4e53ff272f96e558a5ab705e2e15db74ad9 SHA1 98f70e8a8eda65f0dd2ba6c8b78da052f92c2b46 SHA256 4cf7d9defbc0349b97af0abc9a0fba038b0e095fe65033d6b82e84726927f8e1
+DIST ptetex3-20090610.tar.gz 6502684 RMD160 e14fb24175d674755bcfd99a3ca9e806577434de SHA1 23294bfa0615dd771b0bf333d9535f4c95a65be0 SHA256 5e4e17b91009f5301ef4b4442c417a6909ac1c2aa48f269466eedf49301a9757
 DIST ptex-3.1.10_p20071122-dviljk-security-fixes.patch.bz2 8739 RMD160 7a63ebf1ebce0dbd7d48d9dbef2ea663ba187871 SHA1 9dad652088e93a5a6924460bd6c60efe88e9e80b SHA256 af6b92ee2640e754fc3e0b55e8aa7c8436d655f0d38e5afdd3badf5ee5f55c93
 DIST tetex-src-3.0.tar.gz 12749314 RMD160 15a139f5f36993e4ed3583260e175cfb13ce7bcc SHA1 7637789f7f4929694aed1b89820f5bad4753e8fc SHA256 9c0f7eaeb5ba6dc6f66433404d264941bf95cded2fa798b1f7a9dd580c21649b
 DIST tetex-texmf-3.0po.tar.gz 91402377 RMD160 a1e87733fa3cbef04e39a690ed8549aeaaddb241 SHA1 1be97f57a26a6e9b72ebfd932e45914a959aff16 SHA256 6c3b8fa619749cbb28ca0f8847e56773d13e0bb92f1ea34287420950373640c2
 EBUILD ptex-3.1.10_p20071203.ebuild 7837 RMD160 c5637d155307bcac3726b05d37bbbe9a8068bdd5 SHA1 8cfa9ba8e4c4fc10d9d1ba94d7f0f11bb56823f6 SHA256 bc12e8ab650d55b10e310d00f723a8dfa5fbd972f2d037c726e6ef673d23010c
 EBUILD ptex-3.1.10_p20080128.ebuild 7910 RMD160 553c85eb6979c0d27dd2e61d7eac548c93f4ebf8 SHA1 9ef2a95834a503a6f826903f8b85f459bfaf0fac SHA256 72989b0576cff4643a45cfd4bbc652ea473aaf9888c21383d59f52018440088f
 EBUILD ptex-3.1.10_p20080414.ebuild 7910 RMD160 ff9bf6de74d91002a85fbeac6d2b61d002dcd742 SHA1 d513acb09f18dab30159809e2b8ff7e2fd4d566a SHA256 61a0b71e18995a54dfde11a095e143b177f788bd0fe948dc1499eab5901e1073
-MISC ChangeLog 13802 RMD160 c47b1aebbc2047d6048cb3a46bb81b8e20a8501d SHA1 e3fb572cfc73de981aaeba8b5f9aafb429b2f8ea SHA256 4fc03fb5cb8f5c6d6f2e45ac5f4dfe365a976b5f275df702790a8f9859044759
+EBUILD ptex-3.1.10_p20090610.ebuild 8218 RMD160 9daf425df790a8f1391a2261e36c9ef9c5e87eea SHA1 cc4499791a965a02644eddafebed69f50676c5f3 SHA256 488bd25074e0806f624dea2fa1428ffadf9ac728092e3fede1ac0e752e293dea
+MISC ChangeLog 14099 RMD160 666375fc775fabcacc55091450574f9203654926 SHA1 be70191977afd1e4181828eb105a38848edcc1f0 SHA256 f12274206a50c2e85728fcc36d481f2520e06fbfa8c921724b63c0d183fcd120
 MISC metadata.xml 450 RMD160 910d918b9fe476cdb72c633a1c5532549d3f6114 SHA1 33ca5b367c7d2f1d470d8c18afc11230b501da89 SHA256 b9d2baa3e5a641dd35a68feed6752e874b2131480d63989ef5830080a942608b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkkLc/cACgkQOeoy/oIi7uxdGgCfeGUjrlNUU3p/7YMcRfRdXPKF
-//cAoNQwWMVLicREGrZR3idYnEk0v5N0
-=Brtz
------END PGP SIGNATURE-----
diff --git a/app-text/ptex/files/CVE-2009-1284.patch b/app-text/ptex/files/CVE-2009-1284.patch
new file mode 100644
index 000000000000..3e5b7f791500
--- /dev/null
+++ b/app-text/ptex/files/CVE-2009-1284.patch
@@ -0,0 +1,18 @@
+--- tetex-src-3.0.orig/texk/web2c/bibtex.ch	2004-07-15 02:32:51.000000000 +0900
++++ tetex-src-3.0/texk/web2c/bibtex.ch	2009-09-30 08:11:22.000000000 +0900
+@@ -1077,6 +1077,15 @@
+ @y
+ @z
+ 
++% Forgot to check for pool overflow here.  Triggered by test case linked
++% from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520920.
++@x
++while (sp_ptr < sp_end) do                      {shift the substring}
++@y
++str_room(sp_end - sp_ptr);
++while (sp_ptr < sp_end) do                      {shift the substring}
++@z
++
+ % [459] Eliminate unreferenced statement label, because `undefined' is
+ % now a constant expression that is not evaluated at the Web level. If
+ % this label were ever required, it could be replaced by the constant
diff --git a/app-text/ptex/files/ptex-3.1.10_p20090610-gentoo.patch b/app-text/ptex/files/ptex-3.1.10_p20090610-gentoo.patch
new file mode 100644
index 000000000000..75c199523943
--- /dev/null
+++ b/app-text/ptex/files/ptex-3.1.10_p20090610-gentoo.patch
@@ -0,0 +1,133 @@
+--- ptetex3-20090610.orig/2extract-src.sh       2009-06-07 10:00:07.000000000 +0200
++++ ptetex3-20090610/2extract-src.sh    2009-09-16 08:05:52.000000000 +0200
+@@ -147,25 +147,25 @@
+     $MKDIR $SRC/texk/pdvipsk
+     $CP $SRC/texk/dvipsk/* $SRC/texk/pdvipsk/ 2> /dev/null
+     tarcp $SRC/texk/xdvik $SRC/texk/pxdvik
+-    P=p
++    DVIPSK_P=p
+ fi # "$JAPANESE" = "international"
+ ## for dvipsk
+-#tarx archive/dvipsk-jpatch-p*.tar.gz         $SRC/texk/${P}dvipsk
+-#cpatch $SRC/texk/${P}dvipsk/dvipsk-*.patch 1 $SRC/texk/${P}dvipsk
+-tarx archive/dvipsk-*-p*.tar.gz              $SRC/texk/${P}dvipsk
+-cpatch $SRC/texk/${P}dvipsk/dvipsk-*.diff 1  $SRC/texk/${P}dvipsk
+-perlprint 's/^kpse_include/ac_include/g'     $SRC/texk/${P}dvipsk/Makefile.in
++#tarx archive/dvipsk-jpatch-p*.tar.gz         $SRC/texk/${DVIPSK_P}dvipsk
++#cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-*.patch 1 $SRC/texk/${DVIPSK_P}dvipsk
++tarx archive/dvipsk-*-p*.tar.gz              $SRC/texk/${DVIPSK_P}dvipsk
++cpatch $SRC/texk/${DVIPSK_P}dvipsk/dvipsk-*.diff 1  $SRC/texk/${DVIPSK_P}dvipsk
++perlprint 's/^kpse_include/ac_include/g'     $SRC/texk/${DVIPSK_P}dvipsk/Makefile.in
+
+ ## for xdvik
+-zpatch archive/xdvik-200?????-tetex-3.0.diff.gz 3 $SRC/texk/${P}xdvik
++zpatch archive/xdvik-200?????-tetex-3.0.diff.gz 3 $SRC/texk/${DVIPSK_P}xdvik
+ # fix for FC5
+ perlprint 'print "#define NeedWidePrototypes 1\n" if /limits/' \
+-    $SRC/texk/${P}xdvik/xdvi.h
++    $SRC/texk/${DVIPSK_P}xdvik/xdvi.h
+ # pTeX fontmap
+ perlnoprint "s/^ptexmap .*/ptexmap kanjix.map/; print unless /IPA/" \
+-    $SRC/texk/${P}xdvik/texmf/xdvi.cfg
++    $SRC/texk/${DVIPSK_P}xdvik/texmf/xdvi.cfg
+ # adjust X resource
+-cat <<EOF >> $SRC/texk/${P}xdvik/texmf/XDvi || exit 1
++cat <<EOF >> $SRC/texk/${DVIPSK_P}xdvik/texmf/XDvi || exit 1
+
+
+ !!! ------- added by ptetex3 -------
+--- ptetex3-20090610.orig/4make-install.sh      2009-05-04 18:35:49.000000000 +0200
++++ ptetex3-20090610/4make-install.sh   2009-09-16 08:40:47.000000000 +0200
+@@ -44,11 +44,9 @@
+
+ echo "[--tetex--] configure"
+ cd $SRC || exit
+-$MKDIR $PREFIX/share/texmf 2> /dev/null # avoid warning of texmf tree
+ ./configure --prefix=$PREFIX --datadir=$DATADIR \
+     --disable-multiplatform --with-ptexenc=$KANJI_CODE \
+     $CONF_OPTION || exit
+-$RMDIR $PREFIX/share/texmf 2> /dev/null # avoid warning of texmf tree
+ xdvi_check
+ echo "[--tetex--] make"
+ $MAKE $MAKE_OPTION || exit
+diff -Naur ptetex3-20090610.orig/7font-search.sh ptetex3-20090610/7font-search.sh
+--- ptetex3-20090610.orig/7font-search.sh	2008-04-14 18:07:04.000000000 +0900
++++ ptetex3-20090610/7font-search.sh	2008-05-10 09:36:33.000000000 +0900
+@@ -58,6 +58,17 @@
+     done
+ }
+ 
++mksymlink_gentoo(){
++    $MKDIR $TRUETYPE
++    fonts_dir=/usr/share/fonts/
++    find $fonts_dir -maxdepth 1 -mindepth 1 -type d | while read font_path; do
++	if [ `find $font_path -maxdepth 1 -type f -iname '*.ttf' | wc -l` -gt 0 ]; then
++	    font_name=${font_path/$fonts_dir/}
++	    test -h ${TRUETYPE}/${font_name} && continue
++	    $LN "${font_path}" "${TRUETYPE}/${font_name}"
++	fi
++    done
++}
+ 
+ setrmlgbm() {
+     if test -n "$2"; then
+@@ -111,10 +122,10 @@
+ 
+ mksymlink $CMAP <<EOF
+ ### リンク名  検索ディレクトリ/ファイル
+-Acrobat4    /usr{,/local,/sfw}{,/lib}/Acrobat4/Resource/CMap
+-Acrobat5    /usr{,/local,/sfw}{,/lib}/Acrobat5/Resource/Font
+-Acrobat7    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat7.0/Resource/CMap
+-Acrobat8    /usr{,/local,/sfw}{,/lib}{,/Adobe}/Acrobat8.0/Resource/CMap
++Acrobat4    {/opt,/usr{,/local,/sfw}{,/lib}}/Acrobat4/Resource/CMap
++Acrobat5    {/opt,/usr{,/local,/sfw}{,/lib}}/Acrobat5/Resource/Font
++Acrobat7    {/opt,/usr{,/local,/sfw}{,/lib}}{,/Adobe}/Acrobat7{,.0}/Resource/CMap
++Acrobat8    {/opt,/usr{,/local,/sfw}{,/lib}}{,/Adobe}/{Acrobat,Reader}8{,.0}/Resource/CMap
+ ghostscript /usr{,/local,/sfw}/{share,lib}/ghostscript{,/*}/Resource/CMap
+ openwinja   /usr/openwin/lib/locale/ja/X11/Resource/CMap
+ openwinko   /usr/openwin/lib/locale/ko/X11/Resource/CMap
+@@ -122,21 +133,7 @@
+ openwintw   /usr/openwin/lib/locale/zh_TW.BIG5/X11/Resource/CMap
+ EOF
+ 
+-mksymlink $TRUETYPE <<EOF
+-### リンク名  検索ディレクトリ/ファイル
+-x11       /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/truetype
+-X11       /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/TrueType
+-X11TTF    /usr{,/local,/X11R6,/pkg}/lib/X11/fonts/TTF
+-truetype  /usr{,/local}/share/fonts/truetype
+-TrueType  /usr{,/local}/share/fonts/TrueType
+-TTF	  /usr{,/local}/share/fonts/TTF
+-ja        /usr{,/local}/share/fonts/ja/TrueType
+-japanese  /usr{,/local}/share/fonts/japanese/TrueType
+-openwin   /usr/openwin/lib/locale/ja/X11/fonts/TT
+-QtPalmtop /opt/QtPalmtop/lib/X11/fonts/TrueType
+-f8sazanami-min  /usr/share/fonts/sazanami-fonts-mincho
+-f8sazanami-goth /usr/share/fonts/sazanami-fonts-gothic
+-EOF
++mksymlink_gentoo
+ 
+ mksymlink $OPENTYPE <<EOF
+ ### リンク名  検索ディレクトリ/ファイル
+diff -Naur ptetex3-20090610.orig/common.sh ptetex3-20090610/common.sh
+--- ptetex3-20090610.orig/common.sh	2008-04-05 17:51:07.000000000 +0900
++++ ptetex3-20090610/common.sh	2008-05-10 09:47:00.000000000 +0900
+@@ -220,12 +220,12 @@
+ 	echo "You are root."
+ 	echo "It is RECOMMENDED to execute by a user."
+ 	echo "Executing by root may cause SERIOUS DAMAGE for your system."
+-	echo -n "Are you sure to execute by root AT YOUR OWN RISK? (yes/NO) "
+-	read REPLY
+-	case $REPLY in
+-	    yes) ;;
+-	    *) exit 1;;
+-	esac
++#	echo -n "Are you sure to execute by root AT YOUR OWN RISK? (yes/NO) "
++#	read REPLY
++#	case $REPLY in
++#	    yes) ;;
++#	    *) exit 1;;
++#	esac
+     fi
+ }
+ 
diff --git a/app-text/ptex/files/ptex-3.1.10_p20090610-getline.patch b/app-text/ptex/files/ptex-3.1.10_p20090610-getline.patch
new file mode 100644
index 000000000000..1a570cbce6fc
--- /dev/null
+++ b/app-text/ptex/files/ptex-3.1.10_p20090610-getline.patch
@@ -0,0 +1,84 @@
+diff -Naur tetex-src-3.0.orig/texk/dvipsk/afm2tfm.c tetex-src-3.0/texk/dvipsk/afm2tfm.c
+--- tetex-src-3.0.orig/texk/dvipsk/afm2tfm.c	2005-01-30 22:17:09.000000000 +0900
++++ tetex-src-3.0/texk/dvipsk/afm2tfm.c	2009-09-29 08:47:30.000000000 +0900
+@@ -257,7 +257,7 @@
+ }
+ 
+ int
+-getline P1H(void) {
++_getline P1H(void) {
+    register char *p ;
+    register int c ;
+ 
+@@ -606,7 +606,7 @@
+    ai = newchar() ;
+    ai->adobenum = -1 ;
+    ai->adobename = "||" ; /* boundary character name */
+-   while (getline()) {
++   while (_getline()) {
+       switch(interest(paramstring())) {
+ case FontName:
+          fontname = paramnewstring() ;
+@@ -1882,7 +1882,7 @@
+ 
+    while (1) {
+       while (param == 0 || *param == 0) {
+-         if (getline() == 0)
++         if (_getline() == 0)
+             error("! premature end in encoding file") ;
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+@@ -1973,7 +1973,7 @@
+       p = gettoken() ;
+       if (strcmp(p, "]"))
+          error("! token 258 in encoding must be make-array (])") ;
+-      while (getline()) {
++      while (_getline()) {
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+                if (ignoreligkern == 0)
+diff -Naur tetex-src-3.0.orig/texk/web2c/cpascal.h tetex-src-3.0/texk/web2c/cpascal.h
+--- tetex-src-3.0.orig/texk/web2c/cpascal.h	2004-08-29 05:49:59.000000000 +0900
++++ tetex-src-3.0/texk/web2c/cpascal.h	2009-09-29 23:09:57.000000000 +0900
+@@ -14,6 +14,7 @@
+ 
+ /* We must include this first, to resolve many C issues.  */
+ #include "config.h"
++#define getline _getline
+ 
+ /* We only use getopt in the applications, not in web2c itself.  */
+ #include <kpathsea/getopt.h>
+diff -Naur tetex-src-3.0.orig/texk/web2c/mpware/mpto.c tetex-src-3.0/texk/web2c/mpware/mpto.c
+--- tetex-src-3.0.orig/texk/web2c/mpware/mpto.c	2004-07-15 02:40:35.000000000 +0900
++++ tetex-src-3.0/texk/web2c/mpware/mpto.c	2009-09-29 23:09:35.000000000 +0900
+@@ -95,7 +95,7 @@
+ 	exit(1);
+ }
+ 
+-char *getline()	/* returns NULL on EOF or error, otherwise buf */
++char *_getline()	/* returns NULL on EOF or error, otherwise buf */
+ {
+ 	int c;
+ 	unsigned loc = 0;
+@@ -203,10 +203,10 @@
+ 
+ 	while (*aa==' ' || *aa=='\t') aa++;
+ 	if (*aa==0)
+-		if ((aa=getline())==NULL)
++		if ((aa=_getline())==NULL)
+ 			err("btex section does not end");
+ 	do {	if (*aa==0)
+-			if ((aa=getline())==NULL)
++			if ((aa=_getline())==NULL)
+ 				err("btex section does not end");
+ 			else printf("\n");
+ 		if (getbta(aa) && *tt=='e') {
+@@ -372,7 +372,7 @@
+           postverb = troff_postverb;
+ 	}
+ 	printf("%s",predoc);
+-	while (getline()!=NULL)
++	while (_getline()!=NULL)
+ 		do_line();
+ 	printf("%s",postdoc);
+         free(buf);
diff --git a/app-text/ptex/ptex-3.1.10_p20090610.ebuild b/app-text/ptex/ptex-3.1.10_p20090610.ebuild
new file mode 100644
index 000000000000..df2747d22d7a
--- /dev/null
+++ b/app-text/ptex/ptex-3.1.10_p20090610.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ptex/ptex-3.1.10_p20090610.ebuild,v 1.1 2009/09/30 14:25:02 matsuu Exp $
+
+# jmbreuer FOR DEV ONLY
+RESTRICT="mirror test"
+
+TETEX_PV=3.0_p1
+
+inherit eutils tetex-3 flag-o-matic autotools multilib
+
+SMALL_PV="${TETEX_PV/_p*}"
+TETEX_TEXMF_PV="${SMALL_PV}"
+TETEX_S="${WORKDIR}/tetex-src-${SMALL_PV}"
+
+DESCRIPTION="TeX distribution teTeX with Japanese patch collection 'ptetex3'"
+HOMEPAGE="http://www.nn.iij4u.or.jp/~tutimura/tex/ptetex.html"
+
+TETEX_SRC="tetex-src-${SMALL_PV}.tar.gz"
+TETEX_TEXMF="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}"
+TETEX_TEXMF_SRC="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}po.tar.gz"
+PTETEX="ptetex3-${PV/*_p}"
+PTETEX_CMAP="ptetex-cmap-20090506"
+
+SRC_PATH_TETEX="http://www.ctan.org/tex-archive/obsolete/systems/unix/teTeX/3.0/distrib"
+SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
+	${SRC_PATH_TETEX}/${TETEX_TEXMF_SRC}
+	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex3/${PTETEX}.tar.gz
+	http://tutimura.ath.cx/~nob/tex/ptetex/ptetex-cmap/${PTETEX_CMAP}.tar.gz
+	mirror://gentoo/${PN}-3.1.10_p20071122-dviljk-security-fixes.patch.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+BUILD_DIR="${WORKDIR}/build/usr"
+
+LICENSE="GPL-2 BSD"
+IUSE="X motif Xaw3d neXt iconv unicode"
+
+RDEPEND="!app-text/tetex
+	!<app-text/ptetex-3.1.9
+	!app-text/dvipdfmx
+	!app-text/xdvik
+	!dev-texlive/texlive-basic
+	!dev-texlive/texlive-latex
+	!dev-texlive/texlive-latexrecommended
+	media-libs/t1lib
+	media-libs/gd
+	X? (
+		>=media-libs/freetype-2.3.4
+		|| (
+			media-fonts/ja-ipafonts
+			media-fonts/ipamonafont
+			media-fonts/vlgothic
+			media-fonts/sazanami
+			media-fonts/kochi-substitute
+		)
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PTETEX}"
+
+src_unpack() {
+	mkdir -p "${WORKDIR}/${TETEX_TEXMF}"
+	cd "${WORKDIR}/${TETEX_TEXMF}"
+	unpack ${TETEX_TEXMF_SRC}
+	cd "${WORKDIR}"
+	unpack ${TETEX_SRC}
+	cd "${WORKDIR}"
+	unpack ${PN}-3.1.10_p20071122-dviljk-security-fixes.patch.bz2
+	unpack ${PTETEX}.tar.gz
+	unpack ${PTETEX_CMAP}.tar.gz
+	echo ">>> Unpacking jis and morisawa fonts ..."
+	tar xzf "${WORKDIR}"/${PTETEX}/archive/jis.tar.gz -C "${WORKDIR}" || die
+	tar xzf "${WORKDIR}"/${PTETEX}/archive/morisawa.tar.gz -C "${WORKDIR}" || die
+
+	# Gentoo box reserves variable ${P}!!
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	cat <<EOF > "${S}"/my_option
+SRC_DIR="${WORKDIR}"
+TMP_PREFIX="${BUILD_DIR}"
+PREFIX=/usr
+DATADIR=/usr/share
+TEXMFDIST="${WORKDIR}/${TETEX_TEXMF}"
+TEXSRC_EXTRACTED="${WORKDIR}"
+#make_option vartexfonts=/var/lib/texmf
+make_option vartexfonts="${T}/texfonts"
+make_option CC="$(tc-getCC)"
+make_option CXX="$(tc-getCXX)"
+JAPANESE=international
+XDVI=echo
+PXDVI=echo
+PLATEX209=no
+STRIP=no
+conf_option --without-dviljk
+conf_option --without-dvipng
+conf_option --without-info
+conf_option --without-texi2html
+conf_option --without-texinfo
+
+conf_option --with-system-zlib
+conf_option --with-system-pnglib
+conf_option --with-system-gd
+conf_option --with-system-ncurses
+conf_option --with-system-t1lib
+conf_option --enable-shared
+EOF
+
+	if use iconv ; then
+		echo "conf_option --enable-kanji-iconv" >> "${S}"/my_option
+	fi
+
+	if use unicode ; then
+		echo "KANJI_CODE=UTF8" >> "${S}"/my_option
+	else
+		echo "KANJI_CODE=EUC" >> "${S}"/my_option
+	fi
+
+	# copied from tetex-3.eclass and modified
+	if use X ; then
+		if use motif ; then
+			toolkit="motif"
+		elif use neXt ; then
+			toolkit="neXtaw"
+		elif use Xaw3d ; then
+			toolkit="xaw3d"
+		else
+			toolkit="xaw"
+		fi
+		echo "export CPPFLAGS=\"${CPPFLAGS} $(freetype-config --cflags)\"" >> "${S}"/my_option
+		echo "export LDFLAGS=\"${LDFLAGS} $(freetype-config --libs)\"" >> "${S}"/my_option
+		echo "conf_option --with-xdvi-x-toolkit=${toolkit}" >> "${S}"/my_option
+	else
+		echo "conf_option --without-x" >> "${S}"/my_option
+		echo "conf_option --without-xdvik" >> "${S}"/my_option
+		echo "conf_option --without-pxdvik" >> "${S}"/my_option
+	fi
+
+	cd "${S}"
+	unset TEXMFMAIN TEXMF HOME
+	emake -j1 x || die "emake x failed"
+
+	cd "${TETEX_S}"
+
+	epatch "${FILESDIR}/tetex-${SMALL_PV}-kpathsea-pic.patch"
+
+	# bug 85404
+	epatch "${FILESDIR}/${PN}-3.1.10_p20071122-epstopdf-wrong-rotation.patch"
+
+	# ptetex included
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-amd64-xdvik-wp.patch"
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-mptest.patch"
+
+	#bug 98029
+	# no need
+	#epatch "${FILESDIR}/${PN}-3.1.10_p20071122-fmtutil-etex.patch"
+
+	#bug 115775
+	# ptex included
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-xpdf-vulnerabilities.patch"
+
+	# bug 94860
+	epatch "${FILESDIR}/${PN}-3.1.10_p20071122-pdftosrc-install.patch"
+
+	# bug 126918
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-create-empty-files.patch"
+
+	# bug 94901
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-dvipdfm-timezone.patch"
+
+	# security bug #170861
+	# ptetex included
+	# epatch "${FILESDIR}/tetex-${TETEX_PV}-CVE-2007-0650.patch"
+
+	# security bug #188172
+	# ptetex included
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-xpdf-CVE-2007-3387.patch"
+
+	# security bug #198238
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-dvips_bufferoverflow.patch"
+
+	# securty bug #196735
+	epatch "${FILESDIR}/xpdf-3.02pl2.patch"
+
+	# Construct a Gentoo site texmf directory
+	# that overlays the upstream supplied
+	# target not found
+	#epatch "${FILESDIR}/tetex-${TETEX_PV}-texmf-site.patch"
+
+	# security bug #198238
+	epatch "${WORKDIR}/${PN}-3.1.10_p20071122-dviljk-security-fixes.patch"
+
+	# security bug #198238 and bug #193437
+	epatch "${FILESDIR}/tetex-${TETEX_PV}-t1lib-SA26241_buffer_overflow.patch"
+
+	# security bug #282874
+	epatch "${FILESDIR}/CVE-2009-1284.patch"
+
+	epatch "${FILESDIR}/${P}-getline.patch"
+
+	cd "${TETEX_S}/texk/dviljk"
+	eautoreconf
+}
+
+src_compile() {
+	unset TEXMFMAIN TEXMF HOME
+
+	emake -j1 c || die "emake c failed"
+	emake -j1 macro || die "emake macro failed"
+	emake -j1 otf || die "emake otf failed"
+	emake -j1 fonty || die "emake fonty failed"
+	emake -j1 babel || die "emake babel failed"
+
+	einfo "Setting ptetex-cmap ..."
+	cd "${WORKDIR}/${PTETEX_CMAP}"
+	PATH="${BUILD_DIR}/bin:${PATH}" \
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	TEXMFMAIN="${BUILD_DIR}/share/texmf" \
+		./setup.sh "${BUILD_DIR}"/share/texmf/fonts/cmap
+}
+
+src_test() {
+	PATH="${BUILD_DIR}/bin:${PATH}" \
+	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	TEXMFMAIN="${BUILD_DIR}/share/texmf" \
+		emake -j1 test || die "emake test failed"
+}
+
+src_install() {
+	einfo "Installing ptetex3 binaries ..."
+	dobin "${BUILD_DIR}"/bin/*
+	dolib "${BUILD_DIR}"/lib/*
+
+	einfo "Installing /usr/include/* files ..."
+	insinto /usr/include
+	doins -r "${BUILD_DIR}"/include/*
+
+	einfo "Installing /usr/share/* files ..."
+	insinto /usr/share
+	cp -dr "${BUILD_DIR}"/share/* "${D}"/usr/share
+
+	einfo "Installing document files ..."
+	doman "${BUILD_DIR}"/man/*/*
+	doinfo "${BUILD_DIR}"/info/*
+
+	einfo "Installing jis and morisawa fonts ..."
+	insinto /usr/share/texmf/fonts/tfm
+	doins -r "${WORKDIR}"/jis/tfm/*        || die "installing jis/tfm failed"
+	doins -r "${WORKDIR}"/morisawa/tfm/*   || die "installing morisawa/tfm failed"
+
+	einfo "Installing texmf files ..."
+	find "${WORKDIR}"/${TETEX_TEXMF} -maxdepth 1 -mindepth 1 -type f | xargs rm -f
+	insinto /usr/share/texmf
+	doins -r "${WORKDIR}"/${TETEX_TEXMF}/*
+
+	einfo "Installing other files ..."
+	insinto /usr/share/texmf/fonts/map/dvips/tetex
+	insinto /usr/share/texmf/web2c
+	doins -r "${BUILD_DIR}"/share/texmf-var/web2c/*.fmt
+
+	einfo "Removing unnecessary files ..."
+	rm -r "${D}"/usr/share/texmf/doc
+	rm -r "${D}"/usr/share/texmf/web2c/texmf.cnf.*
+	rm -r "${D}"/usr/share/texmf/web2c/fmtutil.cnf.*
+	find "${D}"/usr/share/texmf | grep "ls-R" | xargs rm -f
+
+	einfo "Installing texmf-update scripte ..."
+	dosbin "${FILESDIR}"/texmf-update
+
+	dodoc ChangeLog* README*
+}
+
+pkg_postinst() {
+	tetex-3_pkg_postinst
+
+	elog
+	elog "Japanese dvips and xdvi have been renamed to pdvipsk and pxdvik."
+	elog
+	elog "To use proper Japanese font in dvips/dvipdfmx/xdvi/pdftex, you"
+	elog "needs to run updmap or updmap-sys w/ map. More deteil info about"
+	elog "this fonts central configuration can be available at following"
+	elog "ptetex Wiki:"
+	elog " http://tutimura.ath.cx/ptetex/?%A5%D5%A5%A9%A5%F3%A5%C8%A4%CE%BD%B8%C3%E6%B4%C9%CD%FD"
+	elog
+}