summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLCrypto.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-05-05 02:15:24 +0000
committerNorbert Preining <preining@logic.at>2016-05-05 02:15:24 +0000
commit3afa368ef1203c83365f5bd3bbf2fc5d5d53eacb (patch)
tree3e23838e07b89e8e94d6a2c06d2d39500cddac51 /Master/tlpkg/TeXLive/TLCrypto.pm
parent5413e02cb51c0edb633e91c9d4392544deb8182a (diff)
switch location of keyring for additional keys to reside in texmf-dist
the reason is that on Windows when using --keyring c:/foo/bar gnupg *prepends* the path og GNUPGHOME, that is one gets as keyring path c:/path/to/gnupg-home/c:/foo/bar which is rubbish. The patch is trivial, but we cannot expect that all implementation fixes this problem. Thus, we use tlpkg/gpg/repository-keys.gpg as new location, and use --keyring repository-keys.gpg as argument. git-svn-id: svn://tug.org/texlive/trunk@40899 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLCrypto.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLCrypto.pm12
1 files changed, 7 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLCrypto.pm b/Master/tlpkg/TeXLive/TLCrypto.pm
index f604b2b4f39..ed61a663d56 100644
--- a/Master/tlpkg/TeXLive/TLCrypto.pm
+++ b/Master/tlpkg/TeXLive/TLCrypto.pm
@@ -311,13 +311,15 @@ sub setup_gpg {
# mind the final space for following args
$::gpg = "$prg --homedir $gpghome_quote ";
#
- # check for additional keyrings in
- # TEXMFSYSCONFIG/tlpkg/gpg/keyring.gpg
- chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
- my $addkr = "$TEXMFSYSCONFIG/tlpkg/gpg/keyring.gpg";
+ # check for additional keyring
+ # originally we wanted to use TEXMFSYSCONFIG, but gnupg on Windows
+ # is so stupid that it *prepends* GNUPGHOME to paths starting with
+ # a drive letter like c:/
+ # Thus we switch to using repository-keys.gpg in GNUPGHOME!
+ my $addkr = "$gpghome/repository-keys.gpg";
if (-r $addkr) {
debug("setup_gpg: using additional keyring $addkr\n");
- $::gpg .= "--keyring \"$addkr\" ";
+ $::gpg .= "--keyring repository-keys.gpg ";
}
if ($ENV{'TL_GNUPGARGS'}) {
$::gpg .= $ENV{'TL_GNUPGARGS'};