summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-23 23:03:44 +0000
committerKarl Berry <karl@freefriends.org>2010-03-23 23:03:44 +0000
commitc0d41a197839d1b3cd8d13ab7eb79e53318194b2 (patch)
treee9d33818952788eda13fda3a2d789b8ae9e3240f /Build
parent41074cff20eaf18087a15710845c1dfb225d241b (diff)
new TEXMF_RESTRICTED_SCRIPTS; TEXMFSCRIPTS: progname before engine
git-svn-id: svn://tug.org/texlive/trunk@17541 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog9
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf37
2 files changed, 31 insertions, 15 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index d77dc986357..44c5adbf444 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-24 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (TEXMFSCRIPTS): progname before engine, for consistency,
+ and because the former is more specific.
+ (TEXMF_RESTRICTED_SCRIPTS): new definition, for the w32 wrapper.
+
+ (TEXMFDBS): reorder in file to be next to TEXMF, to make the
+ relationship more apparent. No change in definition.
+
2010-03-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmf.cnf (ent_str_size, glob_str_size): New for size of
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 26f9d67dbc5..0e0e84a3e18 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -109,7 +109,7 @@ TEXMFCONFIG = ~/.texlive2009/texmf-config
% 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
@@ -119,6 +119,14 @@ TEXMFCONFIG = ~/.texlive2009/texmf-config
% whatever the trees, so try to avoid it).
TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+% 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 the users.
% If a tree appears in this list, the mktex* scripts will use
% VARTEXFONTS for generated files, if the original tree isn't writable;
@@ -130,15 +138,6 @@ 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
@@ -430,7 +429,7 @@ LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/lua//;$TEXINPUTS
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//
@@ -507,22 +506,30 @@ false
% 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 we need to make sure -dSAFER is used and no injection is possible.
% (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.
-% epspdf, epstopdf, ps2pdf, pstopdf, rpdfcrop - need to respect openout_any,
-% and we need to make sure -dSAFER is used and no injection is possible.
% pygmentize - but is the filter feature insecure?
% ps4pdf - but it calls an unrestricted latex.
% texindy,xindy - but is the module feature insecure?
% ulqda - but requires optional SHA1.pm, so why bother.
-% tex, latex, etc - but need to forbid --shell-escape, and inherit openout_any
-% bibtex,bibtex8,makeindex, - don't respect openout_any
+% tex, latex, etc. - but need to forbid --shell-escape, and inherit openout_any
+%
+% repstopdf, rpdfcrop - maybe ok
+% bibtex,bibtex8,makeindex - maybe ok
% plain TeX should remain unenhanced.
shell_escape.tex = 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)?
% a (any) : any file can be opened.