summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/TeXLive
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-07 03:01:25 +0000
committerNorbert Preining <norbert@preining.info>2021-05-07 03:01:25 +0000
commitc92d9953347e3bdebc5243c67cf012a2f7a60fb6 (patch)
tree808a0ad402713257a48445f97e662786d95207ee /systems/texlive/tlnet/tlpkg/TeXLive
parent25f20b6d8ccd4edcdfec23c1a3c908516076ee06 (diff)
CTAN sync 202105070301
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive')
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm13
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm12
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm6
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm14
4 files changed, 25 insertions, 20 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
index 4d5bc62759..99b4a0f68e 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
@@ -1,4 +1,4 @@
-# $Id: TLConfig.pm 58938 2021-04-21 21:26:24Z karl $
+# $Id: TLConfig.pm 59097 2021-05-06 18:08:29Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 58938 $';
+my $svnrev = '$Revision: 59097 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -125,10 +125,13 @@ if ($^O =~ /^MSWin/i) {
our @AcceptedFallbackDownloaders = qw/curl wget/;
our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl');
our %FallbackDownloaderArgs = (
- 'curl' => ['--user-agent', 'texlive/curl', '--retry', '4', '--retry-delay', '5',
- '--fail', '--location',
- '--connect-timeout', "$NetworkTimeout", '--silent', '--output'],
+ 'curl' => ['--user-agent', 'texlive/curl',
+ '--retry', '4', '--retry-delay', '4',
+ '--connect-timeout', "$NetworkTimeout",
+ '--insecure',
+ '--fail', '--location', '--silent', '--output'],
'wget' => ['--user-agent=texlive/wget', '--tries=4',
+ '--no-check-certificates',
"--timeout=$NetworkTimeout", '-q', '-O'],
);
# the way we package things on the web
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
index c299c8c2dd..8b4ffeae29 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
@@ -1,12 +1,12 @@
-# $Id: TLPDB.pm 55126 2020-05-13 17:27:10Z karl $
+# $Id: TLPDB.pm 59098 2021-05-06 20:21:11Z karl $
# TeXLive::TLPDB.pm - tlpdb plain text database files.
-# Copyright 2007-2020 Norbert Preining
+# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLPDB;
-my $svnrev = '$Revision: 55126 $';
+my $svnrev = '$Revision: 59098 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -98,7 +98,8 @@ use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory $InfraLocation
use TeXLive::TLCrypto;
use TeXLive::TLPOBJ;
use TeXLive::TLUtils qw(dirname mkdirhier member win32 info log debug ddebug
- tlwarn basename download_file merge_into tldie system_pipe);
+ tlwarn basename download_file merge_into tldie
+ system_pipe);
use TeXLive::TLWinGoo;
use Cwd 'abs_path';
@@ -424,7 +425,8 @@ sub writeout {
}
my $fd = (@_ ? $_[0] : STDOUT);
foreach (sort keys %{$self->{'tlps'}}) {
- ddebug("writeout: tlpname=$_ ", $self->{'tlps'}{$_}->name, "\n");
+ TeXLive::TLUtils::dddebug("writeout: tlpname=$_ ",
+ $self->{'tlps'}{$_}->name, "\n");
$self->{'tlps'}{$_}->writeout($fd);
print $fd "\n";
}
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
index d99f36d015..cc41b4ea01 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
@@ -1,12 +1,12 @@
-# $Id: TLPOBJ.pm 58384 2021-03-15 04:22:12Z preining $
+# $Id: TLPOBJ.pm 59098 2021-05-06 20:21:11Z karl $
# TeXLive::TLPOBJ.pm - module for using tlpobj files
-# Copyright 2007-2019 Norbert Preining
+# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLPOBJ;
-my $svnrev = '$Revision: 58384 $';
+my $svnrev = '$Revision: 59098 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
index 8b437b1b0b..0d86a1fdc0 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 59044 2021-05-01 22:05:56Z karl $
+# $Id: TLUtils.pm 59098 2021-05-06 20:21:11Z karl $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2021 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: 59044 $';
+my $svnrev = '$Revision: 59098 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -656,8 +656,8 @@ sub run_cmd {
=item C<system_pipe($prog, $infile, $outfile, $removeIn, @extraargs)>
-Runs C<$prog> with C<@extraargs> redirecting stdin from C<$infile>, stdout to C<$outfile>.
-Removes C<$infile> if C<$removeIn> is true.
+Runs C<$prog> with C<@extraargs> redirecting stdin from C<$infile>,
+stdout to C<$outfile>. Removes C<$infile> if C<$removeIn> is true.
=cut
@@ -2394,7 +2394,7 @@ sub untar {
# quoting issues.
# so fall back on chdir in Perl.
#
- debug("unpacking $tarfile in $targetdir\n");
+ debug("TLUtils::untar: unpacking $tarfile in $targetdir\n");
my $cwd = cwd();
chdir($targetdir) || die "chdir($targetdir) failed: $!";
@@ -2750,7 +2750,7 @@ sub download_file {
return \*RETFH;
} else {
if (-r $filetoopen) {
- copy ($filetoopen, $par);
+ copy ("-f", $filetoopen, $dest);
return 1;
}
return 0;
@@ -4585,7 +4585,7 @@ sub mktexupd {
}
-=item C<check_sys_user_mode($user,$sys,$tmfc, $tmfsc, $tmfv, $tmfsv)>
+=item C<setup_sys_user_mode($user,$sys,$tmfc, $tmfsc, $tmfv, $tmfsv)>
=cut