From dd9846e2baf6d7e45a11023df9104c531bc90717 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Thu, 1 Mar 2018 09:51:32 +0000
Subject: [PATCH] sync with TexLive revision 46771.

---
 source/build-aux/config.guess                 |   8 +-
 source/build-aux/config.sub                   |   5 +-
 source/build-aux/texinfo.tex                  |   2 +-
 source/configure                              |   4 +-
 source/doc/tlbuild.info                       | 622 +++++++++---------
 source/doc/tlbuild.texi                       |  64 +-
 source/libs/configure                         |  20 +-
 source/libs/zziplib/TLpatches/ChangeLog       |   4 +
 .../libs/zziplib/zziplib-src/zzip/__string.h  |  10 +
 source/texk/configure                         |  20 +-
 source/texk/kpathsea/ChangeLog                |  18 +
 source/texk/kpathsea/NEWS                     |   2 +-
 source/texk/kpathsea/c-auto.in                |   2 +-
 source/texk/kpathsea/cnf-to-paths.awk         |   9 +-
 source/texk/kpathsea/configure                |  24 +-
 source/texk/kpathsea/lib.h                    |   1 +
 source/texk/kpathsea/tex-make.c               |   6 +-
 source/texk/kpathsea/texmf.cnf                |   8 +-
 source/texk/kpathsea/version.ac               |   4 +-
 source/texk/texlive/configure                 |  20 +-
 source/texk/web2c/ChangeLog                   |   6 +
 source/texk/web2c/configure                   |  24 +-
 source/texk/web2c/doc/web2c.info              | 182 ++---
 source/texk/web2c/doc/web2c.texi              |  15 +-
 .../texk/web2c/luatexdir/luatex_svnversion.h  |   2 +-
 source/texk/web2c/man/ChangeLog               |   6 +
 source/texk/web2c/man/bibtex.man              |  16 +-
 source/texk/web2c/web2c/configure             |  20 +-
 source/utils/README                           |  17 +-
 source/utils/configure                        |  20 +-
 source/version.ac                             |   6 +-
 31 files changed, 594 insertions(+), 573 deletions(-)

diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index 9baaa270b..f50dcdb6d 100755
--- a/source/build-aux/config.guess
+++ b/source/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-01-26'
+timestamp='2018-02-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1046,7 +1046,11 @@ EOF
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
     x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	if objdump -f /bin/sh | grep -q elf32-x86-64; then
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+	else
+	    echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	fi
 	exit ;;
     xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index 818892c1c..1d8e98bce 100755
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-01-15'
+timestamp='2018-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1389,7 +1389,8 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+	      | -midnightbsd*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index c614e0240..0af2f09b5 100644
--- a/source/build-aux/texinfo.tex
+++ b/source/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2018-01-09.11}
+\def\texinfoversion{2018-02-24.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
diff --git a/source/configure b/source/configure
index c3fd35922..be731de0c 100755
--- a/source/configure
+++ b/source/configure
@@ -22739,11 +22739,11 @@ msg_compiling="$msg_compiling
 test "x$srcdir" = x. || msg_compiling="$msg_compiling
       from sources in $kpse_src"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2018/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2018$with_banner_add):
 
    $msg_compiling" >&5
 $as_echo "
-** Configuration summary for $PACKAGE_STRING (2018/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2018$with_banner_add):
 
    $msg_compiling" >&6; }
 case $kpse_src$kpse_bld in
diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info
index e777a5e06..17c2eb65d 100644
--- a/source/doc/tlbuild.info
+++ b/source/doc/tlbuild.info
@@ -76,13 +76,13 @@ information for different systems, along with
    For information on acquiring the TL sources, see
 <http://tug.org/texlive/svn>.
 
-   This manual does not duplicate the (primarily user-level) information
-found in other TL documentation resources, such as:
+   This manual does not duplicate the information found in other TL
+documentation resources, such as:
 
    * The TeX Live web pages: <http://tug.org/texlive>.
 
-   * The web page with an overview of how to build the binaries which
-     are distributed with TeX Live: <http://tug.org/texlive/build.html>.
+   * The web page describing how to build the binaries which are
+     distributed with TeX Live: <http://tug.org/texlive/build.html>.
 
    * The TeX Live user manual: <http://tug.org/texlive/doc.html>, or run
      'texdoc texlive'.
@@ -5072,312 +5072,312 @@ Index
 Tag Table:
 Node: Top1208
 Node: Introduction2183
-Node: Overview of build system3938
-Node: Prerequisites5981
-Node: Building8379
-Node: Build iteration9627
-Node: Build problems10699
-Node: Build in parallel11102
-Node: Build distribution11694
-Node: Build one package12265
-Node: Installing15617
-Node: Installation directories16632
-Node: Linked scripts18448
-Node: Distro builds19929
-Node: Layout and infrastructure22319
-Node: Build system tools23147
-Node: Top-level directories25158
-Node: Autoconf macros27572
-Node: General setup macros28273
-Node: Macros for programs29140
-Node: Macros for compilers29952
-Node: Macros for libraries31386
-Node: Macros for library and header flags31812
-Node: Macros for Windows33692
-Node: Library modules35269
-Node: png library35758
-Node: zlib library38032
-Node: freetype library38547
-Node: kpathsea library39075
-Node: Program modules40474
-Node: t1utils package40902
-Node: xindy package41453
-Node: xdvik package42603
-Node: asymptote43676
-Node: Extending TeX Live44127
-Node: Adding a new program module44904
-Node: Adding a new generic library module48199
-Node: Adding a new TeX-specific library module50412
-Node: Configure options51099
-Node: Global configure options52481
-Node: --disable-native-texlive-build53023
-Node: --prefix --bindir ...54013
-Node: --disable-largefile54553
-Node: --disable-missing55238
-Node: --enable-compiler-warnings=LEVEL55639
-Node: --enable-cxx-runtime-hack56378
-Node: --enable-maintainer-mode56805
-Node: --enable-multiplatform57334
-Node: --enable-shared57872
-Node: --enable-silent-rules58243
-Node: --without-ln-s58699
-Node: --without-x59050
-Node: Program-specific configure options59238
-Node: --enable-PROG --disable-PROG59881
-Node: --disable-all-pkgs60158
-Node: Configure options for texk/web2c61144
-Node: Configure options for texk/bibtex-x63662
-Node: Configure options for texk/dvipdfm-x64205
-Node: Configure options for texk/dvisvgm64978
-Node: Configure options for texk/texlive65864
-Node: Configure options for texk/xdvik66285
-Node: Configure options for utils/xindy66889
-Node: Library-specific configure options67790
-Node: Configure options for kpathsea68801
-Node: Configure options for system poppler69510
-Node: Variables for configure70301
-Node: Cross compilation71729
-Node: Cross configuring73028
-Node: Cross problems74701
-Node: Coding conventions76348
-Node: Declarations and definitions77087
-Node: Const79269
-Node: Continuous integration81132
-Node: install-tl84666
-Node: install-tl NAME85011
-Node: install-tl SYNOPSIS85169
-Node: install-tl DESCRIPTION85377
-Node: install-tl REFERENCES86378
-Node: install-tl OPTIONS86894
-Ref: install-tl *-gui* [[=]_module_]87248
-Ref: install-tl text87457
-Ref: install-tl wizard87580
-Ref: install-tl perltk87734
-Ref: install-tl *-no-gui*88168
-Ref: install-tl *-lang* _llcode_88249
-Ref: install-tl *-repository* _url|path_88936
-Ref: install-tl *-select-repository*90747
-Ref: install-tl *-all-options*91183
-Ref: install-tl *-custom-bin* _path_91490
-Ref: install-tl *-debug-translation*92145
-Ref: install-tl *-force-platform* _platform_92364
-Ref: install-tl *-help*, *--help*, *-?*92608
-Ref: install-tl *-in-place*93001
-Ref: install-tl *-logfile* _file_93528
-Ref: install-tl *-no-cls*93879
-Ref: install-tl *-non-admin*94010
-Ref: install-tl *--persistent-downloads*94115
-Ref: install-tl *--no-persistent-downloads*94143
-Ref: install-tl *-portable*94751
-Ref: install-tl *-print-platform*94890
-Ref: install-tl *-profile* _profile_95083
-Ref: install-tl *-q*96577
-Ref: install-tl *-scheme* _scheme_96639
-Ref: install-tl *-v*97113
-Ref: install-tl *-version*, *--version*97274
-Node: install-tl ENVIRONMENT VARIABLES97405
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK97794
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE97996
-Ref: install-tl TEXLIVE_INSTALL_PREFIX98102
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG98133
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME98162
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL98192
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG98226
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR98257
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR98285
-Ref: install-tl NOPERLDOC98340
-Node: install-tl AUTHORS AND COPYRIGHT98404
-Node: tlmgr98762
-Node: tlmgr NAME99199
-Node: tlmgr SYNOPSIS99324
-Node: tlmgr DESCRIPTION99514
-Node: tlmgr EXAMPLES100610
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet100901
-Ref: tlmgr tlmgr update --list101082
-Ref: tlmgr tlmgr update --all101175
-Ref: tlmgr tlmgr info _pkg_101331
-Node: tlmgr OPTIONS101537
-Ref: tlmgr *--repository* _url|path_102057
-Ref: tlmgr *--gui* [_action_]102782
-Ref: tlmgr *--gui-lang* _llcode_103189
-Ref: tlmgr *--debug-translation*103872
-Ref: tlmgr *--machine-readable*104075
-Ref: tlmgr *--no-execute-actions*104343
-Ref: tlmgr *--package-logfile* _file_104536
-Ref: tlmgr *--pause*104791
-Ref: tlmgr *--persistent-downloads*104946
-Ref: tlmgr *--no-persistent-downloads*104974
-Ref: tlmgr *--pin-file*105468
-Ref: tlmgr *--usermode*105686
-Ref: tlmgr *--usertree* _dir_105806
-Node: tlmgr ACTIONS106356
-Node: tlmgr help107588
-Node: tlmgr version108064
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...108382
-Ref: tlmgr *--backupdir* _directory_109476
-Ref: tlmgr *--all*109673
-Ref: tlmgr *--clean*[=_N_]109895
-Ref: tlmgr *--dry-run*110192
-Node: tlmgr candidates _pkg_110312
-Ref: tlmgr *candidates _pkg_* 1110599
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]110743
-Ref: tlmgr *files*111186
-Ref: tlmgr *depends*111321
-Ref: tlmgr *executes*111663
-Ref: tlmgr *runfiles*111781
-Ref: tlmgr *--use-svn*111893
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]112010
-Node: tlmgr dump-tlpdb [--local|--remote]114082
-Ref: tlmgr *--local*114592
-Ref: tlmgr *--remote*114631
-Node: tlmgr generate [_option_]... _what_115053
-Ref: tlmgr *generate language*115294
-Ref: tlmgr *generate language.dat*115319
-Ref: tlmgr *generate language.def*115344
-Ref: tlmgr *generate language.dat.lua*115373
-Ref: tlmgr *generate fmtutil*115393
-Ref: tlmgr *--dest* _output_file_117630
-Ref: tlmgr *--localcfg* _local_conf_file_118206
-Ref: tlmgr *--rebuild-sys*118329
-Node: tlmgr gui119190
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]119434
-Ref: tlmgr *--list*120639
-Ref: tlmgr *--only-installed*120918
-Ref: tlmgr *--taxonomy*121133
-Ref: tlmgr *--keyword*121145
-Ref: tlmgr *--functionality*121163
-Ref: tlmgr *--characterization*121184
-Node: tlmgr init-usertree121397
-Node: tlmgr install [_option_]... _pkg_...121823
-Ref: tlmgr *--file*122187
-Ref: tlmgr *--reinstall*122413
-Ref: tlmgr *--no-depends*122793
-Ref: tlmgr *--no-depends-at-all*122952
-Ref: tlmgr *--dry-run* 1123350
-Ref: tlmgr *--force*123468
-Node: tlmgr option123674
-Ref: tlmgr *option [show]*123847
-Ref: tlmgr *option showall*123865
-Ref: tlmgr *option _key_ [_value_]*123891
-Node: tlmgr paper127739
-Ref: tlmgr *paper [a4|letter]*127924
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*127998
-Node: tlmgr path [--w32mode=user|admin] [add|remove]129025
-Node: tlmgr pinning130508
-Ref: tlmgr pinning show130815
-Ref: tlmgr pinning add _repo_ _pkgglob_...130888
-Ref: tlmgr pinning remove _repo_ _pkgglob_...131007
-Ref: tlmgr pinning remove _repo_ --all131160
-Node: tlmgr platform list|add|remove _platform_...131214
-Node: tlmgr platform set _platform_131462
-Node: tlmgr platform set auto131690
-Ref: tlmgr *--dry-run* 2132807
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...132916
-Node: tlmgr print-platform134218
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]134690
-Ref: tlmgr *--all* 1135586
-Ref: tlmgr *--backupdir* _directory_ 1135780
-Ref: tlmgr *--dry-run* 3135936
-Ref: tlmgr *--force* 1136053
-Node: tlmgr remove [_option_]... _pkg_...136081
-Ref: tlmgr *--no-depends* 1136604
-Ref: tlmgr *--no-depends-at-all* 1136666
-Ref: tlmgr *--force* 2136722
-Ref: tlmgr *--dry-run* 4137194
-Node: tlmgr repository137301
-Ref: tlmgr *repository list*137509
-Ref: tlmgr *repository list _path|tag_*137539
-Ref: tlmgr *repository add _path_ [_tag_]*137572
-Ref: tlmgr *repository remove _path|tag_*137604
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*137658
-Node: tlmgr search [_option_...] _what_138742
-Node: tlmgr search [_option_...] --file _what_139253
-Node: tlmgr search [_option_...] --taxonomy _what_139504
-Node: tlmgr search [_option_...] --keyword _what_139815
-Node: tlmgr search [_option_...] --functionality _what_140133
-Node: tlmgr search [_option_...] --characterization _what_140471
-Node: tlmgr search [_option_...] --all _what_140811
-Ref: tlmgr *--global*141259
-Ref: tlmgr *--word*141371
-Ref: tlmgr *--list* 1141610
-Ref: tlmgr *--file* 1141956
-Ref: tlmgr *--taxonomy* 1142013
-Ref: tlmgr *--keyword* 1142025
-Ref: tlmgr *--functionality* 1142043
-Ref: tlmgr *--characterization* 1142064
-Ref: tlmgr *--all* 2142219
-Node: tlmgr uninstall142302
-Ref: tlmgr *--force* 3142556
-Node: tlmgr update [_option_]... [_pkg_]...142612
-Ref: tlmgr *--all* 3142983
-Ref: tlmgr *--self*144724
-Ref: tlmgr *--dry-run* 5145488
-Ref: tlmgr *--list* [_pkg_]145665
-Ref: tlmgr *--exclude* _pkg_146354
-Ref: tlmgr *--no-auto-remove* [_pkg_]...147047
-Ref: tlmgr *--no-auto-install* [_pkg_]...147498
-Ref: tlmgr *--reinstall-forcibly-removed*148154
-Ref: tlmgr *--backup* and *--backupdir* _directory_148718
-Ref: tlmgr *--no-depends* 2149899
-Ref: tlmgr *--no-depends-at-all* 2150102
-Ref: tlmgr *--force* 4150158
-Node: tlmgr USER MODE150584
-Node: tlmgr user mode install153395
-Node: tlmgr user mode backup; restore; remove; update154342
-Node: tlmgr user mode generate; option; paper154784
-Node: tlmgr CONFIGURATION FILE FOR TLMGR155160
-Node: tlmgr TAXONOMIES156251
-Ref: tlmgr --keyword 2156877
-Ref: tlmgr --functionality 2156962
-Ref: tlmgr --characterization 2157118
-Ref: tlmgr --taxonomy 2157259
-Node: tlmgr MULTIPLE REPOSITORIES157800
-Node: tlmgr Pinning159521
-Node: tlmgr GUI FOR TLMGR161496
-Node: tlmgr Main display162718
-Node: tlmgr Display configuration area162970
-Ref: tlmgr Status163331
-Ref: tlmgr Category163495
-Ref: tlmgr Match163681
-Ref: tlmgr Selection163941
-Ref: tlmgr Display configuration buttons164145
-Node: tlmgr Package list area164328
-Ref: tlmgr a checkbox164912
-Ref: tlmgr package name165048
-Ref: tlmgr local revision (and version)165147
-Ref: tlmgr remote revision (and version)165522
-Ref: tlmgr short description165819
-Node: tlmgr Main display action buttons165864
-Ref: tlmgr Update all installed166130
-Ref: tlmgr Update166502
-Ref: tlmgr Install166552
-Ref: tlmgr Remove166738
-Ref: tlmgr Backup166916
-Node: tlmgr Menu bar167073
-Ref: tlmgr tlmgr menu167270
-Ref: tlmgr Options menu167578
-Ref: tlmgr Actions menu168661
-Ref: tlmgr Help menu169089
-Node: tlmgr MACHINE-READABLE OUTPUT169222
-Node: tlmgr Machine-readable update and install output170032
-Ref: tlmgr location-url _location_171308
-Ref: tlmgr total-bytes _count_171524
-Ref: tlmgr _pkgname_171934
-Ref: tlmgr _status_172144
-Ref: tlmgr d172222
-Ref: tlmgr f172282
-Ref: tlmgr u172461
-Ref: tlmgr r172507
-Ref: tlmgr a172630
-Ref: tlmgr i172808
-Ref: tlmgr I172927
-Ref: tlmgr _localrev_173029
-Ref: tlmgr _serverrev_173136
-Ref: tlmgr _size_173248
-Ref: tlmgr _runtime_173417
-Ref: tlmgr _esttot_173487
-Node: tlmgr Machine-readable option output173520
-Node: tlmgr AUTHORS AND COPYRIGHT174032
-Node: Index174379
+Node: Overview of build system3906
+Node: Prerequisites5949
+Node: Building8347
+Node: Build iteration9595
+Node: Build problems10667
+Node: Build in parallel11070
+Node: Build distribution11662
+Node: Build one package12233
+Node: Installing15585
+Node: Installation directories16600
+Node: Linked scripts18416
+Node: Distro builds19897
+Node: Layout and infrastructure22287
+Node: Build system tools23115
+Node: Top-level directories25126
+Node: Autoconf macros27540
+Node: General setup macros28241
+Node: Macros for programs29108
+Node: Macros for compilers29920
+Node: Macros for libraries31354
+Node: Macros for library and header flags31780
+Node: Macros for Windows33660
+Node: Library modules35237
+Node: png library35726
+Node: zlib library38000
+Node: freetype library38515
+Node: kpathsea library39043
+Node: Program modules40442
+Node: t1utils package40870
+Node: xindy package41421
+Node: xdvik package42571
+Node: asymptote43644
+Node: Extending TeX Live44095
+Node: Adding a new program module44872
+Node: Adding a new generic library module48167
+Node: Adding a new TeX-specific library module50380
+Node: Configure options51067
+Node: Global configure options52449
+Node: --disable-native-texlive-build52991
+Node: --prefix --bindir ...53981
+Node: --disable-largefile54521
+Node: --disable-missing55206
+Node: --enable-compiler-warnings=LEVEL55607
+Node: --enable-cxx-runtime-hack56346
+Node: --enable-maintainer-mode56773
+Node: --enable-multiplatform57302
+Node: --enable-shared57840
+Node: --enable-silent-rules58211
+Node: --without-ln-s58667
+Node: --without-x59018
+Node: Program-specific configure options59206
+Node: --enable-PROG --disable-PROG59849
+Node: --disable-all-pkgs60126
+Node: Configure options for texk/web2c61112
+Node: Configure options for texk/bibtex-x63630
+Node: Configure options for texk/dvipdfm-x64173
+Node: Configure options for texk/dvisvgm64946
+Node: Configure options for texk/texlive65832
+Node: Configure options for texk/xdvik66253
+Node: Configure options for utils/xindy66857
+Node: Library-specific configure options67758
+Node: Configure options for kpathsea68769
+Node: Configure options for system poppler69478
+Node: Variables for configure70269
+Node: Cross compilation71697
+Node: Cross configuring72996
+Node: Cross problems74669
+Node: Coding conventions76316
+Node: Declarations and definitions77055
+Node: Const79237
+Node: Continuous integration81100
+Node: install-tl84634
+Node: install-tl NAME84979
+Node: install-tl SYNOPSIS85137
+Node: install-tl DESCRIPTION85345
+Node: install-tl REFERENCES86346
+Node: install-tl OPTIONS86862
+Ref: install-tl *-gui* [[=]_module_]87216
+Ref: install-tl text87425
+Ref: install-tl wizard87548
+Ref: install-tl perltk87702
+Ref: install-tl *-no-gui*88136
+Ref: install-tl *-lang* _llcode_88217
+Ref: install-tl *-repository* _url|path_88904
+Ref: install-tl *-select-repository*90715
+Ref: install-tl *-all-options*91151
+Ref: install-tl *-custom-bin* _path_91458
+Ref: install-tl *-debug-translation*92113
+Ref: install-tl *-force-platform* _platform_92332
+Ref: install-tl *-help*, *--help*, *-?*92576
+Ref: install-tl *-in-place*92969
+Ref: install-tl *-logfile* _file_93496
+Ref: install-tl *-no-cls*93847
+Ref: install-tl *-non-admin*93978
+Ref: install-tl *--persistent-downloads*94083
+Ref: install-tl *--no-persistent-downloads*94111
+Ref: install-tl *-portable*94719
+Ref: install-tl *-print-platform*94858
+Ref: install-tl *-profile* _profile_95051
+Ref: install-tl *-q*96545
+Ref: install-tl *-scheme* _scheme_96607
+Ref: install-tl *-v*97081
+Ref: install-tl *-version*, *--version*97242
+Node: install-tl ENVIRONMENT VARIABLES97373
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK97762
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE97964
+Ref: install-tl TEXLIVE_INSTALL_PREFIX98070
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG98101
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME98130
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL98160
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG98194
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR98225
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR98253
+Ref: install-tl NOPERLDOC98308
+Node: install-tl AUTHORS AND COPYRIGHT98372
+Node: tlmgr98730
+Node: tlmgr NAME99167
+Node: tlmgr SYNOPSIS99292
+Node: tlmgr DESCRIPTION99482
+Node: tlmgr EXAMPLES100578
+Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet100869
+Ref: tlmgr tlmgr update --list101050
+Ref: tlmgr tlmgr update --all101143
+Ref: tlmgr tlmgr info _pkg_101299
+Node: tlmgr OPTIONS101505
+Ref: tlmgr *--repository* _url|path_102025
+Ref: tlmgr *--gui* [_action_]102750
+Ref: tlmgr *--gui-lang* _llcode_103157
+Ref: tlmgr *--debug-translation*103840
+Ref: tlmgr *--machine-readable*104043
+Ref: tlmgr *--no-execute-actions*104311
+Ref: tlmgr *--package-logfile* _file_104504
+Ref: tlmgr *--pause*104759
+Ref: tlmgr *--persistent-downloads*104914
+Ref: tlmgr *--no-persistent-downloads*104942
+Ref: tlmgr *--pin-file*105436
+Ref: tlmgr *--usermode*105654
+Ref: tlmgr *--usertree* _dir_105774
+Node: tlmgr ACTIONS106324
+Node: tlmgr help107556
+Node: tlmgr version108032
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...108350
+Ref: tlmgr *--backupdir* _directory_109444
+Ref: tlmgr *--all*109641
+Ref: tlmgr *--clean*[=_N_]109863
+Ref: tlmgr *--dry-run*110160
+Node: tlmgr candidates _pkg_110280
+Ref: tlmgr *candidates _pkg_* 1110567
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]110711
+Ref: tlmgr *files*111154
+Ref: tlmgr *depends*111289
+Ref: tlmgr *executes*111631
+Ref: tlmgr *runfiles*111749
+Ref: tlmgr *--use-svn*111861
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]111978
+Node: tlmgr dump-tlpdb [--local|--remote]114050
+Ref: tlmgr *--local*114560
+Ref: tlmgr *--remote*114599
+Node: tlmgr generate [_option_]... _what_115021
+Ref: tlmgr *generate language*115262
+Ref: tlmgr *generate language.dat*115287
+Ref: tlmgr *generate language.def*115312
+Ref: tlmgr *generate language.dat.lua*115341
+Ref: tlmgr *generate fmtutil*115361
+Ref: tlmgr *--dest* _output_file_117598
+Ref: tlmgr *--localcfg* _local_conf_file_118174
+Ref: tlmgr *--rebuild-sys*118297
+Node: tlmgr gui119158
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]119402
+Ref: tlmgr *--list*120607
+Ref: tlmgr *--only-installed*120886
+Ref: tlmgr *--taxonomy*121101
+Ref: tlmgr *--keyword*121113
+Ref: tlmgr *--functionality*121131
+Ref: tlmgr *--characterization*121152
+Node: tlmgr init-usertree121365
+Node: tlmgr install [_option_]... _pkg_...121791
+Ref: tlmgr *--file*122155
+Ref: tlmgr *--reinstall*122381
+Ref: tlmgr *--no-depends*122761
+Ref: tlmgr *--no-depends-at-all*122920
+Ref: tlmgr *--dry-run* 1123318
+Ref: tlmgr *--force*123436
+Node: tlmgr option123642
+Ref: tlmgr *option [show]*123815
+Ref: tlmgr *option showall*123833
+Ref: tlmgr *option _key_ [_value_]*123859
+Node: tlmgr paper127707
+Ref: tlmgr *paper [a4|letter]*127892
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*127966
+Node: tlmgr path [--w32mode=user|admin] [add|remove]128993
+Node: tlmgr pinning130476
+Ref: tlmgr pinning show130783
+Ref: tlmgr pinning add _repo_ _pkgglob_...130856
+Ref: tlmgr pinning remove _repo_ _pkgglob_...130975
+Ref: tlmgr pinning remove _repo_ --all131128
+Node: tlmgr platform list|add|remove _platform_...131182
+Node: tlmgr platform set _platform_131430
+Node: tlmgr platform set auto131658
+Ref: tlmgr *--dry-run* 2132775
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...132884
+Node: tlmgr print-platform134186
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]134658
+Ref: tlmgr *--all* 1135554
+Ref: tlmgr *--backupdir* _directory_ 1135748
+Ref: tlmgr *--dry-run* 3135904
+Ref: tlmgr *--force* 1136021
+Node: tlmgr remove [_option_]... _pkg_...136049
+Ref: tlmgr *--no-depends* 1136572
+Ref: tlmgr *--no-depends-at-all* 1136634
+Ref: tlmgr *--force* 2136690
+Ref: tlmgr *--dry-run* 4137162
+Node: tlmgr repository137269
+Ref: tlmgr *repository list*137477
+Ref: tlmgr *repository list _path|tag_*137507
+Ref: tlmgr *repository add _path_ [_tag_]*137540
+Ref: tlmgr *repository remove _path|tag_*137572
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*137626
+Node: tlmgr search [_option_...] _what_138710
+Node: tlmgr search [_option_...] --file _what_139221
+Node: tlmgr search [_option_...] --taxonomy _what_139472
+Node: tlmgr search [_option_...] --keyword _what_139783
+Node: tlmgr search [_option_...] --functionality _what_140101
+Node: tlmgr search [_option_...] --characterization _what_140439
+Node: tlmgr search [_option_...] --all _what_140779
+Ref: tlmgr *--global*141227
+Ref: tlmgr *--word*141339
+Ref: tlmgr *--list* 1141578
+Ref: tlmgr *--file* 1141924
+Ref: tlmgr *--taxonomy* 1141981
+Ref: tlmgr *--keyword* 1141993
+Ref: tlmgr *--functionality* 1142011
+Ref: tlmgr *--characterization* 1142032
+Ref: tlmgr *--all* 2142187
+Node: tlmgr uninstall142270
+Ref: tlmgr *--force* 3142524
+Node: tlmgr update [_option_]... [_pkg_]...142580
+Ref: tlmgr *--all* 3142951
+Ref: tlmgr *--self*144692
+Ref: tlmgr *--dry-run* 5145456
+Ref: tlmgr *--list* [_pkg_]145633
+Ref: tlmgr *--exclude* _pkg_146322
+Ref: tlmgr *--no-auto-remove* [_pkg_]...147015
+Ref: tlmgr *--no-auto-install* [_pkg_]...147466
+Ref: tlmgr *--reinstall-forcibly-removed*148122
+Ref: tlmgr *--backup* and *--backupdir* _directory_148686
+Ref: tlmgr *--no-depends* 2149867
+Ref: tlmgr *--no-depends-at-all* 2150070
+Ref: tlmgr *--force* 4150126
+Node: tlmgr USER MODE150552
+Node: tlmgr user mode install153363
+Node: tlmgr user mode backup; restore; remove; update154310
+Node: tlmgr user mode generate; option; paper154752
+Node: tlmgr CONFIGURATION FILE FOR TLMGR155128
+Node: tlmgr TAXONOMIES156219
+Ref: tlmgr --keyword 2156845
+Ref: tlmgr --functionality 2156930
+Ref: tlmgr --characterization 2157086
+Ref: tlmgr --taxonomy 2157227
+Node: tlmgr MULTIPLE REPOSITORIES157768
+Node: tlmgr Pinning159489
+Node: tlmgr GUI FOR TLMGR161464
+Node: tlmgr Main display162686
+Node: tlmgr Display configuration area162938
+Ref: tlmgr Status163299
+Ref: tlmgr Category163463
+Ref: tlmgr Match163649
+Ref: tlmgr Selection163909
+Ref: tlmgr Display configuration buttons164113
+Node: tlmgr Package list area164296
+Ref: tlmgr a checkbox164880
+Ref: tlmgr package name165016
+Ref: tlmgr local revision (and version)165115
+Ref: tlmgr remote revision (and version)165490
+Ref: tlmgr short description165787
+Node: tlmgr Main display action buttons165832
+Ref: tlmgr Update all installed166098
+Ref: tlmgr Update166470
+Ref: tlmgr Install166520
+Ref: tlmgr Remove166706
+Ref: tlmgr Backup166884
+Node: tlmgr Menu bar167041
+Ref: tlmgr tlmgr menu167238
+Ref: tlmgr Options menu167546
+Ref: tlmgr Actions menu168629
+Ref: tlmgr Help menu169057
+Node: tlmgr MACHINE-READABLE OUTPUT169190
+Node: tlmgr Machine-readable update and install output170000
+Ref: tlmgr location-url _location_171276
+Ref: tlmgr total-bytes _count_171492
+Ref: tlmgr _pkgname_171902
+Ref: tlmgr _status_172112
+Ref: tlmgr d172190
+Ref: tlmgr f172250
+Ref: tlmgr u172429
+Ref: tlmgr r172475
+Ref: tlmgr a172598
+Ref: tlmgr i172776
+Ref: tlmgr I172895
+Ref: tlmgr _localrev_172997
+Ref: tlmgr _serverrev_173104
+Ref: tlmgr _size_173216
+Ref: tlmgr _runtime_173385
+Ref: tlmgr _esttot_173455
+Node: tlmgr Machine-readable option output173488
+Node: tlmgr AUTHORS AND COPYRIGHT174000
+Node: Index174347
 
 End Tag Table
diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi
index de29edd07..a3b638edc 100644
--- a/source/doc/tlbuild.texi
+++ b/source/doc/tlbuild.texi
@@ -119,13 +119,13 @@ information for different systems, along with
 For information on acquiring the TL sources, see
 @url{http://tug.org/texlive/svn}.
 
-This manual does not duplicate the (primarily user-level) information
-found in other TL documentation resources, such as:
+This manual does not duplicate the information found in other TL
+documentation resources, such as:
 
 @itemize
 @item The @TL{} web pages: @url{http://tug.org/texlive}.
 
-@item The web page with an overview of how to build the binaries which 
+@item The web page describing how to build the binaries which 
 are distributed with @TL{}: @url{http://tug.org/texlive/build.html}.
 
 @item The @TL{} user manual: @url{http://tug.org/texlive/doc.html}, or
@@ -2571,64 +2571,6 @@ push. No further action is necessary on Travis-CI.
 If changes have been pushed via the cron job above, Travis-CI will
 automatically checkout the last pushed commit and try building it.
 
-@comment
-@comment The following needs improvement
-@comment
-@comment @subheading Developer setup for Git/Subversion
-@comment 
-@comment In case a developer of code in the @TL{} source code wants to use the CI
-@comment testing facility, the following steps are necessary for initialization:
-@comment 
-@comment @itemize @bullet
-@comment @item
-@comment Initial @code{git-svn} checkout as laid out above, replacing
-@comment @code{USER} with the Subversion user name. This initial checkout might
-@comment take quite some time as the whole history has to be parsed. In case the
-@comment checkout is interrupted, change into the already created folder and call
-@comment @code{git svn fetch} to continue pulling from the remote until all
-@comment changes have been fetched.
-@comment 
-@comment @item
-@comment Adding the Git remote as laid out above. After that it is also necessary
-@comment to set the upstream for the @code{master} branch with
-@comment @code{git branch --set-upstream-to=origin/master master} followed by a
-@comment @code{git pull}. The last command will probably not fetch anything since
-@comment but update the local information about availability.
-@comment 
-@comment @end itemize
-@comment 
-@comment After this development can be done as follows:
-@comment 
-@comment @itemize @bullet
-@comment @item
-@comment Create a new branch based on @code{master}: @code{git checkout -b feature}
-@comment and develop the new features in this branch.
-@comment 
-@comment @item
-@comment Pushing the branch to Github will kick of automatic CI testing on this
-@comment branch, too.
-@comment 
-@comment @item
-@comment When the feature is ready, first the branch @code{feature} needs to be
-@comment rebased onto current @code{master} with @code{git rebase master}, then
-@comment merged into @code{master}, followed by a submission to the Subversion
-@comment repository via @code{git svn dcommit}. Don't push to master on Github
-@comment (it is anyway protected), your changes will come in in due time via a
-@comment pull on master.
-@comment 
-@comment @item
-@comment After the branch is included in master, optionally delete the local and
-@comment rmeote branch @code{feature}.
-@comment 
-@comment @end itemize
-@comment 
-@comment The above method is the standards and safest method, but there is an
-@comment alternative way by first pulling from Github, and then tricking git-svn
-@comment into believing that everything has been fetched from Subversion
-@comment already. This alternative method is explained XXXXXXXXX (my BLOG?)
-@comment 
-@comment 
-
 @c made from pod doc.
 @include tlbuild-incl/install-tl.texi
 @include tlbuild-incl/tlmgr.texi
diff --git a/source/libs/configure b/source/libs/configure
index 40b976a6c..c0b9edd2f 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live libs 2018/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live libs 2018.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live libs'
 PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2018/dev'
-PACKAGE_STRING='TeX Live libs 2018/dev'
+PACKAGE_VERSION='2018'
+PACKAGE_STRING='TeX Live libs 2018'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1315,7 +1315,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live libs 2018/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2018 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1385,7 +1385,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live libs 2018/dev:";;
+     short | recursive ) echo "Configuration of TeX Live libs 2018:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live libs configure 2018/dev
+TeX Live libs configure 2018
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1673,7 +1673,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live libs $as_me 2018/dev, which was
+It was created by TeX Live libs $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4470,7 +4470,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live-libs'
- VERSION='2018/dev'
+ VERSION='2018'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5419,7 +5419,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live libs $as_me 2018/dev, which was
+This file was extended by TeX Live libs $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5476,7 +5476,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live libs config.status 2018/dev
+TeX Live libs config.status 2018
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/libs/zziplib/TLpatches/ChangeLog b/source/libs/zziplib/TLpatches/ChangeLog
index 0412cc0bf..b763da0f4 100644
--- a/source/libs/zziplib/TLpatches/ChangeLog
+++ b/source/libs/zziplib/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-01  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* patch-04-strnlen: Add for platforms without strnlen.
+
 2018-02-06  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import zziplib-0.13.68.
diff --git a/source/libs/zziplib/zziplib-src/zzip/__string.h b/source/libs/zziplib/zziplib-src/zzip/__string.h
index 351b0c141..f5b7cb870 100644
--- a/source/libs/zziplib/zziplib-src/zzip/__string.h
+++ b/source/libs/zziplib/zziplib-src/zzip/__string.h
@@ -18,6 +18,16 @@
 #define _zzip_strndup strndup
 #else
 
+static size_t  my_strnlen(const char*  str, size_t  maxlen)
+{
+    char *p = memchr(str, 0, maxlen);
+    if (p == NULL)
+       return maxlen;
+    else
+       return (p - str);
+}
+#define strnlen(x,y) my_strnlen((x),(y))
+
 /* if your system does not have strndup: */
 zzip__new__ static char *
 _zzip_strndup(char const *p, size_t maxlen)
diff --git a/source/texk/configure b/source/texk/configure
index 7b75ec686..63bd05be1 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live texk 2018/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live texk 2018.
 #
 # Report bugs to <tex-live@tug.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live texk'
 PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2018/dev'
-PACKAGE_STRING='TeX Live texk 2018/dev'
+PACKAGE_VERSION='2018'
+PACKAGE_STRING='TeX Live texk 2018'
 PACKAGE_BUGREPORT='tex-live@tug.org'
 PACKAGE_URL=''
 
@@ -1315,7 +1315,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live texk 2018/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2018 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1385,7 +1385,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live texk 2018/dev:";;
+     short | recursive ) echo "Configuration of TeX Live texk 2018:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live texk configure 2018/dev
+TeX Live texk configure 2018
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1673,7 +1673,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live texk $as_me 2018/dev, which was
+It was created by TeX Live texk $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4470,7 +4470,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live-texk'
- VERSION='2018/dev'
+ VERSION='2018'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5391,7 +5391,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live texk $as_me 2018/dev, which was
+This file was extended by TeX Live texk $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5448,7 +5448,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live texk config.status 2018/dev
+TeX Live texk config.status 2018
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index f2a0ce396..01547b41e 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,21 @@
+2018-02-26  Karl Berry  <karl@freefriends.org>
+
+	* texmf.cnf (TEXMFVAR, TEXMFCONFIG, doc): 2018.
+
+2018-02-24  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
+	* tex-make.c (kpathsea_make_tex): Change an error message
+	"Invalid fontname" to "Invalid filename", since
+	  $ tex -fmt=-a x
+	causes
+	  kpathsea:make_tex: Invalid fontname `-a.fmt', starts with '-'
+	but it is a format file.
+
+2018-02-23  Karl Berry  <karl@freefriends.org>
+
+	* lib.h (LIB_START_FATAL): mention that the identifier `kpse'
+	has to be defined for this to work.  (In practice, it's a local
+	variable.) Private report from Douglas McKenna, 2018/02/21.
+
 2018-02-21  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* xgetcwd.c: Replace LIB_FATAL2 by FATAL2.
diff --git a/source/texk/kpathsea/NEWS b/source/texk/kpathsea/NEWS
index 04b493e0f..53a12abe0 100644
--- a/source/texk/kpathsea/NEWS
+++ b/source/texk/kpathsea/NEWS
@@ -1,4 +1,4 @@
-$Id$
+$Id: NEWS 46759 2018-02-27 23:14:55Z karl $
 This file records noteworthy changes.  (Public domain.)
 
 6.3.0 (for TeX Live 2018)
diff --git a/source/texk/kpathsea/c-auto.in b/source/texk/kpathsea/c-auto.in
index 0d7f71e8e..b815b475e 100644
--- a/source/texk/kpathsea/c-auto.in
+++ b/source/texk/kpathsea/c-auto.in
@@ -23,7 +23,7 @@
 #define KPATHSEA_C_AUTO_H
 
 /* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.3.0/dev"
+#define KPSEVERSION "kpathsea version 6.3.0"
 
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
diff --git a/source/texk/kpathsea/cnf-to-paths.awk b/source/texk/kpathsea/cnf-to-paths.awk
index 939f54d32..894f35282 100644
--- a/source/texk/kpathsea/cnf-to-paths.awk
+++ b/source/texk/kpathsea/cnf-to-paths.awk
@@ -1,4 +1,4 @@
-# $Id: cnf-to-paths.awk 23442 2011-08-07 22:50:24Z karl $
+# $Id: cnf-to-paths.awk 46719 2018-02-23 19:30:01Z karl $
 # cnf-to-paths.awk - convert texmf.cnf assignments to paths.h #define's.
 # Public domain.  Originally written 2011, Karl Berry.
 
@@ -14,7 +14,10 @@
   # 
   # 1) definitions referring to SELFAUTO*, which we want to keep.  In
   # particular, this is how the compile-time TEXMFCNF gets defined and
-  # thus how texmf.cnf gets found.
+  # thus how texmf.cnf gets found.  In fact, TEXMFCNF is the only
+  # relevant compile-time value at all, and since its value is not used
+  # from texmf.cnf, we could simplify this whole process in both
+  # directions. Maybe someday.
   # 
   # 2) definitions starting with a /, which we also want to keep.  Here
   # we assume a distro maintainer has changed a variable, e.g.,
@@ -25,7 +28,7 @@
   # That way, the binaries don't get changed just because we change
   # definitions in texmf.cnf.
   # 
-  # The definition of DEFAULT_TEXMF (and other variables)
+  # The definition of DEFAULT_TEXMFROOT (and other variables)
   # that winds up in the final paths.h will not be used.
   
   # Extract the identifier and the value from the line.  Since
diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure
index 6a95b8df3..d0ea2bfaf 100755
--- a/source/texk/kpathsea/configure
+++ b/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.3.0/dev.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.3.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Kpathsea'
 PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.3.0/dev'
-PACKAGE_STRING='Kpathsea 6.3.0/dev'
+PACKAGE_VERSION='6.3.0'
+PACKAGE_STRING='Kpathsea 6.3.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Kpathsea 6.3.0/dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1409,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Kpathsea 6.3.0/dev:";;
+     short | recursive ) echo "Configuration of Kpathsea 6.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Kpathsea configure 6.3.0/dev
+Kpathsea configure 6.3.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2376,7 +2376,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Kpathsea $as_me 6.3.0/dev, which was
+It was created by Kpathsea $as_me 6.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2757,14 +2757,14 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-KPSEVERSION=6.3.0/dev
+KPSEVERSION=6.3.0
 
 
 KPSE_LT_VERSINFO=9:0:3
 
 
 
- WEB2CVERSION=" (TeX Live 2018/dev)"
+ WEB2CVERSION=" (TeX Live 2018)"
 
 
 am__api_version='1.15'
@@ -8071,7 +8071,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kpathsea'
- VERSION='6.3.0/dev'
+ VERSION='6.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14695,7 +14695,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Kpathsea $as_me 6.3.0/dev, which was
+This file was extended by Kpathsea $as_me 6.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14761,7 +14761,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Kpathsea config.status 6.3.0/dev
+Kpathsea config.status 6.3.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/texk/kpathsea/lib.h b/source/texk/kpathsea/lib.h
index df380f654..9255834ce 100644
--- a/source/texk/kpathsea/lib.h
+++ b/source/texk/kpathsea/lib.h
@@ -87,6 +87,7 @@ extern "C" {
 #define WARNING4(str, e1, e2, e3, e4)                                   \
   START_WARNING (); fprintf (stderr, str, e1, e2, e3, e4); END_WARNING ()
 
+/* This requires an identifier `kpse' to be set up correctly.  Sorry.  */
 #define LIB_START_FATAL() do { \
   fprintf (stderr, "%s: fatal: ", kpse->invocation_name);
 
diff --git a/source/texk/kpathsea/tex-make.c b/source/texk/kpathsea/tex-make.c
index 6671b5474..95851fdd5 100644
--- a/source/texk/kpathsea/tex-make.c
+++ b/source/texk/kpathsea/tex-make.c
@@ -1,6 +1,6 @@
 /* tex-make.c: run external programs to make TeX-related files.
 
-   Copyright 1993, 1994, 1995, 1996, 1997, 2008-2013 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 1997, 2008-2013, 2018 Karl Berry.
    Copyright 1997, 1998, 2001-05 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -437,7 +437,7 @@ kpathsea_make_tex (kpathsea kpse, kpse_file_format_type format,
      * No doubt some possibilities were overlooked.
      */
     if (base[0] == '-' /* || IS_DIR_SEP(base[0])  */) {
-      fprintf(stderr, "kpathsea:make_tex: Invalid fontname `%s', starts with '%c'\n",
+      fprintf(stderr, "kpathsea:make_tex: Invalid filename `%s', starts with '%c'\n",
               base, base[0]);
       return NULL;
     }
@@ -449,7 +449,7 @@ kpathsea_make_tex (kpathsea kpse, kpse_file_format_type format,
           && base[i] != '.'
           && !IS_DIR_SEP(base[i]))
       {
-        fprintf(stderr, "kpathsea:make_tex: Invalid fontname `%s', contains '%c'\n",
+        fprintf(stderr, "kpathsea:make_tex: Invalid filename `%s', contains '%c'\n",
                 base, base[i]);
         return NULL;
       }
diff --git a/source/texk/kpathsea/texmf.cnf b/source/texk/kpathsea/texmf.cnf
index 28c4ed88a..83cbc5d3f 100644
--- a/source/texk/kpathsea/texmf.cnf
+++ b/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
 % 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! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2017/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2017/texmf.cnf.
+% installed in /some/path/to/texlive/2018/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2018/texmf.cnf.
 % 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
@@ -83,10 +83,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
 TEXMFHOME = ~/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2017/texmf-var
+TEXMFVAR = ~/.texlive2018/texmf-var
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2017/texmf-config
+TEXMFCONFIG = ~/.texlive2018/texmf-config
 
 % This is the value manipulated by tlmgr's auxtrees subcommand in the
 % root texmf.cnf. Kpathsea warns about a literally empty string for a
diff --git a/source/texk/kpathsea/version.ac b/source/texk/kpathsea/version.ac
index 3582ba2ee..f81ea6319 100644
--- a/source/texk/kpathsea/version.ac
+++ b/source/texk/kpathsea/version.ac
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 46545 2018-02-04 23:23:31Z karl $
+dnl $Id: version.ac 46759 2018-02-27 23:14:55Z karl $
 dnl   Copyright 2016-2018 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
@@ -20,4 +20,4 @@ dnl     append "dev", to distinguish binaries built between releases.
 dnl --------------------------------------------------------
 dnl
 dnl  this file is m4-included from configure.ac
-m4_define([kpse_version], [6.3.0/dev])
+m4_define([kpse_version], [6.3.0])
diff --git a/source/texk/texlive/configure b/source/texk/texlive/configure
index 8aa8783d1..70463894f 100755
--- a/source/texk/texlive/configure
+++ b/source/texk/texlive/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2018/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2018.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live Scripts'
 PACKAGE_TARNAME='tex-live-scripts'
-PACKAGE_VERSION='2018/dev'
-PACKAGE_STRING='TeX Live Scripts 2018/dev'
+PACKAGE_VERSION='2018'
+PACKAGE_STRING='TeX Live Scripts 2018'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live Scripts 2018/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live Scripts 2018 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1305,7 +1305,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live Scripts 2018/dev:";;
+     short | recursive ) echo "Configuration of TeX Live Scripts 2018:";;
    esac
   cat <<\_ACEOF
 
@@ -1400,7 +1400,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live Scripts configure 2018/dev
+TeX Live Scripts configure 2018
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live Scripts $as_me 2018/dev, which was
+It was created by TeX Live Scripts $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2322,7 +2322,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live-scripts'
- VERSION='2018/dev'
+ VERSION='2018'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4224,7 +4224,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live Scripts $as_me 2018/dev, which was
+This file was extended by TeX Live Scripts $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4281,7 +4281,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live Scripts config.status 2018/dev
+TeX Live Scripts config.status 2018
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index ea4fa468e..964a392e8 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-23  Karl Berry  <karl@freefriends.org>
+
+	* doc/web2c.texi (bibtex invocation): mention need to remove aux
+	file from previous run for -min-crossrefs to be effective.
+	https://tex.stackexchange.com/questions/123740
+
 2018-02-18  Karl Berry  <karl@tug.org>
 
 	* bibtex.ch (str_ends_with): new fn.
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index ce982e84f..cab4e43d0 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2018/dev.
+# Generated by GNU Autoconf 2.69 for Web2C 2018.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C'
 PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2018/dev'
-PACKAGE_STRING='Web2C 2018/dev'
+PACKAGE_VERSION='2018'
+PACKAGE_STRING='Web2C 2018'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1617,7 +1617,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C 2018/dev to adapt to many kinds of systems.
+\`configure' configures Web2C 2018 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1691,7 +1691,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C 2018/dev:";;
+     short | recursive ) echo "Configuration of Web2C 2018:";;
    esac
   cat <<\_ACEOF
 
@@ -1913,7 +1913,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C configure 2018/dev
+Web2C configure 2018
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3002,7 +3002,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C $as_me 2018/dev, which was
+It was created by Web2C $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3383,7 +3383,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-WEB2CVERSION=2018/dev
+WEB2CVERSION=2018
 
 
 am__api_version='1.15'
@@ -8690,7 +8690,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c'
- VERSION='2018/dev'
+ VERSION='2018'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23653,7 +23653,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Web2C config.lt 2018/dev
+Web2C config.lt 2018
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -26871,7 +26871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C $as_me 2018/dev, which was
+This file was extended by Web2C $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26941,7 +26941,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C config.status 2018/dev
+Web2C config.status 2018
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/texk/web2c/doc/web2c.info b/source/texk/web2c/doc/web2c.info
index 767f53994..08bce4338 100644
--- a/source/texk/web2c/doc/web2c.info
+++ b/source/texk/web2c/doc/web2c.info
@@ -1,4 +1,4 @@
-This is web2c.info, produced by makeinfo version 6.3 from web2c.texi.
+This is web2c.info, produced by makeinfo version 6.4 from web2c.texi.
 
 This file documents the installation and use of the programs in Web2c,
 an implementation of Donald Knuth's TeX system.
@@ -58,7 +58,7 @@ Web2c
 
 This document describes how to install and use the programs in the Web2c
 implementation of the TeX system, especially for Unix systems.  It
-corresponds to Web2c version 2017, released in April 2017.
+corresponds to Web2c version 2018, released in February 2018.
 
 * Menu:
 
@@ -82,8 +82,8 @@ File: web2c.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up: Top
 1 Introduction
 **************
 
-This manual corresponds to version 2017 of Web2c, released in April
-2017.
+This manual corresponds to version 2018 of Web2c, released in February
+2018.
 
    "Web2c" is the name of a TeX implementation, originally for Unix, but
 now also running under DOS, Amiga, and other operating systems.  By "TeX
@@ -2227,9 +2227,13 @@ macros.  BibTeX searches for '.bib' files using the 'BIBINPUTS' and
      even if it was not explicitly referenced in the .aux file.  For
      example, E might be a conference proceedings as a whole, with the
      cross-referencing entries being individual articles published in
-     the proceedings.  In some circumstances, you may want to avoid
-     these automatic inclusions altogether; to do this, make N a
-     sufficiently large number.
+     the proceedings.
+
+     If you want to avoid these automatic inclusions altogether, make N
+     a sufficiently large number, and be sure to remove any previous
+     .aux and .bbl files.  Otherwise the option may appear to have no
+     effect, since BibTeX will have added the citation for E to the
+     .aux, and nothing will remove it.
 
    See also:
 'btxdoc.tex'
@@ -2318,9 +2322,9 @@ available in many other places, of course).
 
 * Menu:
 
-* tangle invocation::           
-* weave invocation::            
-* pooltype invocation::         
+* tangle invocation::
+* weave invocation::
+* pooltype invocation::
 
 
 File: web2c.info,  Node: tangle invocation,  Next: weave invocation,  Up: WEB
@@ -2559,7 +2563,7 @@ program.
 
 * Menu:
 
-* dvitype output example::      
+* dvitype output example::
 
 
 File: web2c.info,  Node: dvitype output example,  Up: dvitype invocation
@@ -3635,7 +3639,7 @@ Index
 * bibliography items, cross-referenced:  bibtex invocation.   (line  31)
 * bibtex:                                bibtex invocation.   (line   6)
 * BibTeX:                                BibTeX.              (line   6)
-* BibTeX collection:                     bibtex invocation.   (line  54)
+* BibTeX collection:                     bibtex invocation.   (line  58)
 * BibTeX style files:                    Basic BibTeX style files.
                                                               (line   6)
 * BigEndian machines:                    Hardware and memory dumps.
@@ -3647,9 +3651,9 @@ Index
 * Breitenlohner, Peter:                  Introduction.        (line   9)
 * BSTINPUTS, search path for bst files:  bibtex invocation.   (line  18)
 * btex for MetaPost labels:              mpost invocation.    (line  48)
-* btxdoc.bib:                            bibtex invocation.   (line  48)
-* btxdoc.tex:                            bibtex invocation.   (line  42)
-* btxhak.tex:                            bibtex invocation.   (line  45)
+* btxdoc.bib:                            bibtex invocation.   (line  52)
+* btxdoc.tex:                            bibtex invocation.   (line  46)
+* btxhak.tex:                            bibtex invocation.   (line  49)
 * byte position:                         pktype invocation.   (line  40)
 * byte position <1>:                     gftype invocation.   (line  76)
 * byte swapping:                         Hardware and memory dumps.
@@ -3830,7 +3834,7 @@ Index
                                                               (line  21)
 * Free Software Foundation documentation system: Formats.     (line  47)
 * freedom of Web2c:                      Introduction.        (line  23)
-* ftp.math.utah.edu:                     bibtex invocation.   (line  54)
+* ftp.math.utah.edu:                     bibtex invocation.   (line  58)
 * generating source specials:            tex invocation.      (line 133)
 * geometric designs:                     Metafont.            (line   6)
 * geometric font scaling:                Font file formats.   (line  21)
@@ -4212,7 +4216,7 @@ Index
 * string numbers, displaying:            pooltype invocation. (line   6)
 * string pool, writing:                  tangle invocation.   (line  16)
 * string representation:                 pooltype invocation. (line  30)
-* style design, for BibTeX:              bibtex invocation.   (line  45)
+* style design, for BibTeX:              bibtex invocation.   (line  49)
 * style files:                           mft invocation.      (line  67)
 * substitutions of font glyphs:          MLTeX.               (line   6)
 * sun:                                   Online Metafont graphics.
@@ -4245,7 +4249,7 @@ Index
 * terminator for filenames:              \input filenames.    (line  10)
 * terse output:                          bibtex invocation.   (line  28)
 * tex:                                   tex invocation.      (line   6)
-* TeX, bibliographies for:               bibtex invocation.   (line  54)
+* TeX, bibliographies for:               bibtex invocation.   (line  58)
 * TeX, creating from Metafont:           mft invocation.      (line   6)
 * TeX, creating from WEB:                weave invocation.    (line   6)
 * TeX, description of:                   TeX.                 (line   6)
@@ -4297,7 +4301,7 @@ Index
 * Troff, and MetaPost:                   mpost invocation.    (line  65)
 * Troff, WEB for:                        WEB.                 (line  12)
 * Trojan horses and TeX programs:        tex invocation.      (line  48)
-* TUGboat bibliography:                  bibtex invocation.   (line  54)
+* TUGboat bibliography:                  bibtex invocation.   (line  58)
 * Type 1 conversion:                     Font utilities available elsewhere.
                                                               (line  39)
 * type design, personal:                 Initial Metafont.    (line  31)
@@ -4362,7 +4366,7 @@ Index
                                                               (line  69)
 * X toolkits and Metafont:               Online Metafont graphics.
                                                               (line  59)
-* xampl.bib:                             bibtex invocation.   (line  51)
+* xampl.bib:                             bibtex invocation.   (line  55)
 * xbfe, bitmap font editor:              Font utilities available elsewhere.
                                                               (line  23)
 * XeTeX:                                 TeX extensions.      (line  31)
@@ -4386,74 +4390,74 @@ Index
 
 Tag Table:
 Node: Top2754
-Node: Introduction3749
-Node: Installation6907
-Node: configure options9009
-Node: Compile-time options11031
-Node: Additional targets12133
-Node: Triptrap13410
-Node: Runtime options14937
-Node: Commonalities16695
-Node: Option conventions17296
-Node: Common options18519
-Node: Path searching22899
-Node: Output file location23871
-Node: Three programs25196
-Node: Initial and virgin25950
-Node: Memory dumps26879
-Node: Creating memory dumps27335
-Node: Determining the memory dump to use28546
-Node: Hardware and memory dumps30127
-Node: Editor invocation32577
-Node: \input filenames33444
-Node: TeX36437
-Node: tex invocation37588
-Node: Initial TeX44491
-Node: Formats45855
-Node: Languages and hyphenation48781
-Node: MLTeX49211
-Node: \charsubdef50699
-Node: \tracingcharsubdef53022
-Node: TCX files53597
-Node: patgen invocation59037
-Node: Shell escapes59743
-Node: IPC and TeX63307
-Node: TeX extensions63877
-Node: Metafont65008
-Node: mf invocation66296
-Node: Initial Metafont70133
-Node: Modes71763
-Node: Online Metafont graphics74013
-Node: gftodvi invocation77438
-Node: mft invocation80258
-Node: MetaPost84256
-Node: mpost invocation85018
-Node: Initial MetaPost90194
-Node: dvitomp invocation91116
-Node: BibTeX91781
-Node: bibtex invocation92142
-Node: Basic BibTeX style files94440
-Node: WEB95770
-Node: tangle invocation97011
-Node: weave invocation99134
-Node: pooltype invocation100541
-Node: DVI utilities101671
-Node: dvicopy invocation102603
-Node: dvitype invocation103886
-Node: dvitype output example106221
-Node: Font utilities109272
-Node: Font file formats110452
-Node: gftopk invocation113721
-Node: pktogf invocation114912
-Node: pktype invocation116078
-Node: gftype invocation118901
-Node: tftopl invocation123404
-Node: pltotf invocation127997
-Node: vftovp invocation129048
-Node: vptovf invocation131283
-Node: Font utilities available elsewhere132310
-Node: Legalisms134690
-Node: References136844
-Node: Index141411
+Node: Introduction3752
+Node: Installation6913
+Node: configure options9015
+Node: Compile-time options11037
+Node: Additional targets12139
+Node: Triptrap13416
+Node: Runtime options14943
+Node: Commonalities16701
+Node: Option conventions17302
+Node: Common options18525
+Node: Path searching22905
+Node: Output file location23877
+Node: Three programs25202
+Node: Initial and virgin25956
+Node: Memory dumps26885
+Node: Creating memory dumps27341
+Node: Determining the memory dump to use28552
+Node: Hardware and memory dumps30133
+Node: Editor invocation32583
+Node: \input filenames33450
+Node: TeX36443
+Node: tex invocation37594
+Node: Initial TeX44497
+Node: Formats45861
+Node: Languages and hyphenation48787
+Node: MLTeX49217
+Node: \charsubdef50705
+Node: \tracingcharsubdef53028
+Node: TCX files53603
+Node: patgen invocation59043
+Node: Shell escapes59749
+Node: IPC and TeX63313
+Node: TeX extensions63883
+Node: Metafont65014
+Node: mf invocation66302
+Node: Initial Metafont70139
+Node: Modes71769
+Node: Online Metafont graphics74019
+Node: gftodvi invocation77444
+Node: mft invocation80264
+Node: MetaPost84262
+Node: mpost invocation85024
+Node: Initial MetaPost90200
+Node: dvitomp invocation91122
+Node: BibTeX91787
+Node: bibtex invocation92148
+Node: Basic BibTeX style files94622
+Node: WEB95952
+Node: tangle invocation97161
+Node: weave invocation99284
+Node: pooltype invocation100691
+Node: DVI utilities101821
+Node: dvicopy invocation102753
+Node: dvitype invocation104036
+Node: dvitype output example106365
+Node: Font utilities109416
+Node: Font file formats110596
+Node: gftopk invocation113865
+Node: pktogf invocation115056
+Node: pktype invocation116222
+Node: gftype invocation119045
+Node: tftopl invocation123548
+Node: pltotf invocation128141
+Node: vftovp invocation129192
+Node: vptovf invocation131427
+Node: Font utilities available elsewhere132454
+Node: Legalisms134834
+Node: References136988
+Node: Index141555
 
 End Tag Table
diff --git a/source/texk/web2c/doc/web2c.texi b/source/texk/web2c/doc/web2c.texi
index 950a6e313..8b1141ee2 100644
--- a/source/texk/web2c/doc/web2c.texi
+++ b/source/texk/web2c/doc/web2c.texi
@@ -11,8 +11,8 @@ The latest version is available from ftp://ftp.tug.org/tex/texinfo.tex.}
 \fi
 @end tex
 
-@set version 2017
-@set month-year April 2017
+@set version 2018
+@set month-year February 2018
 
 @c Define new indices for commands in auxiliary files, filenames, and options.
 @defcodeindex cm
@@ -2699,9 +2699,14 @@ entry @var{e} via their @code{crossref} field, include @var{e} in the
 @t{.bbl} file, even if it was not explicitly referenced in the @t{.aux}
 file. For example, @var{e} might be a conference proceedings as a whole,
 with the cross-referencing entries being individual articles published
-in the proceedings.  In some circumstances, you may want to avoid these
-automatic inclusions altogether; to do this, make @var{n} a sufficiently
-large number.
+in the proceedings.
+
+If you want to avoid these automatic inclusions altogether, make
+@var{n} a sufficiently large number, and be sure to remove any
+previous @t{.aux} and @t{.bbl} files.  Otherwise the option may
+appear to have no effect, since Bib@TeX{} will have added the citation
+for @var{e} to the @t{.aux}, and nothing will remove it.
+
 @end table
 
 See also:
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index 5936e2005..26e7f239b 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 6627
+#define luatex_svn_revision 6634
diff --git a/source/texk/web2c/man/ChangeLog b/source/texk/web2c/man/ChangeLog
index 90fc42c79..437021cc7 100644
--- a/source/texk/web2c/man/ChangeLog
+++ b/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-23  Karl Berry  <karl@freefriends.org>
+
+	* bibtex.man: mention need to remove aux file from previous run
+	for -min-crossrefs to be effective.
+	https://tex.stackexchange.com/questions/123740
+
 2018-01-18  Karl Berry  <karl@freefriends.org>
 
 	* mf.man: spacing, no openin, per Debian.
diff --git a/source/texk/web2c/man/bibtex.man b/source/texk/web2c/man/bibtex.man
index b2fb880ee..3f970a98b 100644
--- a/source/texk/web2c/man/bibtex.man
+++ b/source/texk/web2c/man/bibtex.man
@@ -1,4 +1,4 @@
-.TH BIBTEX 1 "16 June 2015" "bibtex 0.99d" "Web2C @VERSION@"
+.TH BIBTEX 1 "23 February 2018" "bibtex 0.99d" "Web2C @VERSION@"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
@@ -63,8 +63,20 @@ The
 .B \-min-crossrefs
 option defines the minimum number of
 .B crossref
-required for automatic inclusion of the crossref'd entry on the citation
+required for automatic inclusion of the crossref base entry in the citation
 list; the default is two. 
+To avoid these automatic inclusions altogether, give this option
+a sufficiently large number, and be sure to remove any
+previous
+.B .aux 
+and
+.B .bbl
+files.  Otherwise the option may
+appear to have no effect, since \*(BX will have added the citation
+for the base entry to the
+.B .aux
+file, and nothing will remove it.
+.PP
 With the
 .B \-terse
 option, \*(BX operates silently.  Without it, a banner and progress
diff --git a/source/texk/web2c/web2c/configure b/source/texk/web2c/web2c/configure
index 7f71c7b15..13df2b387 100755
--- a/source/texk/web2c/web2c/configure
+++ b/source/texk/web2c/web2c/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2018/dev.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2018.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Web2C Tools'
 PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2018/dev'
-PACKAGE_STRING='Web2C Tools 2018/dev'
+PACKAGE_VERSION='2018'
+PACKAGE_STRING='Web2C Tools 2018'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Web2C Tools 2018/dev to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2018 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1398,7 +1398,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Web2C Tools 2018/dev:";;
+     short | recursive ) echo "Configuration of Web2C Tools 2018:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Web2C Tools configure 2018/dev
+Web2C Tools configure 2018
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Web2C Tools $as_me 2018/dev, which was
+It was created by Web2C Tools $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8045,7 +8045,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='web2c-tools'
- VERSION='2018/dev'
+ VERSION='2018'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14574,7 +14574,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Web2C Tools $as_me 2018/dev, which was
+This file was extended by Web2C Tools $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14640,7 +14640,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Web2C Tools config.status 2018/dev
+Web2C Tools config.status 2018
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/utils/README b/source/utils/README
index 0813a818e..c6ce73dcf 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,4 +1,4 @@
-$Id: README 46672 2018-02-18 23:32:54Z karl $
+$Id: README 46726 2018-02-23 23:21:58Z kakuto $
 Public domain.  Originally written 2005 by Karl Berry.
 
 Extra utilities we (optionally) compile for TeX Live.
@@ -10,7 +10,7 @@ asymptote 2.41 - checked 23mar17
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
 
-autosp 2018-02-14 - checked 14feb18
+autosp 2018-02-23 - checked 23feb18
   http://ctan.org/pkg/autosp
 
 devnag - from devanagari package installed in texmf-dist.
@@ -75,14 +75,15 @@ cd $libsigsegv_ver
 #
 # you may need this hack on 64-bit systems
 # if clisp's configure does not find libsigsegv.  Harmless to do in any case.
-ln -s lib $clisp_toolsdir/lib64
+ln -s lib $clisp_toolsdir/lib64 # for GNU/Linux 64-bit
+ln -s . $clisp_toolsdir/lib/64  # for Solaris 64-bit
 #
 # if you can't build libsigsegv, pass --ignore-absence-of-libsigsegv
 # when running configure for clisp.
 
 ffcall_ver=libffcall-2.1
 cd $clisp_basedir
-$wget https://ftp.gnu.org/gnu/libsigsegv/$ffcall_ver.tar.gz
+$wget https://ftp.gnu.org/gnu/libffcall/$ffcall_ver.tar.gz
 gzip -dc $ffcall_ver.tar.gz | tar xf -
 cd $ffcall_ver
 ./configure -C --prefix=$clisp_toolsdir --disable-shared --enable-static \
@@ -104,7 +105,7 @@ cd $libiconv_ver
 # foil wrong attempts at dynamic linking, etc.
 (cd $clisp_basedir/clisp-tools/lib && rm -f *.dylib *.la)
 
-clisp_ver=clisp-2.49.50
+clisp_ver=clisp-2.49.92
 cd $clisp_basedir
 $wget https://haible.de/bruno/gnu/clisp-2.49.50.tar.bz2
 bunzip2 -dc $clisp_ver.tar.bz2 | tar xf -
@@ -118,9 +119,13 @@ cd $clisp_ver
 #
 ./configure CPPFLAGS=-DUNIX_BINARY_DISTRIB --prefix=$clisp_toolsdir \
   --without-readline --without-dynamic-modules --without-termcap-ncurses \
-  --disable-nls --enable-portability \
+  --disable-nls \
   --with-libsigsegv-prefix=$clisp_toolsdir \
   --with-libffcall-prefix=$clisp_toolsdir \
   --with-libiconv-prefix=$clisp_toolsdir \
   $clisp_builddir \
 && (cd $clisp_builddir && make)
+
+There may be clisp test failures relating to sockets on some
+systems. Since xindy doesn't use sockets, we can ignore those for TL.
+
diff --git a/source/utils/configure b/source/utils/configure
index 0d4bc6afc..96c28b448 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2018/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2018.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live utils'
 PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2018/dev'
-PACKAGE_STRING='TeX Live utils 2018/dev'
+PACKAGE_VERSION='2018'
+PACKAGE_STRING='TeX Live utils 2018'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1315,7 +1315,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live utils 2018/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2018 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1385,7 +1385,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live utils 2018/dev:";;
+     short | recursive ) echo "Configuration of TeX Live utils 2018:";;
    esac
   cat <<\_ACEOF
 
@@ -1572,7 +1572,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live utils configure 2018/dev
+TeX Live utils configure 2018
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1673,7 +1673,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live utils $as_me 2018/dev, which was
+It was created by TeX Live utils $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4470,7 +4470,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live-utils'
- VERSION='2018/dev'
+ VERSION='2018'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5383,7 +5383,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live utils $as_me 2018/dev, which was
+This file was extended by TeX Live utils $as_me 2018, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5440,7 +5440,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live utils config.status 2018/dev
+TeX Live utils config.status 2018
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/source/version.ac b/source/version.ac
index 58a88e630..8ec32984c 100644
--- a/source/version.ac
+++ b/source/version.ac
@@ -1,5 +1,5 @@
-dnl $Id: version.ac 44643 2017-06-19 23:28:55Z karl $
-dnl   Copyright 2016-2017 Karl Berry <tex-live@tug.org>
+dnl $Id: version.ac 46759 2018-02-27 23:14:55Z karl $
+dnl   Copyright 2016-2018 Karl Berry <tex-live@tug.org>
 dnl   Copyright 2010-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
@@ -9,4 +9,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2018/dev])
+m4_define([tex_live_version], [2018])
-- 
GitLab