From 659df224f4771e4390206a6663bcb78808d99767 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 16 Sep 2023 03:01:00 +0000 Subject: CTAN sync 202309160300 --- systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm | 27 ++++++-- systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm | 77 +++++++++++++++------ .../texlive/tlnet/tlpkg/installer/ctan-mirrors.pl | 5 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb | 62 ++++++++--------- systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 | 2 +- systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 | 2 +- .../texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc | 16 ++--- systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz | Bin 2476204 -> 2473920 bytes 8 files changed, 119 insertions(+), 72 deletions(-) (limited to 'systems') diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm index 3bac015450..d19c812cfb 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm @@ -1,4 +1,4 @@ -# $Id: TLPDB.pm 65964 2023-02-20 17:13:02Z karl $ +# $Id: TLPDB.pm 68283 2023-09-15 13:11:11Z preining $ # TeXLive::TLPDB.pm - tlpdb plain text database files. # Copyright 2007-2023 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -7,7 +7,7 @@ use strict; use warnings; package TeXLive::TLPDB; -my $svnrev = '$Revision: 65964 $'; +my $svnrev = '$Revision: 68283 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -2107,14 +2107,27 @@ sub remove_package { 0, # tlpdbopt_desktop_integration, desktop part $localtlpdb->option("post_code")); } - # - my @removals = &TeXLive::TLUtils::removed_dirs (@goodfiles); + # we want to check whether we can actually remove files + # there might be various reasons that this fails, like texmf-dist + # directory suddently becoming ro (for whatever definition of + # suddenly). + my (%by_dirs, %removed_dirs) = &TeXLive::TLUtils::all_dirs_and_removed_dirs (@goodfiles); + my @removals = keys %removed_dirs; + + # we have already check for the existence of the dirs returned + for my $d (keys %by_dirs) { + if (! &TeXLive::TLUtils::dir_writable($d)) { + tlwarn("TLPDB: directories are not writable, cannot remove files: $d\n"); + return 0; + } + } + # now do the removal for my $entry (@goodfiles) { - unlink $entry; + unlink $entry or tlwarn("Could not unlink $entry: $!\n"); } for my $d (@removals) { - rmdir $d; + rmdir $d or tlwarn("Could not remove directory $d: $!\n") } $localtlpdb->remove_tlpobj($pkg); TeXLive::TLUtils::announce_execute_actions("disable", $tlp); @@ -3000,4 +3013,4 @@ GNU General Public License Version 2 or later. ### tab-width: 2 ### indent-tabs-mode: nil ### End: -# vim:set tabstop=2 expandtab autoindent: # +# vim:set tabstop=2 shiftwidth=2 expandtab autoindent: # diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm index c8b1260fcb..30d53ad7c7 100644 --- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm +++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 66420 2023-03-07 08:30:26Z preining $ +# $Id: TLUtils.pm 68283 2023-09-15 13:11:11Z preining $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007-2023 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -8,7 +8,7 @@ use strict; use warnings; package TeXLive::TLUtils; -my $svnrev = '$Revision: 66420 $'; +my $svnrev = '$Revision: 68283 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -59,6 +59,8 @@ C - TeX Live infrastructure miscellany TeXLive::TLUtils::copy($file, $target_dir); TeXLive::TLUtils::touch(@files); TeXLive::TLUtils::collapse_dirs(@files); + TeXLive::TLUtils::all_dirs_and_removed_dirs(@files); + TeXLive::TLUtils::dirs_of_files(@files); TeXLive::TLUtils::removed_dirs(@files); TeXLive::TLUtils::download_file($path, $destination); TeXLive::TLUtils::setup_programs($bindir, $platform); @@ -210,6 +212,8 @@ BEGIN { © &touch &collapse_dirs + &all_dirs_and_removed_dirs + &dirs_of_files &removed_dirs &install_package &install_packages @@ -1614,30 +1618,14 @@ sub collapse_dirs { return @ret; } -=item C - -Returns all the directories from which all content will be removed. - -Here is the idea: - -=over 4 - -=item create a hashes by_dir listing all files that should be removed - by directory, i.e., key = dir, value is list of files - -=item for each of the dirs (keys of by_dir and ordered deepest first) - check that all actually contained files are removed - and all the contained dirs are in the removal list. If this is the - case put that directory into the removal list - -=item return this removal list +=item C -=back +Returns all the directories in which at least one of the given +files reside. =cut -sub removed_dirs { +sub dirs_of_files { my (@files) = @_; - my %removed_dirs; my %by_dir; # construct hash of all directories mentioned, values are lists of the @@ -1663,6 +1651,21 @@ sub removed_dirs { $by_dir{$d} = \@a; } + return %by_dir; +} + +=item C + +Returns all the directories for files and those from which all +content will be removed. + +=cut + +sub all_dirs_and_removed_dirs { + my (@files) = @_; + my %removed_dirs; + my %by_dir = dirs_of_files(@files); + # for each of our directories, see if we are removing everything in # the directory. if so, return the directory; else return the # individual files. @@ -1698,9 +1701,37 @@ sub removed_dirs { $removed_dirs{$d} = 1; } } + return (%by_dir, %removed_dirs); +} + +=item C + +Returns all the directories from which all content will be removed. + +Here is the idea: + +=over 4 + +=item create a hashes by_dir listing all files that should be removed + by directory, i.e., key = dir, value is list of files + +=item for each of the dirs (keys of by_dir and ordered deepest first) + check that all actually contained files are removed + and all the contained dirs are in the removal list. If this is the + case put that directory into the removal list + +=item return this removal list + +=back +=cut + +sub removed_dirs { + my (@files) = @_; + my (%by_dir, %removed_dirs) = all_dirs_and_removed_dirs(@files); return keys %removed_dirs; } + =item C Returns the current running time and the estimated total time @@ -5275,4 +5306,4 @@ GNU General Public License Version 2 or later. ### tab-width: 2 ### indent-tabs-mode: nil ### End: -# vim:set tabstop=2 expandtab: # +# vim:set tabstop=2 shiftwidth=2 expandtab: # diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index c3cc3ffa8c..e5dc44f0d6 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -29,6 +29,9 @@ $mirrors = { 'Hong Kong' => { 'https://mirror-hk.koddos.net/CTAN/' => 1, }, + 'India' => { + 'https://mirror.niser.ac.in/ctan/' => 1, + }, 'Indonesia' => { 'http://repo.ugm.ac.id/ctan/' => 1, 'https://mirror.unpad.ac.id/ctan/' => 1, @@ -134,6 +137,7 @@ $mirrors = { 'https://ctan.gust.org.pl/tex-archive/' => 1, 'https://polish-mirror.evolution-host.com/ctan/' => 1, 'https://repo.skni.umcs.pl/ctan/' => 1, + 'https://sunsite.icm.edu.pl/pub/CTAN/' => 1, }, 'Portugal' => { 'https://ftp.eq.uc.pt/software/TeX/' => 1, @@ -157,7 +161,6 @@ $mirrors = { 'https://ftpmirror1.infania.net/mirror/CTAN/' => 1, }, 'Switzerland' => { - 'https://mirror.foobar.to/CTAN/' => 1, 'https://mirror.init7.net/ctan/' => 1, 'https://mirror.metanet.ch/tex-archive/' => 1, }, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index 5f750bcfaa..5b857831fd 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/2023 -depend revision/68280 +depend revision/68289 name 00texlive.image category TLCore -revision 68280 +revision 68286 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 @@ -4801,7 +4801,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 68275 +revision 68282 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 @@ -35170,16 +35170,16 @@ catalogue-topics book-pub class doc-templ expl3 name beebe category Package -revision 68190 +revision 68282 catalogue biblio shortdesc A collection of bibliographies relocated 1 longdesc A collection of BibTeX bibliographies on TeX-related topics longdesc (including, for example, spell-checking and SGML). Each longdesc includes a LaTeX wrapper file to typeset the bibliography. -containersize 907040 -containerchecksum 8b3e3505944dd04d2412626e41f9d52c1525cdd162bc12600896d1f1882bb4fae07e10c7dbe669f72a7fc5e5cb93c28a0affc6c3301a93491df9078c46d272ea -runfiles size=2233 +containersize 907204 +containerchecksum 4574e69eb21f09b27671a52b5beccd3fc96816e24da2f2e0da012e43227a8b1d69b4d26c2acf581641b672fdc68d6a31179a7cd4f76036201addacbfb888925b +runfiles size=2234 RELOC/bibtex/bib/beebe/epodd.bib RELOC/bibtex/bib/beebe/font.bib RELOC/bibtex/bib/beebe/printing-history.bib @@ -128216,7 +128216,7 @@ catalogue-topics font-doc name fontools category Package -revision 65706 +revision 68285 shortdesc Tools to simplify using fonts (especially TT/OTF ones) longdesc This package provides tools to simplify using OpenType fonts longdesc with LaTeX. By far the most important program in this bundle is @@ -128230,11 +128230,11 @@ longdesc - re-encode .afm files, ot2kpx - extract kerning pairs from longdesc OpenType fonts, splitttc - split an OpenType Collection file longdesc (ttc or otc) into individual fonts. depend fontools.ARCH -containersize 55340 -containerchecksum a4cd3009c98502534f3c54d40fb22d788bcdfd474ba6bfc1b7010aa4d3471f468cd54a5d5c292d5afe685f9e4d99c023b8f78f302792dd1b381418042d96f47c -doccontainersize 129664 -doccontainerchecksum 0506f6e9d0e0ae4fe4bb15303e2abde50a076899e4330a7d68f875abeaacff999cbab779bb368da5c717370e7cf885333c1479d6e795da4e387edd4656c30933 -docfiles size=56 +containersize 55892 +containerchecksum 0a9388c29a2797cddc72e8948d68653bcad66e0cd4082a4212ec3208e4be0426028c51f6a2efe5e9c89f8c3b092be557513ef814b0f07f8ebfc92f0ad3bd0007 +doccontainersize 130928 +doccontainerchecksum b885c1b607ca56d1ac8a107b648156d2dbf1c63174fb799c0942520e591b0f770dca49bc424aad4c50920c3b9059dae272fd0cdbd93d828070ee6c585e5360d4 +docfiles size=57 texmf-dist/doc/man/man1/afm2afm.1 texmf-dist/doc/man/man1/afm2afm.man1.pdf texmf-dist/doc/man/man1/autoinst.1 @@ -128244,7 +128244,7 @@ docfiles size=56 texmf-dist/doc/support/fontools/GPLv2.txt texmf-dist/doc/support/fontools/README details="Bundle readme" texmf-dist/doc/support/fontools/splitttc -runfiles size=77 +runfiles size=78 texmf-dist/fonts/enc/dvips/fontools/fontools_cs.enc texmf-dist/fonts/enc/dvips/fontools/fontools_l7x.enc texmf-dist/fonts/enc/dvips/fontools/fontools_lgr.enc @@ -210669,7 +210669,7 @@ catalogue-version 1.1 name minted category Package -revision 68252 +revision 68286 shortdesc Highlighted source code for LaTeX relocated 1 longdesc The package that facilitates expressive syntax highlighting in @@ -210690,16 +210690,16 @@ depend pdftexcmds depend tools depend xcolor depend xstring -containersize 10088 -containerchecksum c6562bd27f0239728da51bd72fd611cb4f17570df5d9844e46bbd27d81117ebf5f2eedbfc7c47fd463ed7546384c99f04f8950e22daf2e9dfee67650970a0f67 +containersize 10092 +containerchecksum 7fcc30c7722646b19dd9c656759ff39d053ef9fe60ff1228b5d7c33c3bc15dfadb8f2e51a1355c8478f5e145e4cc473967316abd914a54a2d6c734f53a759d77 doccontainersize 849336 -doccontainerchecksum 6d8289670a699bfcd3c7368c5c149f9624fae047432c73db408a5d88e7cd986635832cd5c56996af8e5859ed8a882023a927cd2f22564f14fe9ea5ee0f84e776 +doccontainerchecksum 7f99f31442aa7bc4ea6520e9363efb92918ca8fe7a055da7df3457acd3320e634c55f6ac785890e2fbaf3b71b7c06dacad891edce7263f1e2ae29257ae50c508 docfiles size=215 RELOC/doc/latex/minted/DEPENDS.txt RELOC/doc/latex/minted/README details="Readme" RELOC/doc/latex/minted/minted.pdf details="Package documentation" -srccontainersize 47724 -srccontainerchecksum 466f34ae891af02f2bc97551ea6b4b4700da347f16899ac10d4b1cc82ea79feee4f9448bf9f5636965c493fbd4288c8a7ba58ba3a60c9b1d9ded4818df249781 +srccontainersize 47728 +srccontainerchecksum db62751e14d97bdf6b7e5f64d9cf66281b63c95531a162813c43a47a011e1212a10a70d5c319a55ccf32ccddda06c14ed2a881a46ad99d5d1e9e0bf6e4b954a9 srcfiles size=54 RELOC/source/latex/minted/Makefile RELOC/source/latex/minted/minted.dtx @@ -286577,7 +286577,7 @@ catalogue-version 1.6a name simpleicons category Package -revision 68208 +revision 68284 shortdesc Simple Icons for LaTeX relocated 1 longdesc Similar to FontAwesome icons being provided on LaTeX by the @@ -286585,10 +286585,10 @@ longdesc fontawesome package, this package aims to do the same with longdesc Simple Icons. For reference, visit their website: longdesc https://simpleicons.org/. execute addMap simpleicons.map -containersize 2985208 -containerchecksum fa4fa4cf49e8e411edad0101d65dd5cf0d9335af5c88f4d4f457b29d919bed48852c6cbe0aaa97c592662af6eb65ec3a1df22a9a72ba43cec5b4e5200f562225 -doccontainersize 2196936 -doccontainerchecksum 2eba0e25caca15035b62266b3fa80e45f45e5343d249a5deca207247c9205622f0cb84ca19a654bd1fe0ff65a78cdab7eed590fcc4ba9f3526b33ff7595417ee +containersize 2985204 +containerchecksum a074b0b4d440c1f5f994f5d13ca34a3ceea1903699dc010a1c8259b95266b3e78ca5f3fee6fa1c10924a50966fe46272d04d633dbb17e63593cf6076ba042a26 +doccontainersize 2197092 +doccontainerchecksum b8b1ea741872f9d2b201a09a36c7a3794f6b4993f458fdbdd7cf321234345b9d1c1707ac29413a9203324b03a43dcca6c756c8758a2ae0e8dfdf31a4d758bc5a docfiles size=571 RELOC/doc/fonts/simpleicons/README.md details="Readme" RELOC/doc/fonts/simpleicons/bindings.tex @@ -286639,7 +286639,7 @@ catalogue-contact-repository https://github.com/ineshbose/simple-icons-latex catalogue-ctan /fonts/simpleicons catalogue-license cc-by-1 catalogue-topics font font-symbol font-supp-symbol font-otf font-type1 -catalogue-version 9.13.0 +catalogue-version 9.14.0 name simpleinvoice category Package @@ -315584,7 +315584,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 68275 +revision 68282 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. @@ -315592,10 +315592,10 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 114108 -containerchecksum 0303774013270ec58ab427a00cdd614b3167bcb0ac9ba100cac459aa040be9435b24334faf6602811716ced969eb4c9a4a36d62cfc36da5b39353a5707212a91 -doccontainersize 429652 -doccontainerchecksum 7778f148f40c8dfc58d058a0fca0d46380613993b785ce7e0dc9af3a12729ff3e9b434fd5b02e19784174660d3c3f1809159474442d91549533fe0a054a96e14 +containersize 114140 +containerchecksum cc51683bcc3653e98cf930d69802c9e0451a10310d09192744e4dffbecae7cd5c4d98dc0060dd58358e5c0c51e1625414e0e34d0b7fee32b5a50c541b2761f67 +doccontainersize 429676 +doccontainerchecksum ccc43c1c215e64061da38a1e10da8437c3e628f148f1e8507538ae219d6bf955627a5c3e3434cae3ce26ce9ee6fd71e0b592a8dbc1ecc9303d5a2bd204b7570a docfiles size=550 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 23ae8183cb..9fd0c0e541 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -d399a5bc7dc56b8003daa26510862b82 texlive.tlpdb +825168093a27ad218fc60cd8ad195ebd texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 73081812c7..37760f297b 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -9e87e5f055f4048365a7d8702e821612555705604f2094f61b47514b663f9026bf635214a3e4101bd125231c47cfe404c5b1d4aeb03574f6386471da02cb5374 texlive.tlpdb +4514839313a7a9b9203ae120f3f258c72c6f12f71d9a5758e7f82c05798dfa776f2009ce1deb6f03312900d5cd551797760002cc075a1bb0f4419ef58e7af5de texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index 3aa548444a..e38246afe1 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmUDmwgACgkQTOGHfhlD -jHBo6wf/cgi5LcsCAnxEjyxp7Sgp2GefDZ0/gqvooOx+ersD7Vz6gsyYM+vmeZiu -nQRR2+w4S6c10bkJcRvbnORAnJUdHSfnEFEc9d9ds48LAhygdRGBPgV+OO04ODuh -vT/PMaCxQV+sKlL3XMBPk50tJWzBagjp0Cl2ww84aA4+jOrZnwSm74+qkfsSP251 -Xba3hFjn1rg3ZWV0vsMecaKneZLGlELrHhMjszfvMdAgdg+1bAxqDKSzaY83eaAT -bBHbFR2gyyArhkEasYx81A6PKKTl5Z0Iw1L6BxZJ4rgfR5gxB0LOHe1ifMkWy7fm -sQAUaz+VKWPwujLSq+u2e8xNMx+aFQ== -=j0wk +iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmUE7GEACgkQTOGHfhlD +jHBwfwgAp+TLF/ApDFlfRULhKPDPM9r+c6RlgodUCAmsuKfWRGX/VpbI8oV7rw2P +d8+FnOWYfgBM09bvhcOj+NcQYYB7ptCym0qO0ALYuUKX6EF7kt1tWgNK0HVHQfD9 +MDOkKGfUbqePjEKyf3W6HqlXk1d++fuz/ILJjvXJmMqpia/FD6jJJtZQS1XLITAd +4e5bAAeeTaZ2BfM8oz1XN3CaZCMZrMFI0xIS+DKpoGWCn/n1fqXuBmWAdn170xlA +6bl4xwWsHHhUiRktEcbrc0iZJxpb+vEsXIjK7OtH96lI4fYXtJCAMbDQNT4DPsfE +MpOdV5PrYpCsvUgkiFSA4k7/hZJNVA== +=WgFh -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz index 80034ea176..b4fb68dc89 100644 Binary files a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz and b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz differ -- cgit v1.2.3