2016-06-14 10:26:43 +00:00
committed by Git OBS Bridge
parent 1c8e91a213
commit 20f7a93061
17 changed files with 550 additions and 1143 deletions

View File

@@ -1,36 +1,36 @@
---
libs/icu/icu-55.1/source/common/Makefile.in | 2
reautoconf | 2
texk/dviljk/dvi2xx.c | 11
texk/kpathsea/c-fopen.h | 6
texk/kpathsea/c-memstr.h | 3
texk/kpathsea/cnf-to-paths.awk | 2
texk/kpathsea/db.c | 13
texk/kpathsea/mktex.opt | 39 +-
texk/kpathsea/mktexlsr | 43 ++
texk/kpathsea/progname.c | 4
texk/kpathsea/texmf.cnf | 173 +++++-----
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/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/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, 366 insertions(+), 190 deletions(-)
libs/icu/icu-src/source/common/Makefile.in | 2
reautoconf | 2
texk/dviljk/dvi2xx.c | 11
texk/kpathsea/c-fopen.h | 6
texk/kpathsea/c-memstr.h | 3
texk/kpathsea/cnf-to-paths.awk | 2
texk/kpathsea/db.c | 13
texk/kpathsea/mktex.opt | 39 ++
texk/kpathsea/mktexlsr | 43 ++
texk/kpathsea/progname.c | 4
texk/kpathsea/texmf.cnf | 173 +++++++-----
texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc | 3
texk/ps2pk/pk2bm.c | 35 +-
texk/texlive/linked_scripts/musixtex/musixtex.lua | 17 -
texk/texlive/linked_scripts/texlive/fmtutil-sys.sh | 1
texk/texlive/linked_scripts/texlive/fmtutil.pl | 24 +
texk/texlive/linked_scripts/texlive/updmap-sys.sh | 1
texk/texlive/tl_scripts/fmtutil.cnf | 17 -
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/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, 371 insertions(+), 196 deletions(-)
--- 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
--- libs/icu/icu-src/source/common/Makefile.in
+++ libs/icu/icu-src/source/common/Makefile.in 2016-06-07 13:40:23.537446416 +0000
@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
LDFLAGS += $(LDFLAGSICUUC)
@@ -41,7 +41,7 @@
# for icu data location
ifeq ($(PKGDATA_MODE),common)
--- reautoconf
+++ reautoconf 2016-01-28 12:49:38.777793040 +0000
+++ reautoconf 2016-06-07 13:40:23.537446416 +0000
@@ -83,7 +83,7 @@ echo "$0: TL_AUTOHEADER, T
# Give users a chance to quit here
@@ -52,7 +52,7 @@
AUTOCONF=$TL_AUTOCONF
AUTOHEADER=$TL_AUTOHEADER
--- texk/dviljk/dvi2xx.c
+++ texk/dviljk/dvi2xx.c 2016-01-28 12:50:28.396797608 +0000
+++ texk/dviljk/dvi2xx.c 2016-06-07 13:40:23.537446416 +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 2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/c-fopen.h 2016-06-07 13:40:23.537446416 +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 2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/c-memstr.h 2016-06-07 13:40:23.537446416 +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 2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/cnf-to-paths.awk 2016-06-07 13:40:23.537446416 +0000
@@ -37,7 +37,7 @@
val = $0;
sub(/^.*=[ \t]*/, "", val);
@@ -124,7 +124,7 @@
if (val ~ /\$SELFAUTO/) {
# Replace all semicolons with colons in the SELFAUTO paths we're keeping.
--- texk/kpathsea/db.c
+++ texk/kpathsea/db.c 2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/db.c 2016-06-07 13:40:23.537446416 +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);
@@ -153,7 +153,7 @@
len = strlen (line);
--- texk/kpathsea/mktex.opt
+++ texk/kpathsea/mktex.opt 2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/mktex.opt 2016-06-07 13:40:23.537446416 +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.
@@ -231,7 +231,7 @@
# Cache values that may be useful for recursive calls.
export MT_MKTEX_OPT MT_MKTEX_CNF
--- texk/kpathsea/mktexlsr
+++ texk/kpathsea/mktexlsr 2016-01-28 12:50:28.400797527 +0000
+++ texk/kpathsea/mktexlsr 2016-06-07 13:40:23.537446416 +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.
@@ -328,7 +328,7 @@
+ fi
rm -rf "$db_dir_tmp"
done
--- texk/kpathsea/progname.c
+++ texk/kpathsea/progname.c 2016-06-07 13:40:23.537446416 +0000
@@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse
@@ -342,8 +342,8 @@
+ 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));
--- texk/kpathsea/texmf.cnf
kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
--- texk/kpathsea/texmf.cnf
+++ texk/kpathsea/texmf.cnf 2016-06-07 13:58:00.905630040 +0000
@@ -57,32 +57,32 @@
TEXMFROOT = $SELFAUTOPARENT
@@ -374,16 +374,16 @@
% to %USERPROFILE% on Windows, $HOME otherwise.
-TEXMFHOME = ~/texmf
+TEXMFHOME = $HOME/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2016/texmf-var
+TEXMFVAR = ${TEXMFSYSVAR}
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2016/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.
@@ -94,7 +94,7 @@ TEXMFCONFIG = ~/.texlive2016/texmf-confi
% should take precedence over distribution files -- although it is
@@ -392,7 +392,7 @@
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMF = {$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
% Where to look for ls-R files. There need not be an ls-R in the
% 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.
@@ -102,13 +102,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
% does not create ls-R files in the non-!! elements -- because if an
@@ -408,7 +408,7 @@
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
+SYSTEXMF = $TEXMFSYSCONFIG;$TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
% First writable tree here is used by Lua(La)TeX for the font cache.
% First writable tree here is used by Lua(La)TeX for the font cache.
% LuaLaTeX uses the value here, while ConTeXt uses the same variable but
@@ -119,7 +119,6 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
% Where generated fonts may be written. This tree is used when the sources
@@ -416,7 +416,7 @@
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = $TEXMFVAR/fonts
% On some systems, there will be a system tree which contains all the font
% 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
@@ -130,7 +129,8 @@ VARTEXFONTS = $TEXMFVAR/fonts
%
@@ -426,7 +426,7 @@
+VARTEXFONTS = /var/cache/texmf/fonts
+HOMECACHE = ${HOME}/.cache/texmf/fonts
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Usually you will not need to edit any of the following variables.
@@ -138,7 +138,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
@@ -435,7 +435,7 @@
-WEB2C = $TEXMF/web2c
+WEB2C = ${TEXMFHOME}/web2c;${TEXMFSYSCONFIG}/web2c;${TEXMFSYSVAR}/web2c;$TEXMF/web2c
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
% or \openin, including .sty, .eps, etc. We specify paths for all known
@@ -179,18 +179,18 @@ TEXINPUTS.elatex = .;$TEXMF/tex/{
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
@@ -464,8 +464,8 @@
+TEXINPUTS.pdfelatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+TEXINPUTS.pdfetex = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -238,18 +238,18 @@ BSTINPUTS.pbibtex = .;$TEXMF/{pbib
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
@@ -489,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,}//
@@ -258,7 +258,7 @@ TEXINPUTS = .;$TEXMF/tex/{
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
@@ -498,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.
@@ -268,31 +268,31 @@ MPINPUTS = .;$TEXMF/metapost//
% We repeat the same definition three times because of the way fmtutil
@@ -537,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).
@@ -302,7 +302,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
GLYPHFONTS = .;$TEXMF/fonts
@@ -546,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
@@ -384,8 +384,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
% For xdvi to find mime.types and .mailcap, if they do not exist in
@@ -557,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.
@@ -404,10 +404,10 @@ WEBINPUTS = .;$TEXMF/web//
CWEBINPUTS = .;$TEXMF/cweb//
@@ -572,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//
@@ -489,33 +489,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% since we don't want to scatter ../'s throughout the value. Hence we
@@ -634,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}
@@ -791,3 +792,33 @@ max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
@@ -668,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-src/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-src/otftotfm/otftotfm.cc 2016-06-07 13:40:23.541446341 +0000
@@ -67,6 +67,9 @@
@@ -681,7 +681,7 @@
+
using namespace Efont;
#define VERSION_OPT 301
#define VERSION_OPT 301
--- texk/ps2pk/pk2bm.c
+++ texk/ps2pk/pk2bm.c 2016-06-07 13:54:20.741760758 +0000
@@ -45,7 +45,6 @@
@@ -748,52 +748,54 @@
}
}
- if (argc == 0) {
+ if (argc != 1) {
msg ("pk2bm (ps2pk) version " PACKAGE_VERSION "\n");
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1);
printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
exit(1);
@@ -216,11 +225,3 @@ dots(quarterword u, int n)
bit>>=1;
}
}
}
-
-static int
-atoo(char *oct)
-{
- int octal = 0;
- int octal = 0;
- while (*oct != '\0') octal = 8*octal + (*oct++) - '0';
- return octal;
-}
--- 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)
end
-}
--- texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua 2016-06-07 13:53:04.291194597 +0000
@@ -172,14 +172,25 @@ end
-- possible by exploiting the the fact that Lua has two false values.
-- dvi == nil "do not produce a DVI file" (but maybe PDF)
-- dvi == false "do not process the DVI file" (but stop after TeX)
+local base=string.explode(arg[0], "/+")
+base=string.explode(base[#base], ".+")
+base=base[1]
+
-- defaults:
-tex = "etex"
+if base == "pdfmusixtex" then
+ tex = "pdfetex"
+ dvips = ""
+ dvi = ""
+ ps2pdf = ""
+else
+ tex = "etex"
+ dvips = "dvips -e0 "
+ dvi = dvips
+ ps2pdf = "ps2pdf"
+end
musixflx = "musixflx"
-dvips = "dvips -e0 "
-dvi = dvips
-ps2pdf = "ps2pdf"
intermediate = 1
+base=string.explode(base[#base], ".+")
+base=base[1]
local dvips = "dvips -e0"
function defaults()
prepmx = "prepmx"
pmx = "pmxab"
- tex = "etex"
+ if base == "pdfmusixtex" then
+ tex = "pdfetex"
+ dvips = ""
+ dvi = ""
+ ps2pdf = ""
+ else
+ tex = "etex"
+ dvips = "dvips -e0"
+ dvi = dvips
+ ps2pdf = "ps2pdf"
+ end
musixflx = "musixflx"
- dvi = dvips
- ps2pdf = "ps2pdf"
cleanup = true -- clean up intermediate and log files
index = false
index = 0
latex = false
--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh 2016-06-07 13:40:23.541446341 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
@@ -801,10 +803,10 @@
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texk/texlive/linked_scripts/texlive/fmtutil.pl
exec fmtutil --sys ${1+"$@"}
--- texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-06-07 13:47:22.161607756 +0000
@@ -10,16 +10,16 @@
@@ -11,16 +11,16 @@
# History:
# Original shell script (C) 2001 Thomas Esser, public domain
@@ -824,7 +826,7 @@
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
require "mktexlsr.pl";
TeX::Update->import();
TeX::Update->import();
}
@@ -67,7 +67,7 @@ my @deferred_stdout;
# this function checks by itself whether it is running on windows or not
@@ -833,25 +835,22 @@
-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -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;
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -346,7 +346,14 @@ sub callback_build_formats {
TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
}
} else {
+ my ($uid, $gid);
$tmpdir = File::Temp::tempdir(CLEANUP => 1);
+ 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" ) ;
}
# set up destination directory
$opts{'fmtdir'} ||= "$texmfvar/web2c";
@@ -559,6 +566,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else
@@ -859,7 +858,7 @@
# 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
# The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure.
@@ -610,11 +618,15 @@ sub rebuild_one_format {
",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
@@ -872,11 +871,11 @@
}
+ 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");
+ $texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
+ }
my $cmdline = "$eng -ini $tcxflag $recorderswitch $jobswitch "
. "$prgswitch $texargs";
{
print_verbose("running \`$cmdline' ...\n");
--- texk/texlive/linked_scripts/texlive/updmap-sys.sh
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh 2016-06-07 13:40:23.541446341 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
@@ -884,7 +883,7 @@
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec updmap --sys ${1+"$@"}
exec updmap --sys ${1+"$@"}
--- texk/texlive/tl_scripts/fmtutil.cnf
+++ texk/texlive/tl_scripts/fmtutil.cnf 2016-06-07 13:40:23.541446341 +0000
@@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc
@@ -912,7 +911,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
@@ -131,5 +132,5 @@ xetex xetex language.def -etex xetex.ini
xelatex xetex language.dat -etex xelatex.ini
@@ -921,8 +920,8 @@
-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/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-06-07 13:40:23.541446341 +0000
@@ -157,7 +157,14 @@ termCtl()
###############################################################################
@@ -938,7 +937,7 @@
+ 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
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your TeX system using the
@@ -169,8 +176,9 @@ menuMain()
@@ -951,7 +950,7 @@
+ fi
while :; do
logMessage='view logfile'
logMessage='view logfile'
--- texk/texlive/tl_scripts/texconfig-sys.sh
+++ texk/texlive/tl_scripts/texconfig-sys.sh 2016-06-07 13:40:23.541446341 +0000
@@ -30,4 +30,5 @@ TEXMFVAR="$v"
@@ -959,7 +958,7 @@
export TEXMFVAR TEXMFCONFIG
+umask 022
exec texconfig ${1+"$@"}
exec texconfig ${1+"$@"}
--- texk/texlive/tl_scripts/texconfig.sh
+++ texk/texlive/tl_scripts/texconfig.sh 2016-06-07 13:40:23.541446341 +0000
@@ -40,7 +40,7 @@ envVars="
@@ -1024,7 +1023,7 @@
+ ( unset KPSE_DOT; mktexlsr )
;;
#
#
--- texk/texlive/tl_scripts/texlinks.sh
+++ texk/texlive/tl_scripts/texlinks.sh 2016-06-07 13:40:23.541446341 +0000
@@ -100,7 +100,7 @@ setupTmpDir()
@@ -1123,8 +1122,8 @@
+
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine$exeext"; then
case $unlink in
--- texk/web2c/Makefile.in
case $unlink in
--- texk/web2c/Makefile.in
+++ texk/web2c/Makefile.in 2016-06-07 13:40:23.545446266 +0000
@@ -3816,7 +3816,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
md5main_CPPFLAGS = -I$(srcdir)/libmd5
@@ -1133,7 +1132,7 @@
-all: ff-config.h
+all: ff-config.h w2c/config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -3863,6 +3863,11 @@ w2c/c-auto.h: w2c/stamp-h1
w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
@@ -1146,7 +1145,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-06-07 13:40:23.545446266 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
@@ -1166,7 +1165,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-06-07 13:40:23.621444844 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
@@ -1193,7 +1192,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-06-07 13:40:23.621444844 +0000
@@ -18,8 +18,8 @@
@@ -1206,7 +1205,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-06-07 13:40:23.621444844 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
@@ -1244,7 +1243,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-06-07 13:40:23.621444844 +0000
@@ -1,4 +1,4 @@