7 files changed, 57 insertions, 47 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
index 7b5948a584..3e0d01adb2 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
@@ -1,12 +1,12 @@
-# $Id: TLConfig.pm 52104 2019-09-16 14:04:10Z preining $
+# $Id: TLConfig.pm 52112 2019-09-17 21:12:27Z karl $
 # TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2018 Norbert Preining
+# Copyright 2007-2019 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 52104 $';
+my $svnrev = '$Revision: 52112 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -114,10 +114,10 @@ if ($^O =~ /^MSWin/i) {
 our @AcceptedFallbackDownloaders = qw/curl wget/;
 our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl');
 our %FallbackDownloaderArgs = (
-  'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', '--retry-delay', '5',
+  'curl' => ['--user-agent', 'texlive/curl', '--retry', '4', '--retry-delay', '5',
              '--fail', '--location',
              '--connect-timeout', "$NetworkTimeout", '--silent', '--output'],
-  'wget' => ['--user-agent=texlive/wget', '--tries=10',
+  'wget' => ['--user-agent=texlive/wget', '--tries=4',
              "--timeout=$NetworkTimeout", '-q', '-O'],
 );
 # the way we package things on the web
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 7aee474fcf..7e0e7f9fa4 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -15,7 +15,8 @@ $mirrors = {
       'http://mirrors.cqu.edu.cn/CTAN/' => 1,
       'http://mirrors.geekpie.club/CTAN/' => 1,
       'http://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
-      'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1
+      'http://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1,
+      'http://mirrors.ustc.edu.cn/CTAN/' => 1
     },
     'India' => {
       'http://ctan.imsc.res.in/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 5d6ae7b61b..66055dca90 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2019
-depend revision/52106
+depend revision/52112
 
 name 00texlive.image
 category TLCore
@@ -4042,7 +4042,7 @@ depend opt_w32_multi_user:1
 
 name 00texlive.installer
 category TLCore
-revision 52103
+revision 52108
 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
@@ -104339,7 +104339,7 @@ catalogue-version 0.4
 
 name extract
 category Package
-revision 15878
+revision 52109
 shortdesc Extract parts of a document and write to another document
 relocated 1
 longdesc The package provides the means to extract specific content from
@@ -104356,24 +104356,33 @@ longdesc package option, one can specify exactly which commands (counted
 longdesc from the start of the document) should be extracted and which
 longdesc not. This might be useful for extracting specific slides from a
 longdesc presentation and use them in a new file.
-containersize 4288
-containerchecksum bf2feedc3914bc6f10cded15d894a4b0606b86038134ce7993171fa4b79045cbf131b11e43116fcc1632dd3969fc42b38ac06b1b3d2e6b462b44ea25353d01bc
-doccontainersize 183328
-doccontainerchecksum d694fee22cd4adab84c546bae47b65a0b90ad611df7bde8161f0270efa66557fedda46d6de42b9d0c4a752f6a4178e8d1bd7bf95ff1c58b886b9be75cd45a795
-docfiles size=51
+containersize 4296
+containerchecksum faa30455561c1eb66b9ee00d9c3a7d0030a6448636f443379cb01e8ceb867f5fa6022175b1f1d072f7f05377e89cad7b706989103da70bb729bbf361b5d018a8
+doccontainersize 164152
+doccontainerchecksum 3eaba8560f415f51f6c5ac0f83572879e4d1ff010714ba62623cfbd3412350d1e8be1ffdef92270e464471e88d8c3f18db8ecb026119e03ce6bdab58f9873ce8
+docfiles size=68
  RELOC/doc/latex/extract/README details="Package README"
+ RELOC/doc/latex/extract/extract.bib
  RELOC/doc/latex/extract/extract.pdf details="Package documentation"
-srccontainersize 17352
-srccontainerchecksum 0c79f916c3a2a8da7227976efe9a2714919736542179ae226b109263e061d931286976306e6bfc15e25772e077339528188998fcc2b9436ea9ea2b383b5aa57c
+ RELOC/doc/latex/extract/xtrex1.tex
+ RELOC/doc/latex/extract/xtrex2.tex
+ RELOC/doc/latex/extract/xtrex3.tex
+ RELOC/doc/latex/extract/xtrex4.tex
+ RELOC/doc/latex/extract/xtrex5.tex
+ RELOC/doc/latex/extract/xtrex6.tex
+ RELOC/doc/latex/extract/xtrex7.tex
+ RELOC/doc/latex/extract/xtrpream.ble
+srccontainersize 17520
+srccontainerchecksum d3ee9288fdc80e3b9e8fd49da4b9a62d403f139c117843f6513566ff8c9b15925346d4638f9f437b0f3e032842f23bdb04d8d068f07cb2a0e2508d4d953324ac
 srcfiles size=19
  RELOC/source/latex/extract/extract.dtx
 runfiles size=4
  RELOC/tex/latex/extract/extract.sty
 catalogue-ctan /macros/latex/contrib/extract
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-09-17 20:13:53 +0200
+catalogue-license lppl1.3
 catalogue-topics editorial
-catalogue-version 1.8
+catalogue-version 1.9
 
 name extsizes
 category Package
@@ -213155,7 +213164,7 @@ catalogue-version 0.5
 
 name ocgx2
 category Package
-revision 51552
+revision 52110
 shortdesc Drop-in replacement for 'ocgx' and 'ocg-p'
 relocated 1
 longdesc This package serves as a drop-in replacement for the packages
@@ -213166,10 +213175,10 @@ longdesc known engines and back-ends including: LaTeX - dvips -
 longdesc ps2pdf/Distiller (Xe)LaTeX(x) - dvipdfmx pdfLaTeX and LuaLaTeX
 longdesc . It also ensures compatibility with the media9 and animate
 longdesc packages.
-containersize 13264
-containerchecksum ef08e44e51273823c552c2e4ac1e1ce1999288134e637438d93262ea5a5b8fbfa05d0ea2440b64eb9daa3fc3b155ff7196b19a4640c19bbffbeb8c1cdc08eda8
-doccontainersize 5784
-doccontainerchecksum 2ba1166e7a27b5c77366bbfc4195adf8bfdb63a249fcc36c71e991caeab96e74f5f4aa3004a495b2e4d482f887074b44953aadabf4257a0b16d5e0cde5ed2493
+containersize 13280
+containerchecksum 4201ff7fdaceee5e2bd286b927a0ccd4eea618ea86412f353bae7b9c8b7ca8ce7dc0f97843dcb123a38b337a13175108db4ccc35c7b494a9433d28df5120b223
+doccontainersize 5820
+doccontainerchecksum 4b520f77399305bf9d5097b30ddf2251b60e3f881ee47f4f3c398528d24a13d975619abbfe2e7cbbab24a4a63992186e53fcb8c1630e9887e3d3fd3be9720105
 docfiles size=5
  RELOC/doc/latex/ocgx2/ChangeLog
  RELOC/doc/latex/ocgx2/README.txt
@@ -213180,10 +213189,10 @@ runfiles size=17
 catalogue-also ocgx ocg-p
 catalogue-contact-repository https://gitlab.com/agrahn/ocgx2
 catalogue-ctan /macros/latex/contrib/ocgx2
-catalogue-date 2019-07-04 18:43:46 +0200
+catalogue-date 2019-09-17 15:17:10 +0200
 catalogue-license lppl
 catalogue-topics pdf-feat adobe-distiller expl3
-catalogue-version 0.43
+catalogue-version 0.44
 
 name ocherokee
 category Package
@@ -280825,17 +280834,17 @@ docfiles size=503
 
 name texlive-scripts
 category TLCore
-revision 52103
+revision 52108
 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 85064
-containerchecksum e8e6acff89504d6b0c3bc8e7080154be51d6f7be4242c9663f5377a1fa28ef1db69285d2c7852fce73ba758ff70e0d2e34edb36b6c642e9a72ccb9f2b1b15568
+containersize 85084
+containerchecksum b61181478bd09e4f554cceac919cfcc84f74df6fbe0b6bb712e7e9e1a4a6214d3d65b480f26c9ba08682160d8fc57d165b886e34975c82551e427fc4c6441695
 doccontainersize 51244
-doccontainerchecksum 1f397b3d12eb1ca878dd9fc921870b807693250e29a06e9217e879dacabdc63c1fceda6c56d6ef2dc52d760e8e78a985d6a3284e65b726219baa6598965adff6
+doccontainerchecksum 13579b467ca31eb727e9dac0b58ad8c95d4efd205bcd28a176d5ee1a0ff3c1d4908419eb192cce26dd8510ca3f658d6d9f20aff74fbe4ffdde14db343a1b7d48
 docfiles size=20
  texmf-dist/doc/man/man1/install-tl.1
  texmf-dist/doc/man/man1/install-tl.man1.pdf
@@ -301066,7 +301075,7 @@ binfiles arch=x86_64-solaris size=2
 
 name upmethodology
 category Package
-revision 51818
+revision 52111
 shortdesc Writing specifications such as for UP-based methodologies
 relocated 1
 longdesc The bundle allows the user to create Unified Process
@@ -301074,11 +301083,11 @@ longdesc methodology (UP or RUP) based documents. The style provides
 longdesc document versioning, document history, document authors,
 longdesc document validators, specification description, task
 longdesc management, and several helping macros.
-containersize 28432
-containerchecksum fce920fdc34bf980ba97c3ffa1941c5e0fc8fc3dabf08b307f42f3880e62c8a510d3a66e0871d92be8f9ba4b1f80a06ae5fe162d9e940b9718a5c5db0f5aac14
-doccontainersize 521868
-doccontainerchecksum 79872b8a7914f76821b31952261cbd0532a6471bf218093d108a628a8b3c09e108a6da8ad4062773257fdace65dd5ffefa536162a46862c3ca4ade714534cebf
-docfiles size=182
+containersize 28508
+containerchecksum aa3cfb319583174665c06821a9284841d8edb17c12ce8afd7b23b705b99a415e69cf51e869edf0555bdfd971f6452afdbe50d7a2afca039b81b8bee584c4648f
+doccontainersize 514236
+doccontainerchecksum 850072abd76f2382d07b78f404dce8babd3e99827e75ff07667a5ffd5a517e1fe6772ac3299b34e9fda7a4561bb9b073a06e5eb96f74d178b7bf04db836a516b
+docfiles size=181
  RELOC/doc/latex/upmethodology/AUTHORS
  RELOC/doc/latex/upmethodology/CONTRIBUTING.textile
  RELOC/doc/latex/upmethodology/COPYING
@@ -301117,10 +301126,10 @@ catalogue-contact-home http://www.arakhne.org/tex-upmethodology
 catalogue-contact-repository https://github.com/gallandarakhneorg/tex-upmethodology
 catalogue-contact-support https://github.com/gallandarakhneorg/tex-upmethodology
 catalogue-ctan /macros/latex/contrib/upmethodology
-catalogue-date 2019-08-04 14:34:18 +0200
+catalogue-date 2019-09-17 14:59:46 +0200
 catalogue-license lgpl3
 catalogue-topics doc-mgmt
-catalogue-version 20190804
+catalogue-version 20190917
 
 name uppunctlm
 category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 9dcaa27599..32dd5cab09 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-8caa054c071aa3325a77d0b1c1dbda29  texlive.tlpdb
+8cc8550990894d55b365317600bc5f89  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 79098380b9..43bd5ed50d 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-7f55487cc07ffb363bc8fcfa1833b810cad23114b83a57b818ff56953aab40742d5a540c7996f1edf12ccb31a88037e3fa3a51728b4ea53810317274bd564e8a  texlive.tlpdb
+25fe334613eb96f0d5f5dde1ff746f59dbc5e60a2fcc361dbd3758b6955496074522afc6b568bc378bce6cc6a7c65c9881b1eac1940570a78aadeb9c1e920cc0  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index bf5e6ea194..e6eec7e82e 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-----
 
-iQEcBAEBCgAGBQJdgCChAAoJEEzhh34ZQ4xwO9YH/3ou/ZsbsbjOrnTnMB7Fkpy8
-F47kHB75ice6g0UnjXoqdN5rzvz41E8EjyV/s41PMS8qG6drfcsHv8tmH3zjYnAb
-pw4a1yQIKWeIkJ5QmYYYClqVIwmJkARHcz+lQI+kLBlWjqRJ+1t5d3do5lV6pH9d
-gSPf22NvsCJ+t0NMuzdmQj0T7Tao9HGLLYlz7qL18j5gW2snYwTFeUoarvu9GuXc
-gStysvq4xaZJY3CGUT95f67IRi1+U51e3I8LCiuuSRrAEvddC9oeUhu/6AbzGngH
-zHmzFPg29mH2/Ps2iLrhCuOHTUodjdWqcdhXW8WQzhbEIpwC8uXC11txztx0qTA=
-=IjDO
+iQEcBAEBCgAGBQJdgXIdAAoJEEzhh34ZQ4xwReMH/0g4ZmjIilCe6/JRoHXUYiyk
+/zd2+vAUJcnD0YvqXTpxT3jU3qL9sDy6FLNKI0kYxg7PtfCzOuLQnfThR3MfEnlk
+nNj7h3MyCFduFnYxB1j4EavjJ8UGz0NOkRGj32DF4Agk6WfhhhaxMxfYKxH1bFsM
+N6gNBl93ZXK9GsuW5pEs/qtAyum7Qk4SJtJBHJZCKP5BDvuam/meWjObHU+AvHmN
+fPbwX/WbamNr7cXtIW5CZsO6SxfrEYRkWlyfDK/HxSfsfyEXM5X8Np3ehfQbdne5
+nli0Z7sa35rf0ay+fx7d2n3hmw9N1YpRM4URYYlMUCN1UjBRYS3sOktoNNrklTI=
+=4XHF
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 9d5ee09602..8b56b1fd2e 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz