10 files changed, 102 insertions, 73 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
index 4cd97fca3f..e49617b87f 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
@@ -1,4 +1,4 @@
-# $Id: TLPOBJ.pm 53112 2019-12-12 23:43:12Z karl $
+# $Id: TLPOBJ.pm 53204 2019-12-21 23:18:19Z karl $
 # TeXLive::TLPOBJ.pm - module for using tlpobj files
 # Copyright 2007-2019 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
 
 package TeXLive::TLPOBJ;
 
-my $svnrev = '$Revision: 53112 $';
+my $svnrev = '$Revision: 53204 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -796,7 +796,7 @@ sub make_container {
   rmdir($InfraLocation) if $removetlpkgdir;
   xchdir($cwd);
 
-  debug(" done $containername, size $size, $checksum\n");
+  debug(" done $containername, size $size, csum $checksum\n");
   return ($size, $checksum, "$destdir/$containername");
 }
 
@@ -1517,8 +1517,7 @@ string C<RELOC>.
 
 =item C<srcfiles>, C<runfiles>, C<binfiles>, C<docfiles>
 each of these items contains addition the sum of sizes of the single
-files (in number of C<TeXLive::TLConfig::BlockSize> blocks,currently
-4k).
+files (in units of C<TeXLive::TLConfig::BlockSize> blocks, currently 4k).
 
   srcfiles size=NNNNNN
   runfiles size=NNNNNN
@@ -1531,7 +1530,7 @@ above:
   docfiles size=NNNNNN
 
 But the lines listing the files are allowed to have additional tags,
-which come from the TeX Catalogue.
+(which in practice come from the TeX Catalogue)
 
   /------- excerpt from achemso.tlpobj
   |...
@@ -1846,7 +1845,7 @@ lines for language.dat.lua that can be generated from the tlpobj.
 =head1 SEE ALSO
 
 The other modules in C<Master/tlpkg/TeXLive/> (L<TeXLive::TLConfig> and
-the rest), and the scripts in C<Master/tlpg/bin/> (especially
+the rest), and the scripts in C<Master/tlpkg/bin/> (especially
 C<tl-update-tlpdb>), the documentation in C<Master/tlpkg/doc/>, etc.
 
 =head1 AUTHORS AND COPYRIGHT
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
index 2b9aa1c547..b37232a524 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 53111 2019-12-12 23:22:05Z karl $
+# $Id: TLUtils.pm 53204 2019-12-21 23:18:19Z karl $
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
 # Copyright 2007-2019 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 53111 $';
+my $svnrev = '$Revision: 53204 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -831,7 +831,7 @@ sub dir_creatable {
 
 Tests whether its argument is writable by trying to write to
 it. This function is necessary because the built-in C<-w> test just
-looks at mode and uid/guid, which on Windows always returns true and
+looks at mode and uid/gid, which on Windows always returns true and
 even on Unix is not always good enough for directories mounted from
 a fileserver.
 
@@ -1318,6 +1318,7 @@ sub collapse_dirs {
 
       my $item = "$d/$dirent";  # prepend directory for comparison
       if (! exists $seen{$item}) {
+        ddebug("   no collapse of $d because of: $dirent\n");
         $ok_to_collapse = 0;
         last;  # no need to keep looking after the first.
       }
@@ -3662,38 +3663,67 @@ sub merge_into {
 
 =item C<texdir_check($texdir)>
 
-Test whether installation with TEXDIR set to $texdir would succeed due to
-writing permissions.
+Test whether installation with TEXDIR set to $texdir should be ok, e.g.,
+would be a creatable directory. Return 1 if ok, 0 if not.
 
 Writable or not, we will not allow installation to the root
 directory (Unix) or the root of a drive (Windows).
 
+We also do not allow paths containing various special characters, and
+print a message about this if second argument WARN is true. (We only
+want to do this for the regular text installer, since spewing output in
+a GUI program wouldn't be good; the generic message will have to do for
+them.)
+
 =cut
 
 sub texdir_check {
-  my $texdir = shift;
-  return 0 unless defined $texdir;
+  my ($orig_texdir,$warn) = @_;
+  return 0 unless defined $orig_texdir;
+
   # convert to absolute, for safer parsing.
+  # also replaces backslashes with slashes on w32.
   # The return value may still contain symlinks,
   # but no unnecessary terminating '/'.
-  $texdir = tl_abs_path($texdir);
+  my $texdir = tl_abs_path($orig_texdir);
   return 0 unless defined $texdir;
-  # also reject the root of a drive,
+
+  # reject the root of a drive,
   # assuming that only the canonical form of the root ends with /
   return 0 if $texdir =~ m!/$!;
-  # win32: for now, reject the root of a samba share
+
+  # Unfortunately we have lots of special characters.
+  # On Windows, backslashes are normal but will already have been changed
+  # to slashes by tl_abs_path. And we should only check for : on Unix.
+  my $colon = win32() ? "" : ":";
+  if ($texdir =~ /[,$colon;\\{}\$]/) {
+    if ($warn) {
+      print "     !! TEXDIR value has problematic characters: $orig_texdir\n";
+      print "     !! (such as comma, colon, semicolon, backslash, braces\n";
+      print "     !!  and dollar sign; sorry)\n";
+    }
+    # although we could check each character individually and give a
+    # specific error, it seems plausibly useful to report all the chars
+    # that cause problems, regardless of which was there. Simpler too.
+    return 0;
+  }
+  # w32: for now, reject the root of a samba share
   return 0 if win32() && $texdir =~ m!^//[^/]+/[^/]+$!;
-  my $texdirparent;
-  my $texdirpparent;
 
+  # if texdir already exists, make sure we can write into it.
   return dir_writable($texdir) if (-d $texdir);
-  ($texdirparent = $texdir) =~ s!/[^/]*$!!;
+
+  # if texdir doesn't exist, make sure we can write the parent.
+  (my $texdirparent = $texdir) =~ s!/[^/]*$!!;
   #print STDERR "Checking $texdirparent".'[/]'."\n";
-  return  dir_creatable($texdirparent) if -d dir_slash($texdirparent);
-  # try another level up the tree
-  ($texdirpparent = $texdirparent) =~ s!/[^/]*$!!;
+  return dir_creatable($texdirparent) if -d dir_slash($texdirparent);
+  
+  # ditto for the next level up the tree
+  (my $texdirpparent = $texdirparent) =~ s!/[^/]*$!!;
   #print STDERR "Checking $texdirpparent".'[/]'."\n";
   return dir_creatable($texdirpparent) if -d dir_slash($texdirpparent);
+  
+  # doesn't look plausible.
   return 0;
 }
 
@@ -4663,12 +4693,8 @@ sub array_to_json {
   my $ret = "[" . join(",", map { encode_json(\$_) } @$hr) . "]";
   return($ret);
 }
-
-
-
 =back
 =cut
-
 1;
 __END__
 
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm
index a9f94e33ff..ad54929075 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TeXCatalogue.pm
@@ -1,4 +1,4 @@
-# $Id: TeXCatalogue.pm 53031 2019-12-05 19:14:32Z karl $
+# $Id: TeXCatalogue.pm 53204 2019-12-21 23:18:19Z karl $
 # TeXLive::TeXCatalogue - module for accessing the TeX Catalogue
 # Copyright 2007-2019 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
@@ -13,7 +13,7 @@ use Text::Unidecode;
 
 package TeXLive::TeXCatalogue::Entry;
 
-my $svnrev = '$Revision: 53031 $';
+my $svnrev = '$Revision: 53204 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -324,7 +324,7 @@ __END__
 =head1 SEE ALSO
 
 The other modules in C<Master/tlpkg/TeXLive/> (L<TeXLive::TLConfig> and
-the rest), and the scripts in C<Master/tlpg/bin/> (especially
+the rest), and the scripts in C<Master/tlpkg/bin/> (especially
 C<tl-update-tlpdb>), the documentation in C<Master/tlpkg/doc/>, etc.
 
 =head1 AUTHORS AND COPYRIGHT
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 5860748d61..c826970b0f 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -53,6 +53,9 @@ $mirrors = {
     },
     'Singapore' => {
       'https://download.nus.edu.sg/mirror/ctan/' => 1
+    },
+    'Taiwan' => {
+      'ftp://ftp.ccu.edu.tw/pub/tex/' => 1
     }
   },
   'Europe' => {
diff --git a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
index 21bf3de2e2..8eef8488ba 100644
--- a/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/install-menu-text.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: install-menu-text.pl 53076 2019-12-10 06:20:44Z preining $
+# $Id: install-menu-text.pl 53204 2019-12-21 23:18:19Z karl $
 # install-menu-txt.pl
 #
 # Copyright 2007-2017 Norbert Preining, Karl Berry
@@ -503,7 +503,7 @@ sub directories_menu
       );
 
   menu_head "Directories customization:";
-  if (!TeXLive::TLUtils::texdir_check($vars{'TEXDIR'})) {
+  if (!TeXLive::TLUtils::texdir_check($vars{'TEXDIR'}, 1)) {
     print "!! The default location as given below is forbidden or
 !! can't be written to.
 !! Either change the destination directory using <1> or create it
@@ -1068,7 +1068,7 @@ EOF
    TEXDIR (the main TeX directory):
 EOF
 
-  if (TeXLive::TLUtils::texdir_check($vars{'TEXDIR'})) {
+  if (TeXLive::TLUtils::texdir_check($vars{'TEXDIR'}, 1)) {
     print "     $vars{'TEXDIR'}\n";
   } else {
     print "     !! default location: $vars{'TEXDIR'}\n";
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 60388df77d..e9ffe88258 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2019
-depend revision/53198
+depend revision/53204
 
 name 00texlive.image
 category TLCore
-revision 53195
+revision 53204
 shortdesc TeX Live files only in the source repository
 longdesc The files here are not copied by the installer and containers
 longdesc are not built for them; they exist only in the source
@@ -40,7 +40,7 @@ longdesc IgnorePatterns in the check_files routine in tlmgr.pl augment
 longdesc this list.  Those are not included in the source/ tarball.  For
 longdesc information on the 00texlive prefix see
 longdesc 00texlive.installation(.tlpsrc)
-runfiles size=4985
+runfiles size=4986
  .mkisofsrc
  autorun.inf
  texmf-dist/README
@@ -189,6 +189,7 @@ runfiles size=4985
  tlpkg/dev/mktextex.pl
  tlpkg/dev/mktexupd.texlua
  tlpkg/dev/profiles/README
+ tlpkg/dev/profiles/TLcomma.pro
  tlpkg/dev/profiles/TLctx.pro
  tlpkg/dev/profiles/TLfmt.pro
  tlpkg/dev/profiles/TLfull.pro
@@ -4130,7 +4131,7 @@ depend opt_w32_multi_user:1
 
 name 00texlive.installer
 category TLCore
-revision 53198
+revision 53204
 shortdesc TeX Live standalone installer package
 longdesc This package defines the files to go into the installer
 longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -33456,7 +33457,7 @@ catalogue-version 2.6.2
 
 name biblatex-apa
 category Package
-revision 52976
+revision 53203
 shortdesc BibLaTeX citation and reference style for APA
 relocated 1
 longdesc This is a fairly complete BibLaTeX style (citations and
@@ -33467,10 +33468,10 @@ longdesc references. An example document is also given which typesets
 longdesc every citation and reference example in the APA 7th edition
 longdesc style guide. This version of the package requires use of
 longdesc BibLaTeX v3.13, biber v2.13, and csquotes [?]4.3.
-containersize 23516
-containerchecksum 3e6b2572aa544ace8e82934b316cfe77ab3b3f566a4bc54aeca922c57fd383832a20c95171d7cd4137592cfe55e6d855249fd034bb6dc4bb9519817038bf2049
-doccontainersize 315992
-doccontainerchecksum 103f23d9d64544cad7e95b9a5736897891a3d589c6c7c48ee611f2eeadfe43e83e3f74cd4e4c3242e458461580902115ac892f96c52d999bc884178c5e8668b5
+containersize 23524
+containerchecksum 9f2bbf2826c8013ff8c3be2519a1a32d78258570713744251984967c686b1c325fcb050b8e473ebccea27a605a241f00e7864a4809b99216b95c9ce31769d644
+doccontainersize 316484
+doccontainerchecksum 1f3ce3683eef4d8b15263fdd4a3275c74d6f894abca8fef14c287b30657e06999621f34dc7d931e28af97e33d647020b510e18898957fc132ea916980420f9a6
 docfiles size=112
  RELOC/doc/latex/biblatex-apa/README details="Readme"
  RELOC/doc/latex/biblatex-apa/biblatex-apa-test-citations.bib
@@ -33514,7 +33515,7 @@ catalogue-contact-repository https://github.com/plk/biblatex-apa.git
 catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-apa
 catalogue-license lppl1.3c
 catalogue-topics apa biblatex psychology journalpub
-catalogue-version 9.2
+catalogue-version 9.3
 
 name biblatex-apa6
 category Package
@@ -224538,7 +224539,7 @@ binfiles arch=x86_64-solaris size=2
 
 name pgf
 category Package
-revision 53187
+revision 53202
 shortdesc Create PostScript and PDF graphics in TeX
 relocated 1
 longdesc PGF is a macro package for creating graphics. It is platform-
@@ -224550,10 +224551,10 @@ longdesc PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt.
 longdesc Unlike pstricks, it can produce either PostScript or PDF
 longdesc output.
 depend ms
-containersize 703988
-containerchecksum f07c7c1855f0daf3251ac75c86f4184875abeb6b9c60c8c6b8ca742a4d62fcaf997490cebc158e57fc9bc1e01d272111c5f079d9015fc1a1a3479f7d07f8839a
-doccontainersize 10555828
-doccontainerchecksum fd5d5fb585de1584fb8c90371cb385810784110b0979b969dfa1bcf6cc6481460a7be174e8afe40d7afc73cc6fa7bdb4110df5fe455bc013b91f612ffc19f54f
+containersize 704008
+containerchecksum d2e1e73401f5fc7b9c312680388ea1144bdf1ba3e128ffea34342295489db1bd6b6badbce7215f99623f19d398774617f916114598efa1f09b8cda272770158f
+doccontainersize 10555740
+doccontainerchecksum 9949818d98a73c94366718e897a7c4631cd5db2bc71f8042cc3ea2b27c54d8d68d183c9bf0669833c3a4a9cce100efb64f6e8fd7b578336c2190a04b2ae30c62
 docfiles size=3952
  RELOC/doc/generic/pgf/AUTHORS
  RELOC/doc/generic/pgf/ChangeLog
@@ -224908,7 +224909,7 @@ docfiles size=3952
  RELOC/doc/generic/pgf/version-for-xetex/en/plots/pgfplotgnuplot-example.table
  RELOC/doc/generic/pgf/version-for-xetex/pgfmanual-xetex.cfg
 srccontainersize 33484
-srccontainerchecksum b08e8bfd4a5215704b1764315cad2c6bcd5596545c51cfad883505904cbf7e6bd8b7df08e0fbef8cc454323d175cbd0c845e62a5efcb3e0cde03e18c16b18583
+srccontainerchecksum 8ffc525b54d6ad4be789dd84031b577a74f997da867b2641e1d59d3d9e5c42afaf05d38a30beaab722fd95feacd7626e05c18a1a5e7c51ee438252d45c10bf26
 srcfiles size=94
  RELOC/source/generic/pgf/c/INSTALL
  RELOC/source/generic/pgf/c/Makefile
@@ -225481,7 +225482,7 @@ catalogue-contact-support https://tug.org/mailman/listinfo/pgf-tikz
 catalogue-ctan /graphics/pgf/base
 catalogue-license lppl1.3cgpl2fdl
 catalogue-topics pgf-tikz graphics-in-tex
-catalogue-version 3.1.5
+catalogue-version 3.1.5a
 
 name pgf-blur
 category Package
@@ -281840,15 +281841,15 @@ docfiles size=572
 
 name texlive-docindex
 category TLCore
-revision 53183
+revision 53200
 shortdesc top-level TeX Live doc.html, etc.
 longdesc These files are regenerated as needed, which is often, so we
 longdesc make them a separate package.  See the tl-update-auto script
 longdesc for the process.
 containersize 109876
-containerchecksum b88c2fbbfcf29552244309650b27d5a675dd95c8d6e43d75b8bcea19f1eeb701780c92c6a49afc460219b8911eaf8715c4000e0b1a2965dc661b6615b9e23946
-doccontainersize 157420
-doccontainerchecksum 51ceab92c9c840d3f5f99a3c5f5411bf868e8448c35b6d6439cf3bf6957e3297710b06a1003936a840259c00e19450441e014c51c467498bea7eec7ccda57743
+containerchecksum 5f6f5196d255380237e9105aad02b972460cefb6bb59bd691c22a4447e3ceecad92d9e4fa4d7e79077349f46abbd9d835ee210f6baba6e20caa5fa78d84649fe
+doccontainersize 157548
+doccontainerchecksum 3cdb7ac6c2a9ae880f1d89974065cd59e00931e12bb2b5562931a70321cdb655fd9138e4355c8c7d8d45949ecb87e055011ac2f2592f4151359ab0c42bfcb042
 docfiles size=308
  doc.html
 runfiles size=270
@@ -282065,17 +282066,17 @@ docfiles size=503
 
 name texlive-scripts
 category TLCore
-revision 53198
+revision 53204
 shortdesc TeX Live infrastructure programs
 longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
 longdesc tlmgr to run but still ours.  Not included in tlcritical.
 depend texlive.infra
 depend texlive-scripts.ARCH
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 85492
-containerchecksum 8bf2b13d3510e1cbdc5d754194303d1b29c66014559abf0a5a2330934d9f40f0760a820af4f511df9ca3346db639cbb847f4e0beacc07413e61c7c1f96a89876
-doccontainersize 51204
-doccontainerchecksum 2cb31ef1f0700fda3f11ff89c02e35cb8132502518125ebc7639c80d0495e41c004d276e5e2a22be5871d1e703c2a2c080296cfa0b25c451d4557da1fbaf5a61
+containersize 85528
+containerchecksum dbbfebe2939efd7f9ae822f020df8dc047cee3fbb08c1ae181a91b16ea7ff1cab0000c503b4d4c002af14a0cd42e12258cf692e3b632504d333d1f211598b2eb
+doccontainersize 51328
+doccontainerchecksum 9ad13558375a7e23a4e39ce93cea28c7c52831673fbbb5860489120748449d4363665aecaf1ef51de98103398558221380f0b9eab424aa37ed911f03c5b269be
 docfiles size=20
  texmf-dist/doc/man/man1/install-tl.1
  texmf-dist/doc/man/man1/install-tl.man1.pdf
@@ -292200,14 +292201,14 @@ binfiles arch=win32 size=5
 
 name tlshell
 category TLCore
-revision 52390
+revision 53201
 shortdesc GUI frontend (tcl/tk-based) for tlmgr
 depend tlshell.ARCH
 postaction shortcut type=menu name="TeX Live Manager"              cmd=TEXDIR/bin/win32/tlshell.exe
-containersize 25344
-containerchecksum 6a04842543dabc9027ac7865be7874f3b7fed25b0cb9ca2827f36d3559b92ca250389a329787366f24c44c7917dc87250468222eb2094ce7dd37d844debcc7e1
-doccontainersize 436
-doccontainerchecksum 947b95c7f03e7b8f9b63c8eb76a6690a720edf6fa23164b5024b2aaa6ecbbf7e2d88b7afa2e56993808a66d5b18b8313f742ef2faa82c694a8f6b950484fd6f6
+containersize 25336
+containerchecksum b49c864427c4bc7675476d3937885bc31688e8553b39a22c3f8272f49b582e2011b9f17080edb95022ef2ea44bb434db5e4755539aeeeb6dfd1eb3637c996871
+doccontainersize 440
+doccontainerchecksum e25ec4ff0cd5b63139607cbf3a1966f44049024e2255b31d84cb2f09a1861f6c4d9a5abaa7a0032a9353b73904f81653f751aadd546eeb1efc2ba65546be37d4
 docfiles size=1
  texmf-dist/doc/support/tlshell/README
 runfiles size=25
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 0c0b2ea29c..4d9e13682e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-91addeec53f4da50f03e9d23b2ab446e  texlive.tlpdb
+da30ee1af8f839a66c806044d03d0d03  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 6e07cdb05c..5c9e31851c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-a931f17333ff817bbfb4481477a3ae73bd498795df3b3322669ac3da374e5dc7f1793cb828c44bfcc09e0252151710fa9b272497eaf68d24361d7aa44aaf36e1  texlive.tlpdb
+df6093bf22fa482f581c71febc7d1c23e08577976511ce21916093b1bd942d3faa0610cb477f4823ae009c8938ee34320c91735434a194e2de94a1c3205490aa  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 20f0598687..e6c72cf3bf 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCgAGBQJd/W1mAAoJEEzhh34ZQ4xwM/IH/1Yua94y79qHSurwz2G9MEHf
-KD9+qIiLXw6neE5r9brmW9mwKIZxX28UD3sLnvlf0rlXi0c1B9pdVFTAhmS0phVD
-VD9C4iG6sBE63rZCxZ106CNSSy/r2iHcKeBXNEf4hSTyT8zBXvcZkglVWUsQNBy5
-xS9fGRMnq839zZuy8n5lCO4Y+oJgtYD9zVWh8DKltJmQp8nUrrz9fNbyEcVfe3cE
-c5B6VjqPq1bdfAusIW1VXTVLAkP44bJCagaoMCeB7kcQyefg+vAVKkrF2kaEJlAa
-Ci02JWC08F6uxE9QMyiXGHVPeq2am0n1z0bz3d0qrQkvtcRPQ/sE3/mtFvV2+Uw=
-=JdX2
+iQEcBAEBCgAGBQJd/r61AAoJEEzhh34ZQ4xwa6YIAIQBGZq71sLpLBlWCf99MG0i
+btBNKRFnGhw+nMGzEKdNYLRCry4PZtJHVesmmnNBYTTd5YOModp9HKXk9ONbioJH
+uRyi3VNnYKv5QjrqBrwPL7RKF1TCB16uoQk5Y1Gcf4IJvycozsqi6x1moguWNbYM
+defYltOS1YEMWiERGp8yRpT17KiGLAqNLNuyAyP2ZRPKDlt/rhlt2hYVacykmfbu
+5gicsC54gI22CMuNfgjE/i1l+o/wux4iiKE1jUEX+1WG5rARboTv1ji06HW5kCEM
+dJABrgRWFkrLtwbKKUCRAcFcI1cLcEYFfnvq9OwrFsoQY2Ne8yq2tctbnh3T9wE=
+=RVT6
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index ba7e952db4..663a40c1d8 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz