From 4dcee0cc96819adbc6a608a32694a0ba85b5082f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Sep 2017 21:17:16 +0000 Subject: tlmgr news tweaks; sync git-svn-id: svn://tug.org/texlive/trunk@45305 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 39 ++++++++++++++-------- Master/texmf-dist/scripts/texlive/NEWS | 13 ++++---- Master/texmf-dist/tex/texinfo/texinfo.tex | 36 ++++++++++---------- 3 files changed, 51 insertions(+), 37 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index c3d64c0bf41..7ddd7f0ebee 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 45275 2017-09-12 00:47:29Z preining $ +# $Id: tlmgr.pl 45286 2017-09-13 01:55:27Z preining $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 45275 $'; -my $datrev = '$Date: 2017-09-12 02:47:29 +0200 (Tue, 12 Sep 2017) $'; +my $svnrev = '$Revision: 45286 $'; +my $datrev = '$Date: 2017-09-13 03:55:27 +0200 (Wed, 13 Sep 2017) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -6454,7 +6454,7 @@ END_NO_CHECKSUMS my $verstat = ""; if (!$remotetlpdb->virtual_get_tlpdb('main')->is_verified) { $verstat = ": "; - $verstat .= $remotetlpdb->virtual_get_tlpdb('main')->verification_status; + $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb('main')->verification_status}; } info("\tmain = " . $repos{'main'} . " (" . ($remotetlpdb->virtual_get_tlpdb('main')->is_verified ? "" : "not ") . @@ -6464,7 +6464,7 @@ END_NO_CHECKSUMS $verstat = ""; if (!$remotetlpdb->virtual_get_tlpdb($t)->is_verified) { $verstat = ": "; - $verstat .= $remotetlpdb->virtual_get_tlpdb($t)->verification_status; + $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb($t)->verification_status}; } info("\t$t = " . $repos{$t} . " (" . ($remotetlpdb->virtual_get_tlpdb($t)->is_verified ? "" : "not ") . @@ -6511,7 +6511,7 @@ sub _init_tlmedia { my $verstat = ""; if (!$remotetlpdb->is_verified) { $verstat = ": "; - $verstat .= $remotetlpdb->verification_status; + $verstat .= $VerificationStatusDescription{$remotetlpdb->verification_status}; } info("$prg: package repository $location (" . ($remotetlpdb->is_verified ? "" : "not ") . "verified$verstat)\n"); @@ -6561,7 +6561,7 @@ sub setup_one_remotetlpdb { my ($ret,$msg) = TeXLive::TLCrypto::verify_checksum($loc_copy_of_remote_tlpdb, $path); - if ($ret == -1) { + if ($ret == $VS_CONNECTION_ERROR) { info(<new(root => $location, tlpdbfile => $loc_copy_of_remote_tlpdb); $local_copy_tlpdb_used = 1; - } elsif ($ret == -2) { + } elsif ($ret == $VS_UNSIGNED) { + # we require the main database to be signed, but allow for + # subsidiary to be unsigned + if ($is_main) { + tldie("$prg: main database at $location is not signed: $msg\n"); + } # the remote database has not be signed, warn debug("$prg: remote database is not signed, continuing anyway!\n"); - } elsif ($ret == -3) { + } elsif ($ret == $VS_GPG_UNAVAILABLE) { # no gpg available debug("$prg: no gpg available for verification, continuing anyway!\n"); - } elsif ($ret == -4) { + } elsif ($ret == $VS_PUBKEY_MISSING) { # pubkey missing debug("$prg: $msg, continuing anyway!\n"); - } elsif ($ret == 1) { + } elsif ($ret == $VS_CHECKSUM_ERROR) { # no problem, checksum is wrong, we need to get new tlpdb - } elsif ($ret == 2) { + } elsif ($ret == $VS_SIGNATURE_ERROR) { # umpf, signature error # TODO should we die here? Probably yes because one of # checksum file or signature file has changed! tldie("$prg: verification of checksum for $location failed: $msg\n"); - } elsif ($ret == 0) { + } elsif ($ret == $VS_VERIFIED) { $remotetlpdb = TeXLive::TLPDB->new(root => $location, tlpdbfile => $loc_copy_of_remote_tlpdb); $local_copy_tlpdb_used = 1; @@ -6606,6 +6611,12 @@ END_NO_INTERNET } if (!$local_copy_tlpdb_used) { $remotetlpdb = TeXLive::TLPDB->new(root => $location, verify => 1); + if ($is_main) { + if ($remotetlpdb->verification_status == $VS_UNSIGNED) { + # we don't allow unsigned main data bases! + tldie("$prg: main database at $location is not signed\n"); + } + } } if (!defined($remotetlpdb)) { return(undef, $loadmediasrcerror . $location); @@ -9072,7 +9083,7 @@ 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 45275 2017-09-12 00:47:29Z preining $ +$Id: tlmgr.pl 45286 2017-09-13 01:55:27Z preining $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS index 79552df7633..9db870c9e19 100644 --- a/Master/texmf-dist/scripts/texlive/NEWS +++ b/Master/texmf-dist/scripts/texlive/NEWS @@ -1,14 +1,15 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) -

