diff options
author | Norbert Preining <norbert@preining.info> | 2020-01-09 03:01:07 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-01-09 03:01:07 +0000 |
commit | 6ffc3e21c28ac83a308bf93982e8842d177dd23e (patch) | |
tree | 7e8b4d97bb1007e30decb7b64af7e746056daa4e /systems/texlive | |
parent | 1b3f15203efd63cdab3fb47f37ff5f6c10558477 (diff) |
CTAN sync 202001090301
Diffstat (limited to 'systems/texlive')
-rw-r--r-- | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm | 23 | ||||
-rw-r--r-- | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl | 5 | ||||
-rw-r--r-- | systems/texlive/tlnet/tlpkg/texlive.tlpdb | 40 | ||||
-rw-r--r-- | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 | 2 | ||||
-rw-r--r-- | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 | 2 | ||||
-rw-r--r-- | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc | 14 | ||||
-rw-r--r-- | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz | bin | 2150028 -> 2152164 bytes |
7 files changed, 48 insertions, 38 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm index 92a4aaaffc..72df5adeaa 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm @@ -1,12 +1,12 @@ -# $Id: TLUtils.pm 53278 2019-12-31 18:46:04Z karl $ +# $Id: TLUtils.pm 53343 2020-01-07 10:55:10Z preining $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. -# Copyright 2007-2019 Norbert Preining, Reinhard Kotucha +# Copyright 2007-2020 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 # or any later version. package TeXLive::TLUtils; -my $svnrev = '$Revision: 53278 $'; +my $svnrev = '$Revision: 53343 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -1520,6 +1520,7 @@ sub install_packages { $totalsize += $tlpsizes{$p}; } my $starttime = time(); + my @packs_again; # packages that we failed to download and should retry later foreach my $package (@packs) { my $tlpobj = $tlpobjs{$package}; my $reloc = $tlpobj->relocated; @@ -1532,7 +1533,21 @@ sub install_packages { foreach my $h (@::install_packages_hook) { &$h($n,$totalnr); } - # return false if something went wrong + # push $package to @packs_again if download failed + if (!$fromtlpdb->install_package($package, $totlpdb)) { + tlwarn("TLUtils::install_packages: Failed to install $package\n" + ."Will be retried later.\n"); + push @packs_again, $package; + } else { + $donesize += $tlpsizes{$package}; + } + } + # try to download packages in @packs_again again + foreach my $package (@packs_again) { + my $infostr = sprintf("Retrying to install: $package [%dk]", + int($tlpsizes{$package}/1024) + 1); + info("$infostr\n"); + # return false if download failed again if (!$fromtlpdb->install_package($package, $totlpdb)) { return 0; } diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index e587a0f577..5d8e543e74 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -31,10 +31,6 @@ $mirrors = { 'Indonesia' => { 'https://mirror.unpad.ac.id/ctan/' => 1 }, - 'Iran' => { - 'http://ctan.asis.ai/' => 1, - 'http://ctan.yazd.ac.ir/' => 1 - }, 'Japan' => { 'ftp://ftp.kddilabs.jp/CTAN/' => 1, 'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1, @@ -170,7 +166,6 @@ $mirrors = { 'http://ctan.mirrors.hoobly.com/' => 1, 'http://mirror.las.iastate.edu/tex-archive/' => 1, 'http://mirror.utexas.edu/ctan/' => 1, - 'http://mirrors.concertpass.com/tex-archive/' => 1, 'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1, 'http://mirrors.rit.edu/CTAN/' => 1 } diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index a31a3e04a7..3f0162bf92 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/53340 +depend revision/53345 name 00texlive.image category TLCore @@ -4137,7 +4137,7 @@ depend opt_w32_multi_user:1 name 00texlive.installer category TLCore -revision 53336 +revision 53342 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 @@ -35083,16 +35083,16 @@ catalogue-version 0.3 name biblatex-manuscripts-philology category Package -revision 52255 +revision 53344 shortdesc Manage classical manuscripts with BibLaTeX relocated 1 longdesc The package adds a new entry type: @manuscript to manage longdesc manuscript in classical philology, for example to prepare a longdesc critical edition. -containersize 4668 -containerchecksum 47fe3d91435d47fb5a5b0c0fb1a7c98cecaca3a44f03446e17f9be3ab4239bee5b2f2413ae8aef1beaa879256bb84db965b38f5cf2c6f2619b0efe2975506bdb -doccontainersize 143456 -doccontainerchecksum da2356f81c1f02ac33bf7d34c01e0d68d0567766ec562298761edf949d8e0dd0b6c486ad99924811242af09616a4d055385546734023f80a164830ac605dd96c +containersize 4644 +containerchecksum 3677e980482bd1beedafd4120d119d2a73c4c7ae9a3ddef7130572fac5d2388ec4144b0ba74d4d8012fd994262c378226c987472d4d66e323e3b8395b5d3259b +doccontainersize 143492 +doccontainerchecksum da435de87f61045d565199034c5ffb1bf818d31c74309648b1cd78cc80dd1b1274cb008a575dae1bcc6b1987973745e3483e829085438821ef1e4a10fbf157d5 docfiles size=46 RELOC/doc/latex/biblatex-manuscripts-philology/README details="Readme" RELOC/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.bib @@ -35118,7 +35118,7 @@ catalogue-contact-repository https://github.com/maieul/biblatex-manuscripts-phil catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-manuscripts-philology catalogue-license lppl1.3 catalogue-topics biblatex humanities -catalogue-version 2.1.1 +catalogue-version 2.1.2 name biblatex-mla category Package @@ -223521,7 +223521,7 @@ catalogue-version 1.6.3 name pdfxup category Package -revision 53282 +revision 53345 shortdesc Create n-up PDF pages with minimal margins longdesc pdfxup is a Unix/Linux shell script that creates a PDF document longdesc where each page is obtained by combining several pages of a PDF @@ -223530,11 +223530,11 @@ longdesc maximal bounding box of (some of) the pages of the document, longdesc and then uses pdflatex (with the graphicx package) in order to longdesc produce the new document. depend pdfxup.ARCH -containersize 10188 -containerchecksum f0a8d258859ff3692f009495e91e9839118c081601a9b786927bde0c818de80431fe22deb3c1d04ccd97ee7f768eea4ec45ff0d734ebbac2314b970c0ab71ad7 -doccontainersize 110744 -doccontainerchecksum 32154cb66dbc4df212fff2c13b90f081b7a1a16404b25496ef8ca273cee10da03cbff5b4d84632607978be9a8b36cfb08aec8581986b98f5213f73612963ed7c -docfiles size=33 +containersize 10192 +containerchecksum db2713a1f00dc2bb641094b4f1b84ca233ee3a28ac9bb70f41703937f51aece3d4f7b8803fe158cd4a470a859a81fdb68131a95ca32aca50eb9e83fe76b26f11 +doccontainersize 110748 +doccontainerchecksum 8d37a4bd8592ab172e59b9722712b4019d47cf6e732e6eead889119bdc396b4620b6aeb33d27def1b3f641e326cdefdf80191259386cb2a18292890ffaee9b14 +docfiles size=32 texmf-dist/doc/man/man1/pdfxup.1 texmf-dist/doc/man/man1/pdfxup.man1.pdf texmf-dist/doc/support/pdfxup/README details="Readme" @@ -223545,7 +223545,7 @@ runfiles size=10 catalogue-ctan /support/pdfxup catalogue-license lppl1.3 catalogue-topics pdfprocess -catalogue-version 1.50 +catalogue-version 1.51 name pdfxup.aarch64-linux category Package @@ -283027,17 +283027,17 @@ docfiles size=503 name texlive-scripts category TLCore -revision 53336 +revision 53342 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 83360 -containerchecksum 55caaa347c51cbb853669664ac742e4f27d2b8a5aa71c9563f24bf27547b96bf725aebb5e8f4a34894c00aa69aee54db78ecda23f03db2007c8783d811dfa8d6 -doccontainersize 130232 -doccontainerchecksum 88e847c702ecb562abcba439798e3660c4ce4d53913b4347302e4ce4b13c90490832af2a0ff07a4c236710724a12e7d89097506ee1a452a67ba1740ad5c61feb +containersize 83312 +containerchecksum 36c2613749ea1f88088003acc74784e08c3198c42592b1ae1f2b50dd8609195436bb3cfa1d901ea5befec39402ae1da0dc4ec1274632bf14a508cf8115313ae1 +doccontainersize 130228 +doccontainerchecksum 24e27e2b22cd3c8cbc6c236f354891bb34343810c64090d1f825a1fa33d6250594498d5db09c38655ec290b06c3a2034beb4c942eee3fcad997cb5040337db40 docfiles size=53 texmf-dist/doc/man/man1/install-tl.1 texmf-dist/doc/man/man1/install-tl.man1.pdf diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 4a434eb302..46f5a0c28b 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -fa5b78567d1efc21cabdbf80683cd1df texlive.tlpdb +9e90e66d4236df27ba82fbf7834b8e30 texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 5664cede4b..33ba1a37dd 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -1360ee74437d80c572804f049d5b2f33908f863a9d87e404ca5b1cb68cadc0cd11e87f176a062f54600bbd3dd3b59788d45f5f197d761e49fe152d9235b2ce75 texlive.tlpdb +83210d2a67b6495c43a8381723c159b9bb34b14f5ddd175fa14e79ebddac732507e5c39c25b18c9002942da657bbef0767aba0141c1592bdc5cd827f111a60cd texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 9491bfa506..1d65539ea3 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----- -iQEcBAEBCgAGBQJeE9cgAAoJEEzhh34ZQ4xwVO8IALySonbQiiXY3zGsXueDEqve -ngGkTdtjOOT2E/eApLpofVPFEQUwr7akIs8txHs0XMXcCkcgdWnF+hhzrX30WVVN -oR8ZL6xGEUw67s4VZ4a/DGE5BqXv+2+zYxmYlxa+sXFSZmxLvw658cTqMx7/j6PP -MKme8zRzjG0sOwL60rC4jwxGg4TyVVatO/Fh3yHODil7FYD8vwUkdWRVJH6KftsH -maQ9l9Fako+8F4s9DbX4ehcKDjCQN5u5lDKWNg8WcN1TZbYulFDgR4qlASCi5sdJ -KDcqG+V2AjTZUVMHjMsPYvrT0q6HfrWqxg1jfdDRgseV4/2DKE+zrM4Ri8qajJA= -=ipDQ +iQEcBAEBCgAGBQJeFShQAAoJEEzhh34ZQ4xwD2MIAJbr6uQgUN/p7kP/XBhBwpqs +ZnZxh/1fapGo9jJd3V9WsQYEEqouqsRzUGJN1vX/2d4DuBITVB35/KVR3HSQ8+Zh +VcBvJ33j64+n0MwOUinKkqvB7vRlyrApnxC9nBHwh/nBYwx2y2bZLcM2ljSY37f5 +Cf0cHB8nc+qXjyc+PePfulcQrCbPG6cPUCD5eaiYpBR6UgOFdpgEbg7AbENXrAuY +FYXqP6VzcmWsglRj0wVXy6wYRHrM2eibounJbbCOnE8Uilfpicicao4yc3lA2e3C +0KvV9yPP2tlWw4PzprAMzG+9x8V8qd5oVbXr4Q1DFpiVM9ESdYI7K6dquIgBCqE= +=S0WF -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex fb04874ea1..bf65818446 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz |