From 25e7b2e3067a8b7ae0f9856883facc0275c07686 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 Oct 2021 18:17:33 +0000 Subject: misc doc updates: clisp build, gpg procedure, setup_sys_user_mode() args git-svn-id: svn://tug.org/texlive/trunk@60823 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/README | 13 ++++++++----- Master/texmf-dist/scripts/texlive/NEWS | 7 +++++++ Master/tlpkg/TeXLive/TLUtils.pm | 13 +++++++++---- Master/tlpkg/bin/tl-check-fmtshare | 4 +++- Master/tlpkg/gpg/tl-key-extension.txt | 28 ++++++++++++++++++++-------- 5 files changed, 47 insertions(+), 18 deletions(-) diff --git a/Build/source/utils/README b/Build/source/utils/README index 7e058dcb50a..ba9e212c31a 100644 --- a/Build/source/utils/README +++ b/Build/source/utils/README @@ -88,6 +88,7 @@ ln -s . $clisp_toolsdir/lib/64 # for Solaris 64-bit # when running configure for clisp. # may be able to omit iconv if have new enough in libc or elsewhere. +# (and omit --with-libiconv-prefix below) libiconv_ver=libiconv-1.16 cd $clisp_basedir $wget http://ftp.gnu.org/gnu/libiconv/$libiconv_ver.tar.gz @@ -100,12 +101,12 @@ cd $libiconv_ver # would probably be ideal to also do a local libtermcap or ncurses, # but doesn't seem to be a problem in practice? -# foil wrong attempts at dynamic linking, etc. -(cd $clisp_basedir/clisp-tools/lib && rm -f *.dylib *.la) +# foil wrong attempts at dynamic linking, etc. Don't worry if any don't exist. +(cd $clisp_basedir/clisp-tools/lib && mkdir .dy && mv *.dylib *.la .dy) -clisp_ver=2.49.92 +clisp_ver=clisp-2.49.92 cd $clisp_basedir -$wget https://alpha.gnu.org/gnu/clisp/clisp-2.49.92.tar.bz2 +$wget https://alpha.gnu.org/gnu/clisp/$clisp_ver.tar.bz2 bunzip2 -dc $clisp_ver.tar.bz2 | tar xf - cd $clisp_ver @@ -116,7 +117,9 @@ cd $clisp_ver # On FreeBSD/amd64: add --disable-mmap. # # Do not link with ncurses, we don't need it and versions differ. -ac_cv_search_tgetent=" "; export ac_cv_search_tgetent +# but, this doesn't work with 2.49.92, results in undefined references +# to the termcap functions. +#ac_cv_search_tgetent=" "; export ac_cv_search_tgetent # ./configure CPPFLAGS=-DUNIX_BINARY_DISTRIB --prefix=$clisp_toolsdir \ --without-readline --without-dynamic-modules \ 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.) +

tlmgr 605693 (released 12oct21): +

  • use TEXMFROOT instead of SELFAUTOPARENT to allow easier relocating + (thread). + +

    tlmgr 60557 (released 20sep21):

  • omit “done running” line for fmtutil. +
  • allow : to separate argument values as well as , to placate powershell. +
  • config.guess: back to `...`. Whew.

    tlmgr 59208 (released 15may21):

  • 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 - 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 -Return two-element list C<($texmfconfig,$texmfvar)> of which directories -to use, either user or sys. If C<$prg> is C, 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. -- cgit v1.2.3