texlive[48560] doc, wording
commits+karl at tug.org
commits+karl at tug.org
Mon Sep 3 19:46:06 CEST 2018
Revision: 48560
http://tug.org/svn/texlive?view=revision&revision=48560
Author: karl
Date: 2018-09-03 19:46:06 +0200 (Mon, 03 Sep 2018)
Log Message:
-----------
doc, wording
Modified Paths:
--------------
trunk/Master/install-tl
trunk/Master/texmf-dist/scripts/texlive/NEWS
trunk/Master/tlpkg/bin/tl-try-install
trunk/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt
Property Changed:
----------------
trunk/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2018-09-03 16:20:13 UTC (rev 48559)
+++ trunk/Master/install-tl 2018-09-03 17:46:06 UTC (rev 48560)
@@ -972,6 +972,7 @@
# Make texmf.cnf, backup directory, cleanups, path setting, and
# (most importantly) post-install subprograms: mktexlsr, fmtutil,
# and more. Return count of errors detected, hopefully zero.
+#
sub do_postinst_stuff {
my $TEXDIR = "$vars{'TEXDIR'}";
my $TEXMFSYSVAR = "$vars{'TEXMFSYSVAR'}";
@@ -1472,10 +1473,10 @@
# via env var
my $envvar = getenv($envstr);
if ($vars{$what} && $envvar && $vars{$what} ne $envvar) {
- tlwarn("Trying to define $what via conflicting settings\n");
- tlwarn(" from profile: " . $vars{$what} . "\n");
- tlwarn(" from envvar: $envvar ($envstr)\n");
- tlwarn("Preferring the profile variable!\n");
+ tlwarn("Trying to define $what via conflicting settings:\n");
+ tlwarn(" from envvar $envvar = $envvar($envstr)\n");
+ tlwarn(" from profile = $vars{$what}\n");
+ tlwarn(" Preferring the profile value!\n");
$envvar = undef;
}
# default for most variables is in increasing priority
@@ -1496,10 +1497,10 @@
if ($tlprefixenv && $vars{'TEXDIR'}) {
# NOTE we cannot compare these two values because the one might
# contain the YYYY part (TEXDIR) while the other is the one without.
- tlwarn("Trying to setup basic path using two incompatible methods\n");
- tlwarn(" from profile: " . $vars{'TEXDIR'} . "\n");
- tlwarn(" from envvar: $tlprefixenv ('TEXLIVE_INSTALL_PREFIX')\n");
- tlwarn("Preferring the profile variable!\n");
+ tlwarn("Trying to set up basic path using two incompatible methods:\n");
+ tlwarn(" from envvar TEXLIVE_INSTALL_PREFIX = $tlprefixenv\n");
+ tlwarn(" from profile TEXDIR = $vars{'TEXDIR'}\n");
+ tlwarn(" Preferring the profile value!\n");
$tlprefixenv = undef;
}
# first set $tex_prefix
@@ -2738,9 +2739,9 @@
=item B<-init-from-profile> I<profile_file>
-Similar to B<-profile> (see L</PROFILES> below), but only initializes the
-installation configuration from I<profile_file> and then starts the
-interactive session.
+Similar to B<-profile> (see L</PROFILES> below), but only initializes
+the installation configuration from I<profile_file> and then starts a
+normal interactive session. Environment variables are not ignored.
=item B<-logfile> I<file>
@@ -2797,7 +2798,8 @@
=item B<-profile> I<profile_file>
Load I<profile_file> and do the installation with no user interaction,
-that is, a batch (unattended) install. See L</PROFILES> below.
+that is, a batch (unattended) install. Environment variables are
+ignored. See L</PROFILES> below.
=item B<-q>
Modified: trunk/Master/texmf-dist/scripts/texlive/NEWS
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/NEWS 2018-09-03 16:20:13 UTC (rev 48559)
+++ trunk/Master/texmf-dist/scripts/texlive/NEWS 2018-09-03 17:46:06 UTC (rev 48560)
@@ -1,8 +1,9 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<p><b>tlmgr 48522 (released 3sep18):</b>
+<li>tlmgr info: report Catalogue contact info if available.
<li>only run mtxrun if luatex is available.
-<li>tlmgr info: report Catalogue contact info if available.
<p><b>tlmgr 48271 (released 25jul18):</b>
<li>prefer system provided binaries over TL provided binaries for
Modified: trunk/Master/tlpkg/bin/tl-try-install
===================================================================
--- trunk/Master/tlpkg/bin/tl-try-install 2018-09-03 16:20:13 UTC (rev 48559)
+++ trunk/Master/tlpkg/bin/tl-try-install 2018-09-03 17:46:06 UTC (rev 48560)
@@ -1,4 +1,4 @@
-#!/bin/sh -vx
+#!/bin/sh -x
# $Id$
# Try a TL installation with various profiles into /tmp/ki. Public domain.
@@ -23,7 +23,7 @@
thisrel=/usr/local/texlive/`date +%Y` # not necessarily, but whatever
prevrel=/usr/local/texlive/`expr "$(date +%Y)" - 1`
-pro=--profile=${1-Master/tlpkg/dev/profiles/TLinfra.pro} #infra min ... full
+pro=--profile=${1-$Master/tlpkg/dev/profiles/TLinfra.pro} #infra min ... full
exec time $Master/install-tl $pro
exec time $lp/install-tl $pro
exec time $lp/install-tl $pro --repo ftp://ftp.cstug.cz/pub/tex/local/tlpretest
Modified: trunk/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt
===================================================================
--- trunk/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt 2018-09-03 16:20:13 UTC (rev 48559)
+++ trunk/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt 2018-09-03 17:46:06 UTC (rev 48560)
@@ -1,17 +1,34 @@
+$Id$
+Public domain.
+
+
Steps to extend TL signing key
==============================
+This needs to happen every year in August (--list-keys for actual expiration).
* get main key dir from USB stick
+
* set GNUPGHOME to the respective directory
+
* gpg1 --edit-key 0x0D5E5D9106BAB6BC
key 2 # select signing sub key
expire
1y
save
+
* export signing key
gpg1 --export 0x0D5E5D9106BAB6BC > tmpkey
+
* send to key server
- gpg1 --keyserver hkp://pool.sks-keyservers.net --send-key 06BAB6B
+ gpg1 --keyserver hkp://pool.sks-keyservers.net \
+ --send-key 0x0D5E5D9106BAB6BC
+
* import into TL subversion
gpg1 --homedir .../Master/tlpkg/gpg --import tmpkey
+
+* on the TL side
+ gpg --homedir ~texlive/etc \
+ --keyserver hkp://pool.sks-keyservers.net \
+ --recv-key 0x0D5E5D9106BAB6BC
+
* after testing push out tlcritical
Property changes on: trunk/Master/tlpkg/doc/gpg-extend-key-expiry-howto.txt
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
More information about the tex-live-commits
mailing list