Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=df143742b2a7ccfdeb5ca72a31dccdcd935ad944

commit df143742b2a7ccfdeb5ca72a31dccdcd935ad944
Author: Elentir <elen...@frugalware.org>
Date:   Thu Aug 18 12:24:52 2011 +0200

texlive-20110705-1-x86_64

* version bump

diff --git a/source/xapps-extra/texlive/FrugalBuild 
b/source/xapps-extra/texlive/FrugalBuild
index 1b72591..6a450cc 100644
--- a/source/xapps-extra/texlive/FrugalBuild
+++ b/source/xapps-extra/texlive/FrugalBuild
@@ -2,28 +2,28 @@
# Maintainer: Elentir <elen...@frugalware.org>

pkgname=texlive
-pkgver=20100722
-pkgrel=4
+pkgver=20110705
+pkgrel=1
pkgdesc="A complete TeX distribution"
archs=('i686' 'x86_64' 'ppc')
depends=('t1lib' 'gd' 'ncurses' 'poppler>=0.16.3' 'icu4c>=4.2')
-rodepends=('ghostscript')
+rodepends=('ghostscript' 'perl')
makedepends=('clisp' 'ffcall')
url='http://tug.org/texlive/'
-source=("ftp://tug.org/historic/systems/texlive/2010/$pkgname-$pkgver-source.tar.xz";
 \
-       
"ftp://tug.org/historic/systems/texlive/2010/$pkgname-$pkgver-texmf.tar.xz"; \
+source=("ftp://tug.org/historic/systems/texlive/2011/$pkgname-$pkgver-source.tar.xz";
 \
+       
"ftp://tug.org/historic/systems/texlive/2011/$pkgname-$pkgver-texmf.tar.xz"; \
fix-fontforge-encoding.patch \
texmf.cnf
09-texlive.conf)
-up2date="Flasttar ftp://tug.org/historic/systems/texlive/2010/ | sed 
's/-source//' | sed 's/_texmf//' | sed 's/_extra//'"
+up2date="Flasttar ftp://tug.org/historic/systems/texlive/2011/ | sed 
's/-source//' | sed 's/_texmf//' | sed 's/_extra//'"
groups=('xapps-extra')
conflicts=('tetex' 'tetex-kpathsea')
provides=('tetex' 'tetex-kpathsea')
replaces=('tetex' 'tetex-kpathsea')
-sha1sums=('c5573c0617f1a44235212277959f48fb76590542' \
-          'df6ba050970592f0f5f38cb9dd36d4d0d671fa80' \
+sha1sums=('7a47cfe847801c86c98da8ade181baf97339f6e4' \
+          'a01bb1ef0f68ffd80bab363e83aca032260e1b59' \
'5301263529702ccfda0adb3706f461888dea22eb' \
-          '98806c7e48db2da9ac9092d1e729b3bf316408df' \
+          'a58c7445f5544da89c13681e21f3b578727eb641' \
'bf7ba21d45bee78657105a5f2c5e7e24b8614859')
_F_cd_path="$pkgname-$pkgver-source"
Fconfopts="$Fconfopts \
@@ -93,7 +93,8 @@ build() {

## disable ptex from format list by default
Fsed "^ptex ptex - ptex.ini" "#ptex ptex - ptex.ini" 
../$pkgname-$pkgver-texmf/texmf/web2c/fmtutil.cnf
-       Fsed "^platex ptex language.ptx platex.ini" "#platex ptex language.ptx 
platex.ini" ../$pkgname-$pkgver-texmf/texmf/web2c/fmtutil.cnf
+       Fsed "^eptex eptex" "#eptex eptex" 
../$pkgname-$pkgver-texmf/texmf/web2c/fmtutil.cnf
+       Fsed "^platex eptex" "#platex eptex" 
../$pkgname-$pkgver-texmf/texmf/web2c/fmtutil.cnf

Fbuild --with-banner-add="/Frugalware Linux"

@@ -109,23 +110,21 @@ build() {

## TODO: Split the 800Mo of docs
rm -rf $Fsrcdir/$pkgname-$pkgver-texmf/texmf-dist/doc || Fdie
+
+       ## remove useless source files
rm -rf $Fsrcdir/$pkgname-$pkgver-texmf/texmf-dist/source || Fdie
rm -rf $Fsrcdir/$pkgname-$pkgver-texmf/texmf-dist/fonts/source || Fdie
# copy the extra packages
Fcp $pkgname-$pkgver-texmf/texmf/* usr/share/texmf/
Fcp $pkgname-$pkgver-texmf/texmf-dist/* usr/share/texmf-dist/

+       ## files for tlpkg required by updmap
+       Fmkdir /usr/share/tlpkg/
+       Fcp $pkgname-$pkgver-source/utils/biber/TeXLive /usr/share/tlpkg/
+
## install the config file with correct paths for kpathsea
Finstall 644 texmf.cnf usr/share/texmf/web2c/

-       # more than 800Mo of docs, I don't think we need it =)
-       Frm usr/share/texmf-dist/source
-       Frm usr/share/texmf-dist/fonts/source
-       Frm usr/share/texmf-dist/doc
-
-       # remove duplicate files
-       Frm usr/share/texmf/scripts/tex4ht
-
# fix the broken symlinks since texmf{-dist} has move
for f in $Fdestdir/usr/bin/* ; do
if [ -L $f ]; then
@@ -139,11 +138,15 @@ build() {
fi
done

+       ## Fix conflict with texlive 2010
+       ## this link is not created by texlinks anymore
+       Frm usr/bin/mfplain

# remove asymptote, we already have this =)
Frm usr/share/texmf/asymptote
Frm usr/share/texmf/doc/asymptote
Frm usr/share/texmf/tex/latex/asymptote
+       Frm usr/share/texmf/tex/context/asymptote
for f in asy xasy; do
Frm usr/share/man/man1/$f.1
done
@@ -168,12 +171,16 @@ build() {
elvish epigrafica epsdice esvect eulervm euxm feyn fge foekfont fonetika 
fourier fouriernc \
frcursive garamond genealogy gfsartemisia gfsbodoni gfscomplutum gfsdidot 
gfsneohellenic \
gfssolomos gothic greenpoint groff grotesq hands hfbright hfoldsty ifsym 
inconsolata \
-       initials iwona junicode kixfont knuthotherfonts kpfonts kurier lettrgth 
lfb libertine \
+       initials junicode kixfont knuthotherfonts kpfonts lettrgth lfb 
libertine \
libris linearA logic lxfonts ly1 marigold mathabx mathdesign mnsymbol nkarta 
ogham optima \
-       orkhun osmanian pacioli pclnfss phaistos phonetic pigpen psafm punk 
recycle sauter \
+       orkhun osmanian pacioli pclnfss phaistos phonetic pigpen itc punk 
recycle sauter \
sauterfonts semaphor simpsons skull staves tapir tengwarscript tpslifonts 
trajan \
umtypewriter univers universa venturisadf wsuipa zefonts venturis venturis2 \
-       cm-unicode txfontsb xits stix oldstandard gnu-freefont gentium oldlatin 
doublestroke ; do
+       cm-unicode txfontsb xits stix oldstandard gnu-freefont gentium oldlatin 
doublestroke \
+       esstix gust paratype adforn adfsymbols b1encoding berenisadf boondox 
cantarell \
+       cmtiup comfortaa droid electrum everyhook fdsymbol gillcm jamtimes lato 
poltawski prodint \
+       ptsans ptserif realscripts tfrupee urwchancal iwona kurier bbold-type1 
starfont rsfso \
+       ocr-b-outline ocr-b mdputu ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-fonts-extra $j
@@ -186,7 +193,8 @@ build() {
elsevier-bib fbs figbib finbib footbib harvard harvmac ijqc inlinebib 
iopart-num jneurosci jurabib \
listbib margbib multibib munich notes2bib perception pnas2009 rsc 
sort-by-letters splitbib swebib urlbst \
abstyles biblatex biblatex-apa biblatex-chem 
biblatex-chicago-notes-dfbiblatex-dw biblatex-historian \
-       biblatex-nature biblatex-philosophy biblatex-science ; do
+       biblatex-nature biblatex-philosophy biblatex-science biblatex-ieee 
biblatex-chicago biblatex-dw \
+       biblatex-mla logreq polski ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-bibtex-extra $j
@@ -227,7 +235,8 @@ build() {
powerdot-FUBerlin pracjourn procIAGssymp psu-thesis ptptex revtex sageep 
siggraph spie stellenbosch \
sugconf thesis-titlepage-fhac thuthesis toptesi tugboat tugboat-plain uaclasses 
ucdavisthesis ucthesis \
uiucthesis umich-thesis umthesis ut-thesis uwthesis vancouver vxu york-thesis 
elbioimp jmlr onrannual \
-       revtex4 ryethesis seuthesis soton ; do
+       revtex4 ryethesis seuthesis soton unamthesis aomart apa6e cmpj 
dfgproposal elteikthesis fbithesis \
+       msuthesis powerdot suftesi uafthesis uothesis uowthesis ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-templates-extra $j
@@ -236,7 +245,7 @@ build() {

## games related packages
for i in cchess chess chess-problem-diagrams chessboard chessfss crossword 
crosswrd egameps \
-       go hexgame jeopardy othello psgo sgame skak skaknew sudoku sudokubundle 
xq xskak ; do
+       go hexgame jeopardy othello psgo sgame skak skaknew sudoku sudokubundle 
xq xskak piano ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-misc $j
@@ -244,7 +253,8 @@ build() {
done

## music related packages
-       for i in abc figbas gchords guitar harmony musictex musixflx musixlyr 
musixps musixtex songbook ; do
+       for i in abc figbas gchords guitar harmony musictex musixflx musixlyr 
musixps musixtex songbook \
+       musixguit ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-misc $j
@@ -258,7 +268,8 @@ build() {
borceux colorsep dinat dirtree eijkhout encxvlna shade tabto-generic \
insbox metatex mftoeps midnight multi ofs pdf-trans vrb \
juramisc jurarsp jura juraabbrev bibleref xlop \
-       historische-zeitschrift texapi xcomment variations yax ; do
+       historische-zeitschrift texapi xcomment variations yax bibleref-french \
+       bibleref-german bibleref-parse edfnotes ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-extra $j
@@ -275,7 +286,8 @@ build() {
done

## cyrillic language support
-       for i in cmcyr cmcyralt cyrillic cyrillic-bin cyrplain disser eskd 
eskdx gost lcyw lh lhcyr t2 timescyr ; do
+       for i in cmcyr cmcyralt cyrillic cyrillic-bin cyrplain disser eskd 
eskdx gost lcyw lh lhcyr t2 timescyr \
+       russ ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-lang-cyrillic $j
@@ -285,7 +297,7 @@ build() {
## extra languages packages
for i in arabi arabtex armenian bangtex bengali burmese cjhebrew croatian ctib 
devnag ethiop ethiop-t1 \
fc hrlatex itrans malayalam mongolian-babel montex sanskrit soyombo velthuis 
vntex wnri otibet turkmen \
-       persian-bib xepersian ocherokee oinuit ; do
+       persian-bib xepersian ocherokee oinuit spanglish wnri-latex ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-lang-extra $j
@@ -302,7 +314,7 @@ build() {

## greek language support
for i in betababel bgreek cbfonts gfsbaskerville gfsporson greek-inputenc 
greekdates greektex grverb \
-       ibycus-babel ibygrk kdgreek kerkis levy lgreek mkgrkindex teubner 
xgreek yannisgr ; do
+       ibycus-babel ibygrk kdgreek kerkis levy lgreek mkgrkindex teubner 
xgreek yannisgr pxgreeks textgreek ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-lang-greek $j
@@ -398,7 +410,13 @@ build() {
skeycommand skeyval spreadtab standalone tabularborder texilikechaps tex-label 
threeparttable thumby \
titleref truncate twoinone undolabl verbdef vruler xwatermark ydoc minitoc 
spanish-mx \
units yfonts tocloft tocbibind supertabular subfloat subfigure subeqnarray 
subeqn lettrine caption \
-       overpic xytree xyling ; do
+       overpic xytree xyling acroterm adjmulticol bashful beamer2thesis 
beamerthemejltree beamerthemenirma \
+       canoniclayout carlisle catchfilebetweentags catoption chet chextras 
collcell colortbl colourchange \
+       cprotect csvsimple cutwin dirtytalk docmute ean13isbn easy-todo 
enumitem-zref eso-pic finstrut \
+       fjodor hardwrap he-she ifnextok iwhdp koma-moderncvclassic marginfix 
mbenotes morehype newunicodechar \
+       nonumonpart pagesLTS parselines piff progressbar regstats rvwrite 
serbian-lig sitem skb spot thumbs \
+       tucv turnthepage sphack subfigmat tabu shadow secdot romanneg fancytabs 
fileinfo filemod cals \
+       calxxxx-yyyy catoptions hrefhide ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-latex-extra $j
@@ -421,7 +439,9 @@ build() {
petri-nets pgf-soroban pgfopts pgfplots picinpar pict2e pictex pictex2 pinlabel 
pmgraph randbild \
schemabloc swimgraf texdraw tikz-inet tikz-timing tkz-doc tkz-linknodes tkz-tab 
tufte-latex xypic \
combinedgraphics duotenzor drs esk here knitting knittingpattern mathspic 
tikz-3dplot tikz-qtree \
-       tkz-orm xypdf chemfig ; do
+       tkz-orm xypdf chemfig bloques bodegraph bondgraph gincltex gmp 
gradientframe graphcet lpic \
+       numericplots pgf pgfgantt pgf-umlsd productbox randomwalk tkz-base 
tkz-berge tkz-euclide \
+       tkz-fct tkz-graph tkz-kiviat graphcet ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-graphics $j
@@ -444,7 +464,7 @@ build() {
pst-optexp pst-optic pst-osci pst-pad pst-pdgr pst-poly pst-qtree pst-sigsys 
pst-slpe pst-solides3d \
pst-soroban pst-spectra pst-stru pst-support pst-text pst-tree pst-uml 
pst-vowel pst-vue3d pst2pdf \
pstricks pstricks-add uml vaucanson-g pst-knot pst-am pst-electricfield pst-exa 
pst-magneticfield \
-       pst-mirror pst-node pst-platon pst-plot pst-thick ; do
+       pst-mirror pst-node pst-platon pst-plot pst-thick pst-tvz ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-pstricks $j
@@ -465,7 +485,7 @@ build() {
eltex formula fouridx functan galois gastex gene-logic gu hep hepnames 
hepparticles hepthesis \
hepunits karnaugh mhchem mhs miller objectz pseudocode scientificpaper 
sciposter sfg siunitx \
steinmetz struktex t-angles textopo ulqda unitsdef youngtab engtlc feynmf 
c-pascal fltpoint \
-       r_und_s ; do
+       r_und_s chemexec chemmacros drawstack mychemestry nuc ot-tableau 
physymb rec-thy; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-sciences $j
@@ -484,7 +504,7 @@ build() {
for i in 12many amstex boldtensors bosisio ccfonts commath concmath 
concmath-fonts concrete extarrows extpfeil \
faktor ionumbers isomath mathcomp mathdots mattens mhequ multiobjective nath 
proba shuffle statex2 \
stex stmaryrd susy syllogism synproof tablor tensor tex-ewd thmbox turnstile 
venn yhmath \
-       sansmath tdsfrmath ; do
+       sansmath tdsfrmath eqnarray libgreek mathalfa mathastext ; do
listdir=`find usr/share/texmf-dist/ -name $i -type d `
for j in  $listdir ; do
Fsplit $pkgname-sciences $j
@@ -538,6 +558,7 @@ build() {
done
done
Fsplit $pkgname-ptex usr/bin/ptex
+       Fsplit $pkgname-ptex usr/bin/eptex
#Fsplit $pkgname-ptex usr/bin/platex
Fsplit $pkgname-ptex usr/lib/libptexenc*
Fsplit $pkgname-ptex usr/include/ptexenc
diff --git a/source/xapps-extra/texlive/texlive-ptex.install 
b/source/xapps-extra/texlive/texlive-ptex.install
index 29dbfc8..91f86f5 100644
--- a/source/xapps-extra/texlive/texlive-ptex.install
+++ b/source/xapps-extra/texlive/texlive-ptex.install
@@ -4,7 +4,8 @@ post_install() {
echo " done."
echo "creating missing formats..."
sed -i "s/^#ptex ptex - ptex.ini/ptex ptex - ptex.ini/" 
/usr/share/texmf/web2c/fmtutil.cnf
-       sed -i "s/^#platex ptex language.ptx platex.ini/platex ptex 
language.ptx platex.ini/" /usr/share/texmf/web2c/fmtutil.cnf
+       sed -i "s/^#eptex eptex/eptex eptex/" /usr/share/texmf/web2c/fmtutil.cnf
+       sed -i "s/^#platex eptex/platex eptex/" 
/usr/share/texmf/web2c/fmtutil.cnf
fmtutil-sys --missing 1>/dev/null
texlinks -f /usr/share/texmf/web2c/fmtutil.cnf /usr/bin/ 1>/dev/null
echo " done."
@@ -12,7 +13,8 @@ post_install() {

pre_remove() {
sed -i "s/^ptex ptex - ptex.ini/#ptex ptex - ptex.ini/" 
/usr/share/texmf/web2c/fmtutil.cnf
-       sed -i "s/^platex ptex language.ptx platex.ini/#platex ptex 
language.ptx platex.ini/" /usr/share/texmf/web2c/fmtutil.cnf
+       sed -i "s/^eptex eptex/#eptex eptex/" /usr/share/texmf/web2c/fmtutil.cnf
+       sed -i "s/^platex eptex/#platex eptex/" 
/usr/share/texmf/web2c/fmtutil.cnf
}

op=$1
diff --git a/source/xapps-extra/texlive/texlive.install 
b/source/xapps-extra/texlive/texlive.install
index 0ecba3c..0672f52 100644
--- a/source/xapps-extra/texlive/texlive.install
+++ b/source/xapps-extra/texlive/texlive.install
@@ -1,4 +1,5 @@
post_install() {
+       [ ! -e /usr/bin/mfplain ] && ln -s /usr/bin/mpost /usr/bin/mfplain
echo "updating the filename database..."
mktexlsr 2>/dev/null
echo " done."
@@ -13,6 +14,7 @@ post_install() {

pre_upgrade() {
texlinks -u
+       [ -e /usr/bin/mfplain ] && rm -f /usr/bin/mfplain
}

post_upgrade() {
@@ -21,6 +23,7 @@ post_upgrade() {

pre_remove() {
texlinks -u
+       [ -e /usr/bin/mfplain ] && rm -f /usr/bin/mfplain
}

op=$1
diff --git a/source/xapps-extra/texlive/texmf.cnf 
b/source/xapps-extra/texlive/texmf.cnf
index a6d797d..5130925 100644
--- a/source/xapps-extra/texlive/texmf.cnf
+++ b/source/xapps-extra/texlive/texmf.cnf
@@ -1,6 +1,12 @@
-% texmf.cnf -- runtime path configuration file for kpathsea.
+% texmf.cnf for TeXLive/Frugalware -- runtime path configuration file for 
kpathsea.
% Public domain.
%
+% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
+% updated.  Instead, put your changes -- and only your changes, not an
+% entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
+% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
+%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
%
@@ -29,94 +35,74 @@
% A leading/trailing/doubled path separator in the paths will be
%   expanded into the compile-time default. Probably not what you want.
%
-
% Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  You can use the path
-% separator as well as the comma for this: /usr/local/{mytex:othertex}
-% also expands to /usr/local/mytex:/usr/local/othertex.  We make
-% extensive use of this.
+% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
+% use of this.
+

%  Part 1: Search paths and directories.

-% You can set an environment variable to override TEXMF if you're testing
-% a new TeX tree, without changing anything else.
+% This is the parent directory of our several trees, i.e.,
+% /usr/local/texlive/YYYY in the original TeX Live distribution.
%
-% You may wish to use one of the $SELFAUTO... variables here so TeX will
-% find where to look dynamically.  See the manual and the definition
-% below of TEXMFCNF.
-
-% The tree containing the runtime files closely related to the specific
-% program version used:
-TEXMFMAIN = /usr/share/texmf
+% All trees must be organized according to the TeX Directory Structure
+% (http://tug.org/tds), or files may not be found.
+%
+% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+TEXMFROOT = $SELFAUTODIR/share

-% The main distribution tree:
-TEXMFDIST = /usr/share/texmf-dist
+% The tree containing runtime files related to the specific
+% distribution and version.
+TEXMFMAIN = $TEXMFROOT/texmf

-% Our documentation-only tree, arranged by language:
-TEXMFDOC = /usr/share/texmf-doc
+% The main tree of packages, distribution-agnostic:
+TEXMFDIST = $TEXMFROOT/texmf-dist

-% A place for local additions to a "standard" texmf tree.
-% This tree is not used for local configuration maintained by
-% texconfig, it uses TEXMFCONFIG below.
+% Local additions to the distribution trees.
TEXMFLOCAL = /usr/local/share/texmf

-% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFSYSVAR = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFSYSVAR = /usr/share/texmf-var
-TEXMFSYSVAR = /usr/share/texmf-var
-
-% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFSYSCONFIG = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFSYSCONFIG = /usr/share/texmf-config
-TEXMFSYSCONFIG = /usr/share/texmf-config
-
-% User texmf trees are allowed as follows.
-% This used to be HOMETEXMF.
+% TEXMFSYSVAR, where *-sys store cached runtime data.
+TEXMFSYSVAR = /var/lib/texmf
+
+% TEXMFSYSCONFIG, where *-sys store configuration data.
+TEXMFSYSCONFIG = /etc/texmf
+
+% Per-user texmf tree(s) -- organized per the TDS, as usual.  To define
+% more than one per-user tree, set this to a list of directories in
+% braces, as described above.  (This used to be HOMETEXMF.)  ~ expands
+% to %USERPROFILE% on Windows, $HOME otherwise.
TEXMFHOME = ~/texmf

-% TEXMFVAR, where texconfig stores variable runtime data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFVAR = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFVAR = ~/.texmf-var  # teTeX 3.0 default
+% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
TEXMFVAR = ~/.texlive/texmf-var

-% TEXMFCONFIG, where texconfig stores configuration data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFCONFIG = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFCONFIG = ~/.texmf-config  # teTeX 3.0 default
-% For using a separate tree:
-%   TEXMFCONFIG = /usr/share/texmf-config
+% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
TEXMFCONFIG = ~/.texlive/texmf-config

-% Now, list all the texmf trees. If you have multiple trees you can
-% use shell brace notation, like this:
-%   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-% The braces are necessary.
+% List all the texmf trees.
%
% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
% explicitly and before all other trees.
-%
-% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the only
+%
+% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
% files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as format files.  Overriding them would be more
-% likely to cause trouble than help.  On the other hand, all the
-% standard packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those (although it is generally a
-% source of confusion to have different versions of a package installed,
-% whatever the trees, so try to avoid it).
+% the distribution, such as configuration files.  Overriding them would
+% be more likely to cause trouble than help.  On the other hand, the
+% bulk of packages and fonts are in TEXMFDIST, and locally-installed
+% versions should take precedence over those -- although it is generally
+% a source of confusion to have different versions of a package
+% installed, whatever the trees, so try to avoid it.
TEXMF = 
{$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}

-% The system trees.  These are the trees that are shared by all the users.
+% Where to look for ls-R files.  There need not be an ls-R in the
+% directories in this path, but if there is one, Kpathsea will use it.
+% By default, this is only the !! elements of TEXMF, so that mktexlsr
+% does not create ls-R files in the non-!! elements -- because if an
+% ls-R is present, it will be used, and the disk will not be searched.
+% This is arguably a bug in kpathsea.
+TEXMFDBS = 
{!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+
+% The system trees.  These are the trees that are shared by all users.
% If a tree appears in this list, the mktex* scripts will use
% VARTEXFONTS for generated files, if the original tree isn't writable;
% otherwise the current working directory is used.
@@ -127,20 +113,11 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
VARTEXFONTS = $TEXMFVAR/fonts

-% Where to look for ls-R files.  There need not be an ls-R in the
-% directories in this path, but if there is one, Kpathsea will use it.
-% By default, this is only the !! elements of TEXMF, so that mktexlsr
-% does not create ls-R files in the non-!! elements -- because if an
-% ls-R is present, it will be used, and the disk will not be searched.
-% This is arguably a bug in kpathsea.
-%
-TEXMFDBS = 
{!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
-
% On some systems, there will be a system tree which contains all the font
% files that may be created as well as the formats.  For example
%   TEXMFVAR = /var/lib/texmf
% is used in many distros.  In this case, set VARTEXFONTS like this
-% VARTEXFONTS = $TEXMFVAR/fonts
+%VARTEXFONTS = $TEXMFVAR/fonts
% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
%
% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below
@@ -213,21 +190,21 @@ TEXINPUTS.pdfxmex       = 
.;$TEXMF/tex/{mex,plain,generic,}//
TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//

% LuaTeX.
-TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,generic,}//
+TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-TEXINPUTS.pdflualatex   = .;$TEXMF/tex/{lualatex,latex,generic,}//
-TEXINPUTS.pdfluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.dvilualatex   = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.dviluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//

% XeTeX.
-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,generic,}//
-TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,generic,}//
+TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
+TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//


% ConTeXt.
TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//

-% jadetex
+% jadetex.
TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,latex,generic,}//

@@ -251,13 +228,6 @@ TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
MPINPUTS = .;$TEXMF/metapost//

-% The following are not needed any more here.
-% Moved to texdoc.cnf (and hard-coded default), see the texdoc manual.
-% See texdoc's source too if you need to allow compressed documentation.
-% TEXDOCSSUFFIX   = ;.pdf;.ps;.dvi;.html;.txt;.tex
-% TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
-% TEXDOCEXT       = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
-
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
% We want to find the engine-specific file, e.g., cont-en.fmt can
% exist under both pdftex/ and xetex/.  But just in case some formats
@@ -326,7 +296,7 @@ TEXPSHEADERS.gsftopk = 
.;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}/
% OSFONTDIR is to provide a convenient hook for allowing TeX to find
% fonts installed on the system (outside of TeX).  An empty default
% value would add "//" to the search paths, so we give it a dummy value.
-OSFONTDIR = /usr/share/fonts
+% OSFONTDIR = /usr/share/fonts

% PostScript Type 1 outline fonts.
T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
@@ -335,10 +305,10 @@ T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//
AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//

% TrueType outline fonts.
-TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR//
+TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//

% Opentype outline fonts.
-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR//
+OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//

% Type 42 outline fonts.
T42FONTS = .;$TEXMF/fonts/type42//
@@ -389,9 +359,8 @@ FONTCONFIG_FILE=fonts.conf
FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache

-% TeX documentation and source files, for use with kpsewhich (and texdoc).
-% Find non-man pages first, better than random in case of conflict.
-TEXDOCS = .;$TEXMF/doc{,/man}//
+% TeX documentation and source files, for use with texdoc and kpsewhich.
+TEXDOCS = $TEXMF/doc//
TEXSOURCES = .;$TEXMF/source//

% Web and CWeb input paths.
@@ -415,13 +384,24 @@ T4HTINPUTS   = .;$TEXMF/tex4ht//
TEX4HTFONTSET=alias,iso8859,unicode
TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//

+% TeXworks editor configuration and settings
+TW_LIBPATH = $TEXMFCONFIG/texworks
+TW_INIPATH = $TW_LIBPATH
+
+% For security, do not look in . for dvipdfmx.cfg, since the D option
+% would allow command execution.
+DVIPDFMXINPUTS = $TEXMF/dvipdfmx
+
% Find scripts that are distributed/installed in the texmf tree.

% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/lua//;$TEXINPUTS
+LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
+
+% Lua needs to look for binary lua libraries distributed with packages.
+CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//

% Architecture independent executables.
-TEXMFSCRIPTS = $TEXMF/scripts/{$engine,$progname,}//
+TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}//

% Other languages.
JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
@@ -437,21 +417,21 @@ RUBYINPUTS   = 
.;$TEXMF/scripts/{$progname,$engine,}/ruby//
% paradoxical), but the compile-time default in paths.h is built from it.
% The SELFAUTO* variables are set automatically from the location of
% argv[0], in kpse_set_program_name.
-%
+%
% This main texmf.cnf file is installed, for a release YYYY, in a
% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
% Since this file is subject to future updates, the TeX Live installer
% or human administrator may also create a file
% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
% will take precedence over the distributed one under texmf/web2c.
-%
+%
% For security reasons, it is better not to include . in this path.
%
-TEXMFCNF = 
{$SELFAUTOLOC,$SELFAUTODIR,/usr}{,{/share,/local/share,}/texmf/web2c}
+TEXMFCNF = 
{$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}

-# kpathsea 3.5.3 and later sets these at runtime. To avoid empty
-# expansions from binaries linked against an earlier version of the
-# library, we set $progname and $engine to something non-empty:
+% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
+% expansions from binaries linked against an earlier version of the
+% library, we set $progname and $engine to something non-empty:
progname = unsetprogname
engine = unsetengine

@@ -476,36 +456,50 @@ engine = unsetengine
try_std_extension_first = t

% Enable system commands via \write18{...}.  When enabled fully (set to
-% 1), obviously insecure.  When enabled partially (set to p), only the
+% t), obviously insecure.  When enabled partially (set to p), only the
% commands listed in shell_escape_commands are allowed.  Although this
% is not fully secure either, it is much better, and so useful that we
% enable it for everything but bare tex.
shell_escape = p

-% Special: convert is the standard command name for ImageMagick, but it
-% is also the name of a dangerous filesystem-changing command on
-% Windows.  So enable imgconvert (used in w32tex), but not convert.
-
% No spaces in this command list.
+%
+% The programs listed here are as safe as any we know: they either do
+% not write any output files, respect openout_any, or have hard-coded
+% restrictions similar or higher to openout_any=p.  They also have no
+% features to invoke arbitrary other programs, and no known exploitable
+% bugs.  All to the best of our knowledge.  They also have practical use
+% for being called from TeX.
+%
shell_escape_commands = \
-bibtex,bibtex8,epstopdf,epspdf,fc-match,\
-kpsewhich,makeindex,\
-ps2pdf,pstopdf,pygmentize,\
-rpdfcrop,\
+bibtex,bibtex8,\
+kpsewhich,\
+makeindex,\
+repstopdf,\

% we'd like to allow:
% dvips - but external commands can be executed, need at least -R1.
+% epspdf, ps2pdf, pstopdf - need to respect openout_any,
+%   and gs -dSAFER must be used and check for shell injection with filenames.
% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides,
%   without Unix convert it hardly seems worth it, and Windows convert
-%   is something completely different that destroys filesystems, so
-%   skip it.
+%   is something completely different that destroys filesystems, so skip.
% pygmentize - but is the filter feature insecure?
% ps4pdf - but it calls an unrestricted latex.
+% rpdfcrop - maybe ok, but let's get experience with repstopdf first.
% texindy,xindy - but is the module feature insecure?
% ulqda - but requires optional SHA1.pm, so why bother.
+% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any.

% plain TeX should remain unenhanced.
shell_escape.tex = f
+shell_escape.initex = f
+
+% This is used by the Windows script wrapper for restricting searching
+% for the purportedly safe shell_escape_commands above to system
+% directories.
+TEXMF_RESTRICTED_SCRIPTS = \
+  {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//

% Allow TeX \openin, \openout, or \input on filenames starting with `.'
% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
@@ -517,7 +511,7 @@ openout_any = p
openin_any = a

% Write .log/.dvi/etc. files here, if the current directory is unwritable.
-% TEXMFOUTPUT = /tmp
+%TEXMFOUTPUT = /tmp

% If a dynamic file creation fails, log the command to this file, in
% either the current directory or TEXMFOUTPUT.  Set to the
@@ -539,6 +533,7 @@ parse_first_line = t
% file_line_error_style settings, as well as the options -enctex,
% -mltex, -8bit, etc., also affect this, but they are all off by default.
parse_first_line.tex = f
+parse_first_line.initex = f

% Control file:line:error style messages.
file_line_error_style = f
@@ -552,13 +547,13 @@ file_line_error_style = f
% set DVIPSMAKEPK to `foo', what counts is the value of the environment
% variable/config value `FOO', not the `MKTEXPK' value.
%
-% MKTEXTEX = 0
-% MKTEXPK = 0
-% MKTEXMF = 0
-% MKTEXTFM = 0
-% MKTEXFMT = 0
-% MKOCP = 0
-% MKOFM = 0
+%MKTEXTEX = 0
+%MKTEXPK = 0
+%MKTEXMF = 0
+%MKTEXTFM = 0
+%MKTEXFMT = 0
+%MKOCP = 0
+%MKOFM = 0

% Used by makempx to run TeX.  We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
@@ -572,6 +567,10 @@ TEX = etex
%MFEDIT = ${TEXEDIT}
%MPEDIT = ${TEXEDIT}

+% The default `codepage and sort order' file for BibTeX8, when none is
+% given as command line option or environment variable.
+BIBTEX_CSFILE = 88591lat.csf
+
%  Part 3: Array and other sizes for TeX (and Metafont).
%
% If you want to change some of these sizes only for a certain TeX
@@ -603,7 +602,7 @@ extra_mem_top.context = 2000000
extra_mem_bot.context = 4000000

% Words of font info for TeX (total size of all TFM files, approximately).
-% Must be >= 20000 and <= 4000000 (without tex.ch changes).
+% Must be >= 20000 and <= 147483647 (without tex.ch changes).
font_mem_size = 3000000

% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
@@ -634,12 +633,12 @@ buf_size = 200000
% for all known free hyphenation patterns to be loaded simultaneously
% (as TeX Live does).
%
-trie_size = 700000
+trie_size = 1000000

hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
% http://primes.utm.edu/curios/page.php/8191.html
nest_size = 500         % simultaneous semantic levels (e.g., groups)
-max_in_open = 15        % simultaneous input files and error insertions,
+max_in_open = 15        % simultaneous input files and error insertions,
% also applies to MetaPost
param_size = 10000      % simultaneous macro parameters, also applies to MP
save_size = 50000       % for saving values outside current group
@@ -658,3 +657,20 @@ gf_buf_size = 16384  % MF
error_line = 79
half_error_line = 50
max_print_line = 79
+
+% Metafont only.
+screen_width.mf = 1664
+screen_depth.mf = 1200
+
+% BibTeX only (max_strings also determines hash_size and hash_prime).
+ent_str_size =  250
+glob_str_size = 5000
+max_strings.bibtex = 35307
+max_strings.bibtex8 = 35307
+max_strings.bibtexu = 35307
+max_strings.pbibtex = 35307
+
+% GFtype only.
+line_length.gftype = 500
+max_rows.gftype = 8191
+max_cols.gftype = 8191
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to