summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS7
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm13
-rwxr-xr-xMaster/tlpkg/bin/tl-check-fmtshare4
-rw-r--r--Master/tlpkg/gpg/tl-key-extension.txt28
4 files changed, 39 insertions, 13 deletions
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index 6ab7f3e5645..3d3d9b4d57b 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,7 +1,14 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<p><b>tlmgr 605693 (released 12oct21):</b>
+<li>use TEXMFROOT instead of SELFAUTOPARENT to allow easier relocating
+ (<a href="/pipermail/tex-live/2021-September/047394.html">thread</a>).
+
+<p><b>tlmgr 60557 (released 20sep21):</b>
<li>omit &ldquo;done running&rdquo; line for fmtutil.
+<li>allow : to separate argument values as well as , to placate powershell.
+<li>config.guess: back to `...`. Whew.
<p><b>tlmgr 59208 (released 15may21):</b>
<li>still trying to optimize the ssl multiplexor resolution.
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 1b162d7c5bc..675ada5ea55 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -112,7 +112,7 @@ C<TeXLive::TLUtils> - TeX Live infrastructure miscellany
TeXLive::TLUtils::report_tlpdb_differences(\%ret);
TeXLive::TLUtils::tlnet_disabled_packages($root);
TeXLive::TLUtils::mktexupd();
- TeXLive::TLUtils::setup_sys_user_mode($optsref,$tmfc, $tmfsc, $tmfv, $tmfsv);
+ TeXLive::TLUtils::setup_sys_user_mode($prg,$optsref,$tmfc,$tmfsc,$tmfv,$tmfsv);
TeXLive::TLUtils::prepend_own_path();
TeXLive::TLUtils::repository_to_array($str);
@@ -4677,9 +4677,14 @@ sub mktexupd {
=item C<setup_sys_user_mode($prg, $optsref, $tmfc, $tmfsc, $tmfv, $tmfsv)>
-Return two-element list C<($texmfconfig,$texmfvar)> of which directories
-to use, either user or sys. If C<$prg> is C<mktexfmt>, and the system
-dirs are writable, use them even if we are in user mode.
+Return two-element list C<($texmfconfig,$texmfvar)> specifying which
+directories to use, either user or sys. If C<$optsref->{'sys'}> is
+true, we are in sys mode; else if C<$optsref->{'user'}> is set, we are
+in user mode; else a fatal error.
+
+If C<$prg> eq C<"mktexfmt">, and C<$TEXMFSYSVAR/web2c> is writable, use
+it instead of C<$TEXMFVAR>, even if we are in user mode. C<$TEXMFCONFIG>
+is not switched, however.
=cut
diff --git a/Master/tlpkg/bin/tl-check-fmtshare b/Master/tlpkg/bin/tl-check-fmtshare
index d522a22c248..593b2205a2b 100755
--- a/Master/tlpkg/bin/tl-check-fmtshare
+++ b/Master/tlpkg/bin/tl-check-fmtshare
@@ -27,7 +27,9 @@ remote=
usage="Usage: $0 [OPTION]... RHOST:RDIR
Build TeX .fmt files locally, then copy them to RHOST:RDIR and try to
-load them with the TeX engines there.
+load them with the TeX engines there. That is, RDIR should be a web2c
+build directory with binaries; in TeX Live,
+/something/like/Build/source/Work/texk/web2c.
The idea is to support testing for .fmts being sharable among different
system architectures, as intended; for instance, 4-byte long vs. 8-byte
diff --git a/Master/tlpkg/gpg/tl-key-extension.txt b/Master/tlpkg/gpg/tl-key-extension.txt
index 6c4569a410f..4157e0fca4b 100644
--- a/Master/tlpkg/gpg/tl-key-extension.txt
+++ b/Master/tlpkg/gpg/tl-key-extension.txt
@@ -30,30 +30,42 @@ unset GNUPGHOME
gpg --send-keys $KEYID
-
# update TeX Live repository
-export GNUPGHOME=/path/to/texlive-svn/Master/tlpkg/gpg
+export GNUPGHOME=/home/texlive/Master/tlpkg/gpg # wherever svn checkout
# use gpg version 1 here!!!
gpg1 --import texlive.asc
-svn/git commit
+svn commit
# on the TUG server (needs the exported public key in
# texlive.asc, see above how to export it)
-gpg --homedir ~texlive/.gnupg --import texlive.asc
+gpg --homedir /home/texlive/.gnupg --import texlive.asc
# can view that .asc with:
-gpg --show-keyring texlive.asc
+gpg --homedir /home/texlive/.gnupg texlive.asc
# update web-accessible public key, keeping old files but updating symlink:
cp texlive.asc ~www/texlive/files/texlive`date +%Y`.asc
ln -s texlive`date +%Y`.asc ~www/texlive/files/texlive.asc
More info:
-. we use tlpkg/bin/tl-sign-file to sign texlive.tlpdb.sha512.
-. gpg --verify --verbose foo.asc for info on signature file.
+. tlgpg runs a gpg command with the above TL .gnupg directory, etc.
+
+. tl-sign-file (uses tlgpg) is used to sign texlive.tlpdb.sha512.
+
+. tlgpg-verify foo[.asc] will check for expired key, per below.
+ tl-sign-file uses this to make sure it is not signing with an expired key.
+
+. (tl)gpg foo.asc will sometimes report expiration info.
+
+. given files updated in Master/tlpkg/gpg, can export into asc:
+gpg --homedir ..../Master/tlpkg/gpg --export -a 0x0D5E5D9106BAB6BC >tl.asc
+
+. gpg --verify --verbose foo.asc reports some info.
+
. but exit status is zero even with expired keys; to check,
use --status-file and inspect:
gpg --verify --verbose --status-file=/tmp/st foo.asc
-. see tl-sign-file or TLCrypto.pm for full implementation.
+
+. see tlgpg, tl-sign-file, TLCrypto.pm for full implementation.