From 8bcdad0a3fc9ea77205f11c711a7cfe2f95d1940 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Jun 2018 20:50:14 +0000 Subject: latex2man (6jun18) git-svn-id: svn://tug.org/texlive/trunk@47942 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/latex2man/latex2man | 8 +- .../texk/texlive/linked_scripts/texlive/fmtutil.pl | 30 +++-- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 140 +++++++++++++-------- 3 files changed, 109 insertions(+), 69 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/latex2man/latex2man b/Build/source/texk/texlive/linked_scripts/latex2man/latex2man index 07f8d6c6fbe..53ec825ad52 100755 --- a/Build/source/texk/texlive/linked_scripts/latex2man/latex2man +++ b/Build/source/texk/texlive/linked_scripts/latex2man/latex2man @@ -4,7 +4,7 @@ # Descr: Latex --> MAN-page (groff -man), HTML and TexInfo; # Language: PERL (>= 5.0) # Author: Dr. Jürgen Vollmer, Juergen.Vollmer@informatik-vollmer.de -# $Id: latex2man,v 1.175 2017/10/06 17:19:31 vollmer Exp $ +# $Id: latex2man,v 1.176 2018/06/05 18:53:10 vollmer Exp $ # # Copyright (C) 1998 Dr. Juergen Vollmer # Am Rennbuckel 21, D-76185 Karlsruhe, Germany @@ -23,12 +23,12 @@ use Getopt::Std; no warnings 'once'; # use strict 'vars'; -$CMD=`basename $0`; chop ($CMD); +$CMD=`basename "$0"`; chop ($CMD); $gen_date = `date`; chomp $gen_date; # date when the output was generated sub date2str; -$VERSION = "1.26"; -$DATE = date2str ('$Date: 2017/10/06 17:19:31 $' =~ m|(\d+/\d+/\d+)|); +$VERSION = "1.27"; +$DATE = date2str ('$Date: 2018/06/05 18:53:10 $' =~ m|(\d+/\d+/\d+)|); $tmp = "/tmp/$CMD.$$"; diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 7d848571870..5cc7a8e2daf 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -1,9 +1,9 @@ #!/usr/bin/env perl -# $Id: fmtutil.pl 45872 2017-11-21 07:07:45Z preining $ +# $Id: fmtutil.pl 47929 2018-06-05 02:23:02Z preining $ # fmtutil - utility to maintain format files. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # -# Copyright 2014-2017 Norbert Preining +# Copyright 2014-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -24,11 +24,11 @@ BEGIN { TeX::Update->import(); } -my $svnid = '$Id: fmtutil.pl 45872 2017-11-21 07:07:45Z preining $'; -my $lastchdate = '$Date: 2017-11-21 08:07:45 +0100 (Tue, 21 Nov 2017) $'; +my $svnid = '$Id: fmtutil.pl 47929 2018-06-05 02:23:02Z preining $'; +my $lastchdate = '$Date: 2018-06-05 04:23:02 +0200 (Tue, 05 Jun 2018) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 45872 $'; +my $svnrev = '$Revision: 47929 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "r$svnrev ($lastchdate)"; @@ -628,7 +628,7 @@ sub rebuild_one_format { if ($poolfile && -f $poolfile) { print_verbose("attempting to create localized format " . "using pool=$pool and tcx=$tcx.\n"); - File::Copy($poolfile, "$eng.pool"); + File::Copy::copy($poolfile, "$eng.pool"); $tcxflag = "-translate-file=$tcx" if ($tcx); $localpool = 1; } @@ -719,21 +719,25 @@ sub rebuild_one_format { TeXLive::TLUtils::mkdirhier($destdir); - if (!File::Copy::move( $logfile, "$destdir/$logfile")) { - print_deferred_error("Cannot move $logfile to $destdir.\n"); + # here and in the following we use copy instead of move + # to make sure that in SElinux enabled cases the rules of + # the destination directory are applied.] + # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900580 + if (!File::Copy::copy( $logfile, "$destdir/$logfile")) { + print_deferred_error("Cannot copy $logfile to $destdir.\n"); } if ($opts{'recorder'}) { # the recorder output is used by check-fmttriggers to determine # package dependencies for each format. Unfortunately omega-based # engines gratuitiously changed the extension from .fls to .ofl. my $recfile = $fmt . ($fmt =~ m/^(aleph|lamed)$/ ? ".ofl" : ".fls"); - if (!File::Copy::move( $recfile, "$destdir/$recfile")) { - print_deferred_error("Cannot move $recfile to $destdir.\n"); + if (!File::Copy::copy( $recfile, "$destdir/$recfile")) { + print_deferred_error("Cannot copy $recfile to $destdir.\n"); } } my $destfile = "$destdir/$fmtfile"; - if (File::Copy::move( $fmtfile, $destfile )) { + if (File::Copy::copy( $fmtfile, $destfile )) { print_info("$destfile installed.\n"); # # original fmtutil.sh did some magic trick for mplib-luatex.mem @@ -780,10 +784,10 @@ sub rebuild_one_format { return $FMT_SUCCESS; } else { - print_deferred_error("Cannot move $fmtfile to $destfile.\n"); + print_deferred_error("Cannot copy $fmtfile to $destfile.\n"); if (-f $destfile) { # remove the empty file possibly left over if near-full file system. - print_verbose("Removing partial file after move failure: $destfile\n"); + print_verbose("Removing partial file after copy failure: $destfile\n"); unlink($destfile) || print_deferred_error("unlink($destfile) failed: $!\n"); } diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index a8148833412..375d62c6ef5 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 47874 2018-05-30 01:33:07Z preining $ +# $Id: tlmgr.pl 47935 2018-06-05 22:36:22Z karl $ # # Copyright 2008-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 47874 $'; -my $datrev = '$Date: 2018-05-30 03:33:07 +0200 (Wed, 30 May 2018) $'; +my $svnrev = '$Revision: 47935 $'; +my $datrev = '$Date: 2018-06-06 00:36:22 +0200 (Wed, 06 Jun 2018) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -7457,21 +7457,88 @@ between an option name and its value. =item B<--repository> I -Specifies the package repository from which packages should be installed -or updated, overriding the default package repository found in the -installation's TeX Live Package Database (a.k.a. the TLPDB, defined -entirely in the file C). The documentation for -C has more details about this -(L). +Specify the package repository from which packages should be installed +or updated, either a local directory or network location, as below. This +overridesthe default package repository found in the installation's TeX +Live Package Database (a.k.a. the TLPDB, which is given entirely in the +file C). -C<--repository> changes the repository location only for the current +This C<--repository> option changes the location only for the current run; to make a permanent change, use C action). +As an example, you can choose a particular CTAN mirror with something +like this: + + -repository http://ctan.example.org/its/ctan/dir/systems/texlive/tlnet + +Of course a real hostname and its particular top-level CTAN directory +have to be specified. The list of CTAN mirrors is available at +L. + +Here's an example of using a local directory: + + -repository /local/TL/repository + For backward compatibility and convenience, C<--location> and C<--repo> are accepted as aliases for this option. -See L for details on the supported schemata. +Locations can be specified as any of the following: + +=over 4 + +=item C + +=item C + +Equivalent ways of specifying a local directory. + +=item C + +=item C + +Pick a CTAN mirror automatically, trying for one that is both nearby and +up-to-date. The chosen mirror is used for the entire download. The bare +C is merely an alias for the full url. (See L for +more about CTAN and its mirrors.) + +=item C + +Standard HTTP. If the (default) LWP method is used, persistent +connections are supported. TL can also use C or C to do the +downloads, or an arbitrary user-specified program, as described in the +C documentation +(L). + +=item C + +Again, if the (default) LWP method is used, this supports persistent +connections. Unfortunately, some versions of C and C do not +support https, and even when C supports https, certificates may be +rejected even when the certificate is fine, due to a lack of local +certificate roots. The simplest workaround for this problem is to use +http or ftp. + +=item C + +If the (default) LWP method is used, persistent connections are +supported. + +=item C + +=item C + +=item C + +These forms are equivalent; they all use C to transfer files. Using +C is recommended. (Info: +L, +L.) + +=back + +If the repository is on the network, trailing C characters and/or +trailing C and/or C components are ignored. =item B<--gui> [I] @@ -9534,44 +9601,13 @@ If a value is not saved in the database the string C<(not set)> is shown. If you are developing a program that uses this output, and find that changes would be helpful, do not hesitate to write the mailing list. -=head1 SUPPORTED URL SCHEMATA - -The following URL schemata are supported - -=over 4 - -=item C - -Standard schema, is supported without any restrictions. If the (default) -LWP method is used, this schema supports persistent connections. - -=item C - -If the (default) LWP method is used, this schema supports persistent connections. - -=item C - -If the (default) LWP method is used, this schema supports persistent connections. -Some versions of C do not support this schema. Furthermore, even if -C supports https, it might check the certificate. C generally -supports https. - -=item C - -=item C - -=item C - -These schemata use C to transfer files. The use of an C -is highly recommended. - -=back - - =head1 ENVIRONMENT VARIABLES -For ease in scripting and debugging, C will look for the -following environment variables. They are not of interest for normal +C uses many of the standard TeX environment variables, as +reported by, e.g., C (L). + +In addition, for ease in scripting and debugging, C looks for the +following environment variables. These are not of interest for normal user installations. =over 4 @@ -9587,8 +9623,7 @@ backups and intermediate rollback containers. The order of selection is: If the environment variable C is defined, use it; abort if it doesn't work. Possible values: -C, C, C. - +C, C, C. The necessary options are added internally. =item 2. @@ -9623,7 +9658,8 @@ automatically selected by the installer. The order of selection is: If the environment variable C is defined, use it; abort if the specified program doesn't work. -Possible values: C, C. +Possible values: C, C. The necessary options are added +internally. =item 2. @@ -9658,10 +9694,10 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 47874 2018-05-30 01:33:07Z preining $ +$Id: tlmgr.pl 47935 2018-06-05 22:36:22Z karl $ =cut -# to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html +# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html ### Local Variables: ### perl-indent-level: 2 -- cgit v1.2.3