[gentoo-commits] gentoo-x86 commit in app-text/ptex/files: ptex-3.1.10_p20090610-gentoo.patch ptex-3.1.10_p20090610-getline.patch CVE-2009-1284.patch

[Matsuu Takuto (matsuu)]

matsuu      09/09/30 14:25:01

  Added:                ptex-3.1.10_p20090610-gentoo.patch
                        ptex-3.1.10_p20090610-getline.patch
                        CVE-2009-1284.patch
  Log:
  Fixed #126092, #223793, #226877, #284825 and #282874.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-text/ptex/files/ptex-3.1.10_p20090610-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/ptex/files/ptex-3.1.10_p20090610-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/ptex/files/ptex-3.1.10_p20090610-gentoo.patch?rev=1.1&content-type=text/plain

Index: ptex-3.1.10_p20090610-gentoo.patch
===================================================================
--- 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
 }
 



1.1                  app-text/ptex/files/ptex-3.1.10_p20090610-getline.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/ptex/files/ptex-3.1.10_p20090610-getline.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/ptex/files/ptex-3.1.10_p20090610-getline.patch?rev=1.1&content-type=text/plain

Index: ptex-3.1.10_p20090610-getline.patch
===================================================================
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);



1.1                  app-text/ptex/files/CVE-2009-1284.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/ptex/files/CVE-2009-1284.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/ptex/files/CVE-2009-1284.patch?rev=1.1&content-type=text/plain

Index: CVE-2009-1284.patch
===================================================================
--- 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