pool/texlive
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=194
This commit is contained in:
Dr. Werner Fink
2016-02-01 16:10:03 +00:00
committed by Git OBS Bridge
parent 816eee71e1
commit a778dc57cb
23 changed files with 2062 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

335
source.dif
View File

@@ -1,5 +1,5 @@
---
libs/icu/icu-53.1/source/common/Makefile.in | 2
libs/icu/icu-55.1/source/common/Makefile.in | 2
reautoconf | 2
texk/dviljk/dvi2xx.c | 11
texk/kpathsea/c-fopen.h | 6
@@ -7,41 +7,30 @@
texk/kpathsea/cnf-to-paths.awk | 2
texk/kpathsea/db.c | 13
texk/kpathsea/mktex.opt | 39 +-
texk/kpathsea/mktexlsr | 46 ++
texk/kpathsea/mktexlsr | 43 ++
texk/kpathsea/progname.c | 4
texk/kpathsea/texmf.cnf | 173 +++++-----
texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc | 3
texk/ps2pkm/pk2bm.c | 34 +
texk/texlive/linked_scripts/musixtex/musixtex.lua | 16
texk/texlive/tl_scripts/fmtutil-sys.sh | 1
texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc | 3
texk/ps2pk/pk2bm.c | 34 +
texk/texlive/linked_scripts/musixtex/musixtex.lua | 19 -
texk/texlive/linked_scripts/texlive/fmtutil-sys.sh | 1
texk/texlive/linked_scripts/texlive/fmtutil.pl | 12
texk/texlive/linked_scripts/texlive/updmap-sys.sh | 1
texk/texlive/tl_scripts/fmtutil.cnf | 17
texk/texlive/tl_scripts/fmtutil.sh | 16
texk/texlive/tl_scripts/texconfig-dialog.sh | 14
texk/texlive/tl_scripts/texconfig-sys.sh | 1
texk/texlive/tl_scripts/texconfig.sh | 35 --
texk/texlive/tl_scripts/texlinks.sh | 53 ++-
texk/texlive/tl_scripts/updmap-sys.sh | 1
texk/web2c/Makefile.in | 7
texk/web2c/window/regis.c | 8
texk/web2c/window/x11-Xlib.c | 8
texk/web2c/window/x11-Xt.c | 4
texk/xdvik/psgs.c | 22 +
texk/xdvik/xdvi-sh.in | 19 -
28 files changed, 369 insertions(+), 191 deletions(-)
28 files changed, 366 insertions(+), 190 deletions(-)
--- reautoconf
+++ reautoconf 2009-09-03 10:53:28.000000000 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here
# and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
-$do_cmd sleep 5
+# $do_cmd sleep 5
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- libs/icu/icu-53.1/source/common/Makefile.in
+++ libs/icu/icu-53.1/source/common/Makefile.in 2011-12-09 11:43:35.000000000 +0000
--- libs/icu/icu-55.1/source/common/Makefile.in
+++ libs/icu/icu-55.1/source/common/Makefile.in 2016-01-28 12:50:28.396797608 +0000
@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUUC)
@@ -51,8 +40,19 @@
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- reautoconf
+++ reautoconf 2016-01-28 12:49:38.777793040 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here
# and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
-$do_cmd sleep 5
+# $do_cmd sleep 5
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2013-06-28 11:26:08.000000000 +0000
+++ texk/dviljk/dvi2xx.c 2016-01-28 12:50:28.396797608 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
setbuf(ERR_STREAM, NULL);
@@ -73,7 +73,7 @@
G_progname = kpse_program_name;
#else
--- texk/kpathsea/c-fopen.h
+++ texk/kpathsea/c-fopen.h 2010-11-12 17:02:18.000000000 +0000
+++ texk/kpathsea/c-fopen.h 2016-01-28 12:50:28.400797527 +0000
@@ -38,17 +38,17 @@
/* How to open a binary file for reading: */
@@ -96,7 +96,7 @@
/* How to switch an already open file handle to binary mode.
--- texk/kpathsea/c-memstr.h
+++ texk/kpathsea/c-memstr.h 2015-03-26 10:45:40.246018846 +0000
+++ texk/kpathsea/c-memstr.h 2016-01-28 12:50:28.400797527 +0000
@@ -37,6 +37,7 @@
/* For ancient systems that lack the system V/ANSI version of the
@@ -113,7 +113,7 @@
+
#endif /* not KPATHSEA_C_MEMSTR_H */
--- texk/kpathsea/cnf-to-paths.awk
+++ texk/kpathsea/cnf-to-paths.awk 2011-09-13 16:11:30.000000000 +0000
+++ texk/kpathsea/cnf-to-paths.awk 2016-01-28 12:50:28.400797527 +0000
@@ -37,7 +37,7 @@
val = $0;
sub(/^.*=[ \t]*/, "", val);
@@ -124,8 +124,8 @@
if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2012-04-13 15:32:18.000000000 +0000
@@ -94,7 +94,8 @@ db_build (kpathsea kpse, hash_table_type
+++ texk/kpathsea/db.c 2016-01-28 12:50:28.400797527 +0000
@@ -92,7 +92,8 @@ db_build (kpathsea kpse, hash_table_type
unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
string top_dir = (string)xmalloc (len + 1);
string cur_dir = NULL; /* First thing in ls-R might be a filename. */
@@ -135,7 +135,7 @@
#if defined(WIN32)
string pp;
#endif
@@ -102,7 +103,15 @@ db_build (kpathsea kpse, hash_table_type
@@ -100,7 +101,15 @@ db_build (kpathsea kpse, hash_table_type
strncpy (top_dir, db_filename, len);
top_dir[len] = 0;
@@ -153,8 +153,8 @@
len = strlen (line);
--- texk/kpathsea/mktex.opt
+++ texk/kpathsea/mktex.opt 2012-05-14 11:26:00.000000000 +0000
@@ -37,10 +37,11 @@ if test "$DOSISH" = "no"; then SEP=':';
+++ texk/kpathsea/mktex.opt 2016-01-28 12:50:28.400797527 +0000
@@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':';
# TEMPDIR needs to be unique to each process because of the possibility of two
# people running dvips (or whatever) simultaneously.
if test -n "$TMPDIR"; then
@@ -168,7 +168,7 @@
# We want to output only filenames to standard output, but it's too
# error-prone to write the scripts that way, so we direct stdout here.
@@ -48,17 +49,23 @@ STDOUT="$TEMPDIR/mt$$.out"
@@ -49,17 +50,23 @@ STDOUT="$TEMPDIR/mt$$.out"
# We will change search paths to include $KPSE_DOT. This is necessary
# since we cd to $TEMPDIR.
@@ -196,7 +196,7 @@
cd "$TEMPDIR" || exit 1
# The alternative location for fonts. The directory need not exist,
@@ -68,6 +75,11 @@ if test -z "$MT_VARTEXFONTS"; then
@@ -69,6 +76,11 @@ if test -z "$MT_VARTEXFONTS"; then
echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2
MT_VARTEXFONTS='$KPSE_DOT'
fi
@@ -208,7 +208,7 @@
# The supporting scripts:
: ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
@@ -108,9 +120,18 @@ fi
@@ -109,9 +121,18 @@ fi
: ${MAG=1.0}
: ${ps_to_pk=gsftopk} # some prefer ps2pk
@@ -231,18 +231,8 @@
# Cache values that may be useful for recursive calls.
export MT_MKTEX_OPT MT_MKTEX_CNF
--- texk/kpathsea/mktexlsr
+++ texk/kpathsea/mktexlsr 2015-03-26 10:55:12.495280597 +0000
@@ -36,6 +36,9 @@ Kpathsea manual available at http://tug.
Report bugs to tex-k@tug.org.
"
+MKTEXLSR=true; export MKTEXLSR
+set -o noclobber
+
# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
# directories in path lists whereas Unix uses `:'. Make an exception for
# Cygwin, which pretends to be UNIX.
@@ -51,6 +54,9 @@ if test "$DOSISH" = "no"; then SEP=':';
+++ texk/kpathsea/mktexlsr 2016-01-28 12:50:28.400797527 +0000
@@ -58,6 +58,9 @@ if test "$DOSISH" = "no"; then SEP=':';
# be done before kpsewhich can be called, and thus cannot be put into
# mktex.opt.
dirname=`echo $0 | sed 's%/*[^/][^/]*$%%'`
@@ -252,7 +242,7 @@
case $dirname in
"") # Do nothing
;;
@@ -134,6 +140,7 @@ old_ls_R_magic='% ls-R -- maintained by
@@ -141,6 +144,7 @@ old_ls_R_magic='% ls-R -- maintained by
shift
}
@@ -260,7 +250,7 @@
for TEXMFLS_R in "$@"; do
# Prepend cwd if the directory was relative.
case "$TEXMFLS_R" in
@@ -163,12 +170,23 @@ for TEXMFLS_R in "$@"; do
@@ -170,12 +174,23 @@ for TEXMFLS_R in "$@"; do
# want to be silent if the directory doesn't exist, since the ls-R
# path ordinarily contains many nonexistent directories.
test -d "$db_dir" || continue
@@ -286,7 +276,7 @@
elif test -s "$db_file" \
&& test "x`sed '1s/
$//;1q' \"$db_file\"`" != "x$ls_R_magic" \
&& test "x`sed '1s/
&& test "x`sed '1s/
$//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then
@@ -186,8 +201,13 @@ for TEXMFLS_R in "$@"; do
# Skip if we cannot write the file:
@@ -302,7 +292,7 @@
+
+ db_dir_tmp=$(mktemp -d "$db_dir_tmp") \
|| { echo "$progname: $db_dir_tmp: could not create directory, skipping..." >&2; continue; }
db_file_tmp="$db_dir_tmp/lsR$$.tmp"
db_file_tmp="$db_dir_tmp/lsR$$.tmp"
rm -f "$db_file_tmp"
@@ -195,7 +215,9 @@ for TEXMFLS_R in "$@"; do
$verbose && echo "$progname: Updating $db_file... "
@@ -313,7 +303,7 @@
+ echo "$ls_R_magic" >"$db_file_tmp" \
+ || { echo "$progname: $db_file_tmp: could not create file, skipping..." >&2; continue; }
# The main task. We put ./: in the output, so top-level files can be
# The main task. We put ./: in the output, so top-level files can be
# found via ls-R. Probably irrelevant in practice. The sed command
@@ -209,15 +231,20 @@ for TEXMFLS_R in "$@"; do
vc_dirs='\.\(bzr\|git\|hg\|svn\)\|_darcs'
@@ -338,7 +328,7 @@
+ fi
rm -rf "$db_dir_tmp"
done
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2016-01-28 12:50:28.400797527 +0000
@@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse
@@ -352,7 +342,7 @@
+ sdir_grandparent = xdirname ("/usr/share/texmf");
kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
sdir_greatgrandparent = xdirname (sdir_grandparent);
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2016-01-28 12:57:16.760604615 +0000
@@ -54,32 +54,32 @@
@@ -384,16 +374,16 @@
% to %USERPROFILE% on Windows, $HOME otherwise.
-TEXMFHOME = ~/texmf
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2015/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2015/texmf-config
+TEXMFCONFIG = ${TEXMFSYSCONFIG}
% List all the texmf trees. For an explanation of what they are, see the
% List all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
@@ -91,7 +91,7 @@ TEXMFCONFIG = ~/.texlive2015/texmf-confi
% should take precedence over distribution files -- although it is
@@ -474,7 +464,7 @@
+TEXINPUTS.pdfelatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% LuaTeX.
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -235,18 +235,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic}//
@@ -499,7 +489,7 @@
+TEXINPUTS.frpdflatex = .;$TEXMF/{pdftex,tex}/{french,latex,generic,}//
+TEXINPUTS.frpdftex = .;$TEXMF/{pdftex,tex}/{french,plain,generic,}//
% Earlier entries override later ones, so put this generic one last.
% Earlier entries override later ones, so put this generic one last.
TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
@@ -255,7 +255,7 @@ TEXINPUTS = .;$TEXMF/tex/{
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
@@ -508,7 +498,7 @@
-MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/source//
MPINPUTS = .;$TEXMF/metapost//
% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
@@ -265,31 +265,31 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil
@@ -547,7 +537,7 @@
-PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
+PKFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}//
% Similarly for the GF format, which only remains in existence because
% Similarly for the GF format, which only remains in existence because
% Metafont outputs it (and MF isn't going to change).
@@ -299,7 +299,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
@@ -556,7 +546,7 @@
-MISCFONTS = .;$TEXMF/fonts/misc//
+MISCFONTS = .;$TEXMF/fonts/misc//;$TEXMF/fonts/hbf//
% font name map files. This isn't just fonts/map// because ConTeXt
% font name map files. This isn't just fonts/map// because ConTeXt
% wants support for having files with the same name in the different
@@ -381,8 +381,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
@@ -567,7 +557,7 @@
+MIMELIBDIR = /etc
+MAILCAPLIBDIR = /etc
% Default settings for the fontconfig library as used by the Windows
% Default settings for the fontconfig library as used by the Windows
% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems.
@@ -401,10 +401,10 @@ WEBINPUTS = .;$TEXMF/web//
CWEBINPUTS = .;$TEXMF/cweb//
@@ -582,7 +572,7 @@
+OVFFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/{ovf,vf}//
+OVPFONTS = .;{$TEXMF/fonts,$HOMECACHE,$VARTEXFONTS}/ovp//
OTPINPUTS = .;$TEXMF/omega/otp//
OCPINPUTS = .;$TEXMF/omega/ocp//
OCPINPUTS = .;$TEXMF/omega/ocp//
@@ -486,33 +486,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% since we don't want to scatter ../'s throughout the value. Hence we
@@ -644,7 +634,7 @@
+%$SELFAUTOPARENT/texmf/web2c\
+%}
%
% For reference, here is the old brace-using definition:
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -789,3 +790,33 @@ max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
@@ -678,8 +668,8 @@
+% These are jadetex specific
+main_memory.jadetex = 499999
+hash_extra.jadetex = 25000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
+pool_size.jadetex = 500000
+save_size.jadetex = 15000
--- texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc 2016-01-28 12:50:28.404797448 +0000
@@ -67,6 +67,9 @@
@@ -690,9 +680,9 @@
+#define SHAREDIR "/usr/share/texmf/fonts/map/glyphlist"
+
using namespace Efont;
#define VERSION_OPT 301
--- texk/ps2pkm/pk2bm.c
#define VERSION_OPT 301
--- texk/ps2pk/pk2bm.c
+++ texk/ps2pk/pk2bm.c 2016-01-28 12:50:43.484494922 +0000
@@ -45,7 +45,6 @@
@@ -700,7 +690,7 @@
static void dots(quarterword u, int n);
-static int atoo(char *oct);
int main(int argc, char *argv[])
int main(int argc, char *argv[])
{
@@ -54,7 +53,7 @@ int main(int argc, char *argv[])
halfword *word;
@@ -709,7 +699,7 @@
- char *pkname;
+ char *pkname, *endptr;
while (--argc > 0 && (*++argv)[0] == '-') {
while (--argc > 0 && (*++argv)[0] == '-') {
done=0;
@@ -62,26 +61,36 @@ int main(int argc, char *argv[])
switch (c) {
@@ -752,7 +742,7 @@
+ if (--argc == 0) goto err;
+ argv++;
}
w = atoi(argv[0]);
w = atoi(argv[0]);
done=1;
@@ -98,7 +107,7 @@ int main(int argc, char *argv[])
}
@@ -761,7 +751,7 @@
- if (argc == 0) {
+ if (argc != 1) {
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1);
exit(1);
}
@@ -216,10 +225,3 @@ dots(quarterword u, int n)
}
@@ -773,8 +763,8 @@
- int octal = 0;
- while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
- return octal & 0xff;
-}
--- texk/texlive/linked_scripts/musixtex/musixtex.lua
-}
--- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2016-01-28 12:53:55.300646630 +0000
@@ -83,12 +83,23 @@ if #arg == 0 then
os.exit(0)
@@ -786,30 +776,85 @@
+
-- defaults:
-tex = "etex"
+if base == "pdfmusixtex" then
+ tex = "pdfetex"
+ dvips = ""
+ dvi = ""
+ ps2pdf = ""
+else
+else
+ tex = "etex"
+ dvips = "dvips -e0 "
+ dvi = dvips
+ ps2pdf = "ps2pdf"
+end
+end
musixflx = "musixflx"
-dvips = "dvips -e0 "
-dvi = dvips
-ps2pdf = "ps2pdf"
intermediate = 1
passes = 2
--- texk/texlive/tl_scripts/fmtutil-sys.sh
+++ texk/texlive/tl_scripts/fmtutil-sys.sh 2013-07-31 13:01:24.000000000 +0000
@@ -26,4 +26,5 @@ TEXMFVAR="$v"
intermediate = 1
passes = 2
index = 0
--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2016-01-28 12:52:30.270352571 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-01-28 14:13:50.388260141 +0000
@@ -283,10 +283,17 @@ sub callback_build_formats {
my $disabled = 0;
my $nobuild = 0;
my $notavail = 0;
+ my $uid, $gid;
#
# set up a tmp dir
my $tmpdir = File::Temp::tempdir(CLEANUP => 1);
#my $tmpdir = File::Temp::tempdir();
+ if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
+ my $cnt = chown $uid, $gid, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ $cnt = chmod 0770, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ }
# set up destination directory
$opts{'fmtdir'} || ( $opts{'fmtdir'} = "$texmfvar/web2c" ) ;
TeXLive::TLUtils::mkdirhier($opts{'fmtdir'}) if (! -d $opts{'fmtdir'});
@@ -443,6 +450,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else
if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure.
@@ -493,11 +501,15 @@ sub rebuild_one_format {
",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
return $FMT_NOTAVAIL;
} else {
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_error("not building $fmt due to missing engine $eng.\n");
return $FMT_FAILURE;
}
}
+ if ($ENV{batchmode} eq "yes") {
+ texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
+ }
print_verbose("running \`$eng -ini $tcxflag $jobswitch $prgswitch $texargs' ...\n");
{
--- texk/texlive/linked_scripts/texlive/updmap-sys.sh
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2016-01-28 12:52:43.190093368 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil ${1+"$@"}
--- texk/texlive/tl_scripts/fmtutil.cnf
exec updmap --sys ${1+"$@"}
--- texk/texlive/tl_scripts/fmtutil.cnf
+++ texk/texlive/tl_scripts/fmtutil.cnf 2016-01-28 12:50:57.572212297 +0000
@@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc
# from context:
@@ -825,7 +870,7 @@
+cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
+cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii
#
# from cslatex:
# from cslatex:
cslatex pdftex - -etex cslatex.ini
@@ -65,8 +66,8 @@ pdfcsplain luatex - -etex csplain.ini
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
@@ -836,7 +881,7 @@
+jadetex pdftex language.dat -translate-file=cp227.tcx *jadetex.ini
+pdfjadetex pdftex language.dat -translate-file=cp227.tcx *pdfjadetex.ini
#
# from latex-bin:
# from latex-bin:
latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
@@ -133,5 +134,5 @@ xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
@@ -844,55 +889,9 @@
# from xmltex:
-xmltex pdftex language.dat *xmltex.ini
-pdfxmltex pdftex language.dat *pdfxmltex.ini
+xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
--- texk/texlive/tl_scripts/fmtutil.sh
+++ texk/texlive/tl_scripts/fmtutil.sh 2012-06-20 09:56:15.000000000 +0000
@@ -163,7 +163,12 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ if test "$(id -u 2> /dev/null)" = 0 && getent group mktex > /dev/null 2>&1 ; then
+ mkdir -m 0700 "$tmpdir" && chown nobody:mktex "$tmpdir" && chmod 2770 "$tmpdir" \
+ || abort "could not create directory \`$tmpdir'"
+ return
+ fi
+ mkdir -m 0700 "$tmpdir" \
|| abort "could not create directory \`$tmpdir'"
}
@@ -425,7 +430,7 @@ main()
verboseFlag=true
noAbortFlag=false
# eradicate double slashes to avoid kpathsea expansion.
- tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
+ tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$RANDOM | sed s,//,/,g`
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
# first generated filename after successful generation to stdout then
@@ -751,6 +756,7 @@ run_initex()
*) prgswitch=-progname=$format;;
esac
+ type -p "$engine" &> /dev/null || return
rm -f $fmtfile
# Check for infinite recursion before running the iniTeX:
@@ -776,6 +782,12 @@ run_initex()
fi
fi
+ test "$batchmode" = "yes" && {
+ case "$engine" in
+ tex|ptex)
+ texargs="\\batchmode \\input $texargs"
+ esac
+ }
verboseMsg "$progname: running \`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' ..."
+xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
# run in a subshell to get a local effect of TEXPOOL manipulation:
--- texk/texlive/tl_scripts/texconfig-dialog.sh
+pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
--- texk/texlive/tl_scripts/texconfig-dialog.sh
+++ texk/texlive/tl_scripts/texconfig-dialog.sh 2016-01-28 12:55:50.682331687 +0000
@@ -154,7 +154,14 @@ termCtl()
###############################################################################
@@ -900,18 +899,18 @@
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your teTeX system using the
@@ -159,8 +166,9 @@ menuMain()
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your TeX system using the
@@ -166,8 +173,9 @@ menuMain()
More likely these days, you're better off using tlmgr.
See http://tug.org/texlive/tlmgr.html.
-eof
@@ -921,16 +920,16 @@
+ fi
while :; do
logMessage='view logfile'
--- texk/texlive/tl_scripts/texconfig-sys.sh
logMessage='view logfile'
--- texk/texlive/tl_scripts/texconfig-sys.sh
+++ texk/texlive/tl_scripts/texconfig-sys.sh 2016-01-28 12:51:01.132140878 +0000
@@ -30,4 +30,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG
+umask 022
exec texconfig ${1+"$@"}
--- texk/texlive/tl_scripts/texconfig.sh
exec texconfig ${1+"$@"}
--- texk/texlive/tl_scripts/texconfig.sh
+++ texk/texlive/tl_scripts/texconfig.sh 2016-01-28 12:51:01.132140878 +0000
@@ -40,7 +40,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
@@ -939,7 +938,7 @@
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$.$RANDOM
needsCleanup=false
lastUpdatedFile=
lastUpdatedFile=
@@ -1010,21 +1010,6 @@ For more information about these \`featu
;;
@@ -961,7 +960,7 @@
- exit 1 # but leave the real code for posterity
-
setupTmpDir
echo "$progname: analyzing old configuration..." >&2
echo "$progname: analyzing old configuration..." >&2
fmtutil --catcfg > $tmpdir/pre
@@ -1050,22 +1035,6 @@ EOM
@@ -984,7 +983,7 @@
- exit 1 # but leave the real code for posterity
-
tcBatchHyphenFormat=$2
formatsForHyphen=`getFormatsForHyphen`
formatsForHyphen=`getFormatsForHyphen`
formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
@@ -1317,7 +1286,7 @@ Valid PAPER settings:
;;
@@ -994,8 +993,8 @@
+ ( unset KPSE_DOT; mktexlsr )
;;
#
--- texk/texlive/tl_scripts/texlinks.sh
#
--- texk/texlive/tl_scripts/texlinks.sh
+++ texk/texlive/tl_scripts/texlinks.sh 2016-01-28 12:51:01.132140878 +0000
@@ -100,7 +100,7 @@ setupTmpDir()
@@ -1004,7 +1003,7 @@
- (umask 077; mkdir "$tmpdir") \
+ (umask 077; mkdir -m 0700 "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
}
}
@@ -108,16 +108,18 @@ setupTmpDir()
# search a binary along $PATH:
@@ -1033,7 +1032,7 @@
+
+ type -p $1
}
@@ -208,8 +210,22 @@ search_symlinkdir()
upd_symlinkdir()
@@ -1058,7 +1057,7 @@
+ # restore positional arguments:
+ set x $main_args_while; shift
done
}
}
@@ -274,12 +290,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
@@ -1074,7 +1073,7 @@
+ sed '/^[ ]*#/d; /^[ ]*$/d; s%\*%%' $cnf_file \
+ | awk '{print $1, $2, $NF}' > cnf_file_ln.$$
if test -z "$dirs"; then
if test -z "$dirs"; then
if test $multiplatform = true; then
@@ -300,13 +316,16 @@ main()
# cnf_file_ln.$$ has lines with "format engine" pairs
@@ -1092,17 +1091,9 @@
+ test $? -ne 0 && continue
+
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine$exeext"; then
case $unlink in
--- texk/texlive/tl_scripts/updmap-sys.sh
+++ texk/texlive/tl_scripts/updmap-sys.sh 2013-07-31 13:02:45.000000000 +0000
@@ -27,4 +27,5 @@ test -n "${ZSH_VERSION+set}" && alias -g
# TEXMFCONFIG="$c"
# export TEXMFVAR TEXMFCONFIG
if test -f "$d/$engine$exeext"; then
exec updmap --sys ${1+"$@"}
--- texk/web2c/Makefile.in
case $unlink in
--- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2016-01-28 12:51:34.395473549 +0000
@@ -3656,7 +3656,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5
@@ -1111,7 +1102,7 @@
-all: ff-config.h
+all: ff-config.h w2c/config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -3703,6 +3703,11 @@ w2c/c-auto.h: w2c/stamp-h1
w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
@@ -1124,7 +1115,7 @@
+
$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f w2c/stamp-h1
rm -f w2c/stamp-h1
--- texk/web2c/window/regis.c
+++ texk/web2c/window/regis.c 2016-01-28 12:51:34.399473469 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
@@ -1144,7 +1135,7 @@
+ printf(format,
ESCAPE,left,bottom,right,bottom,right,top,left,top,
left,bottom,ESCAPE);
}
}
--- texk/web2c/window/x11-Xlib.c
+++ texk/web2c/window/x11-Xlib.c 2016-01-28 12:51:34.411473228 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
@@ -1171,7 +1162,7 @@
+ (unsigned int) DEFAULT_WIDTH, (unsigned int) DEFAULT_DEPTH,
DEFAULT_X_POSITION, DEFAULT_Y_POSITION);
/* Look up the geometry for this window. (Section 10.2 Obtaining X
/* Look up the geometry for this window. (Section 10.2 Obtaining X
--- texk/web2c/window/x11-Xt.c
+++ texk/web2c/window/x11-Xt.c 2016-01-28 12:51:34.411473228 +0000
@@ -18,8 +18,8 @@
@@ -1184,7 +1175,7 @@
+static unsigned int mf_defheight = 500;
static Display *mf_display;
static Window mf_window;
static Window mf_window;
--- texk/xdvik/psgs.c
+++ texk/xdvik/psgs.c 2016-01-28 12:51:34.415473148 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
@@ -1222,7 +1213,7 @@
+ }
fflush(stderr); /* to avoid double flushing */
GS_pid = vfork();
if (GS_pid == 0) { /* child */
if (GS_pid == 0) { /* child */
--- texk/xdvik/xdvi-sh.in
+++ texk/xdvik/xdvi-sh.in 2016-01-28 12:51:34.415473148 +0000
@@ -1,4 +1,4 @@