Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs17:/tmp/cvs-serv20023/main/finkinfo/text
Modified Files:
Tag: pangocairo-branch
ptex-base.info ptex.info tex4ht.info
Log Message:
mege from head
Index: ptex-base.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/ptex-base.info,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -d -r1.2.2.7 -r1.2.2.8
--- ptex-base.info 18 Sep 2007 00:27:42 -0000 1.2.2.7
+++ ptex-base.info 28 Sep 2007 16:34:32 -0000 1.2.2.8
@@ -1,9 +1,8 @@
Info2: <<
Package: ptex%type_pkg[-nox]-base
Type: -nox (boolean)
-Version: 3.1.9
-# ptex-3.1.10-Beta3
-Revision: 1066
+Version: 3.1.10
+Revision: 1002
GCC: 4.0
Description: ASCII publishing TeX
BuildDepends: <<
@@ -21,8 +20,9 @@
Source2: http://tutimura.ath.cx/~nob/tex/ptetex/ptetex3/ptetex3-20070426.tar.gz
Source2-MD5: 916cded5cf485e1afe03cf2353a449e1
Tar2FilesRename: ptetex3-20070426:ptetex3
-Source3:
http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/tetex-3.0-CVE-2007-0650.patch
-Source3-MD5: 8c2f3c2c87a5ec82869059df57af27c8
+Source3:
http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/tetex-3.0-security-200709.tar.bz2
+Source3-MD5: 461b069855d8c2852c647ebe44f7e1af
+Tar3FilesRename: tetex-3.0-security-200709:tetex-3.0-security
Source4:
ftp://ftp.riken.go.jp/pub/Linux/gentoo/app-text/tetex/files/tetex-3.0-epstopdf-wrong-rotation.patch
Source4-MD5: b15d18a85d673070c4b9ac48ebc586ed
Source5:
ftp://ftp.riken.go.jp/pub/Linux/gentoo/app-text/tetex/files/tetex-3.0_p1-dvipdfm-timezone.patch
@@ -36,8 +36,14 @@
perl -pi -e 's,-flat_namespace -undefined suppress,-twolevel_namespace
-undefined error,g' texk/configure texk/kpathsea/configure
utils/texinfo/configure
perl -pi -e 's,\*\.obj\),*.obj | *.dSYM),' texk/configure
texk/kpathsea/configure utils/texinfo/configure
+ # Fix xpdf overflows CVE-2005-3193 (impoted from tetex-3.0-20.fc5)
+ patch -p1 < ../tetex-3.0-security/tetex-3.0-CVE-2005-3193.patch
+
+ # Fix xpdf integer overflow CVE-2007-3387 (imported from tetex-3.0-40.1.fc7)
+ patch -p1 < ../tetex-3.0-security/tetex-3.0-CVE-2007-3387.patch
+
# Fix overflows in makeindex CVE-2007-0650 (impoted from tetex-3.0-34.fc6)
- patch -p1 < ../tetex-3.0-CVE-2007-0650.patch
+ patch -p1 < ../tetex-3.0-security/tetex-3.0-CVE-2007-0650.patch
# imported from http://bugs.gentoo.org/show_bug.cgi?id=85404
patch -p1 < ../tetex-3.0-epstopdf-wrong-rotation.patch
@@ -52,10 +58,12 @@
#################### Let's apply ptetex3 patches ####################
# 1. -dNOKANJI option is not needed
# 2. avoid conflict with the original tetex.patch
- # 3. skip md5sum checks
+ # 3. already applied above
+ # 4. skip md5sum checks
sed -i.bak \
-e 's/-dNOKANJI //' \
-e '/## use TEXMFMAIN/,/Makefile.in/d' \
+ -e 's/\(.*tetex-3.0-CVE-2005-3193.*\)/#\1/' \
-e '/## post/,$d' ../ptetex3/2extract-src.sh
# not to extract teTeX src (already extracted) and use system's freetype2.
Index: tex4ht.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tex4ht.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- tex4ht.info 20 Jan 2006 20:32:31 -0000 1.1
+++ tex4ht.info 28 Sep 2007 16:34:32 -0000 1.1.2.1
@@ -1,19 +1,14 @@
Package: tex4ht
-Version: 20050816
-Revision: 2
+Version: 20070918
+Revision: 1
Depends: ghostscript | ghostscript-nox, tetex-base, imagemagick (>= 5.4.5-2)
-BuildDepends: libjpeg, libpng3, libtiff, libxml2, gdbm, expat, tcltk-dev,
libkpathsea4
-#Source:http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/%n.tar.gz
-#Source: http://www.cse.ohio-state.edu/~gurari/TeX4ht/%n-%v.zip
-#SourceRename: %n-%v.tar.gz
-Source: http://perso.wanadoo.fr/costabel/%n-%v.tar.gz
-SourceDirectory: %n-1.0.2005_08_16_2117
+BuildDepends: libjpeg, libpng3, libtiff, libxml2, gdbm, expat1, tcltk-dev,
libkpathsea4
+Source:http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/%n-1.0.2007_09_18_1138.tar.gz
Source2: http://www.latex-project.org/lppl/lppl-1-3a.txt
-Source-MD5: 2b7e87c246e94acdd6cafd25e9c2fa75
+Source-MD5: c86d70ee387bd802a595604720989562
Source2-MD5: d8418ee9cb69385dac8a7b5cc0181469
-Patch: %n.patch
PatchScript: <<
-#!/bin/sh
+#!/bin/sh -ex
perl -pi -e '
s|~/tex4ht.dir/texmf/tex4ht/ht-fonts|%p/share/%n/ht-fonts|g
' bin/unix/* texmf/tex/generic/tex4ht/mkht-scripts.4ht
texmf/tex4ht/base/unix/tex4ht.env
Index: ptex.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/ptex.info,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -d -r1.6.2.5 -r1.6.2.6
--- ptex.info 3 May 2007 23:17:09 -0000 1.6.2.5
+++ ptex.info 28 Sep 2007 16:34:32 -0000 1.6.2.6
@@ -1,11 +1,10 @@
Info2: <<
Package: ptex%type_pkg[-nox]
Type: bundle, -nox (boolean)
-Version: 3.1.9
-# ptex-3.1.10-Beta3
-Revision: 1057
+Version: 3.1.10
+Revision: 1001
Description: Bundle package for ASCII publishing TeX
-Depends: ptex%type_pkg[-nox]-base (>= 3.1.9-1056), texinfo, debianutils,
texi2html, ptex-babel, utf-fontfiles, dvipdfmx (>= 20061211-1), okumura-clsfiles
+Depends: ptex%type_pkg[-nox]-base (>= 3.1.10-1001), texinfo, debianutils,
texi2html, ptex-babel, utf-fontfiles, dvipdfmx (>= 20061211-1), okumura-clsfiles
Conflicts: <<
system-tetex, tetex, tetex-nox, ptex, ptex-nox,
(%type_raw[-nox] = -nox) tetex-base (<= 2.0.2-24),
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