tlmgr NNNNN (released ??????): -

  • require the main repository to be signed +

    tlmgr 45286 (released 15sep17): +

  • require the main repository to be signed. +
  • fix tlmgr info output. -

    tlmgr 45234 (released 5sep17): +

    tlmgr 45190 (released 1sep17):

  • fix tlmgrgui not to switch to single repo mode on CTAN mirror usage. -
  • prohibit upgrades between releases using tlmgr -
  • add shell mode -
  • add tabulated info output +
  • prohibit upgrades between releases using tlmgr. +
  • add shell mode. +
  • add tabulated info output.

    tlmgr 44452 (released 9jun17):

  • bug fix for tlmgr conf editing of line continuations. diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index b40a6e2a2be..a774790c511 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2017-06-04.19} +\def\texinfoversion{2017-08-23.19} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -5696,10 +5696,13 @@ end \advance\dimen@ii by 1\dimen@i \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly + % Try to split the text roughly evenly. \dimen@ will be the length of + % the first line. + \dimen@ = 0.7\dimen@ \dimen@ii = \hsize \ifnum\dimen@>\dimen@ii - % If the entry is too long, use the whole line + % If the entry is too long (for example, if it needs more than + % two lines), use all the space in the first line. \dimen@ = \dimen@ii \fi \advance\leftskip by 0pt plus 1fill % ragged right @@ -5709,8 +5712,9 @@ end % instead of using \parshape with explicit line lengths, but TeX % doesn't seem to provide a way to do such a thing. % - \leftskip = 1em - \parindent = -1em + % Indent all lines but the first one. + \advance\leftskip by 1em + \advance\parindent by -1em \fi\fi \indent % start paragraph \unhbox\boxA @@ -6943,7 +6947,15 @@ end % exist, with an empty box. Let's hope all the numbers have the same width. % Also ignore the page number, which is conventionally not printed. \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} -\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} +\def\partentry#1#2#3#4{% + % Add stretch and a bonus for breaking the page before the part heading. + % This reduces the chance of the page being broken immediately after the + % part heading, before a following chapter heading. + \vskip 0pt plus 5\baselineskip + \penalty-300 + \vskip 0pt plus -5\baselineskip + \dochapentry{\numeralbox\labelspace#1}{}% +} % % Parts, in the short toc. \def\shortpartentry#1#2#3#4{% @@ -11009,7 +11021,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2113}{\ensuremath\ell}% \DeclareUnicodeCharacter{2118}{\ensuremath\wp}% \DeclareUnicodeCharacter{211C}{\ensuremath\Re}% - \DeclareUnicodeCharacter{2127}{\ensuremath\mho}% \DeclareUnicodeCharacter{2135}{\ensuremath\aleph}% \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow}% \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow}% @@ -11025,7 +11036,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow}% \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup}% \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown}% - \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright}% \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup}% \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown}% \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons}% @@ -11034,8 +11044,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow}% \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow}% \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow}% - \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto}% - \DeclareUnicodeCharacter{2201}{\ensuremath\complement}% \DeclareUnicodeCharacter{2202}{\ensuremath\partial}% \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset}% \DeclareUnicodeCharacter{2207}{\ensuremath\nabla}% @@ -11069,8 +11077,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2283}{\ensuremath\supset}% \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq}% \DeclareUnicodeCharacter{228E}{\ensuremath\uplus}% - \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset}% - \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset}% \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq}% \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq}% \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap}% @@ -11085,8 +11091,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop}% \DeclareUnicodeCharacter{22A5}{\ensuremath\bot}% \DeclareUnicodeCharacter{22A8}{\ensuremath\models}% - \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd}% - \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd}% \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge}% \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee}% \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap}% @@ -11102,12 +11106,11 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2322}{\ensuremath\frown}% \DeclareUnicodeCharacter{2323}{\ensuremath\smile}% % - \DeclareUnicodeCharacter{25A1}{\ensuremath\Box}% \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle}% \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright}% \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown}% \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft}% - \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond}% + \DeclareUnicodeCharacter{25C7}{\ensuremath\diamond}% \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit}% \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit}% \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit}% @@ -11129,7 +11132,6 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes}% \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus}% \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup}% - \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join}% \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg}% \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq}% \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq}% -- cgit v1.2.3