From 3c25816cc303cfac2f6ee95d07c5eb3a5ed24ec7 Mon Sep 17 00:00:00 2001
From: traumschule <traumschuleriebau@riseup.net>
Date: Wed, 26 Sep 2018 19:40:47 +0200
Subject: [PATCH] use gpg --homedir option in update_signing-keys.pl (#27878)

---
 docs/en/update_signing-keys.pl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/en/update_signing-keys.pl b/docs/en/update_signing-keys.pl
index 5cdc1006..b6f008c5 100755
--- a/docs/en/update_signing-keys.pl
+++ b/docs/en/update_signing-keys.pl
@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
+use File::Temp qw/tempdir/; # https://metacpan.org/pod/File::Temp
 
 # This script automatically updates the .wmi file with gpg as per:
 my $keysfile = "include/keys.txt";
@@ -18,6 +19,8 @@
 my $root = "$1/../..";
 chdir $root or die "Could not enter $root: $! (script path: $0)\n";
 
+my $gpghomedir = tempdir(CLEANUP => 1, chmod => 0700);
+
 open my $kf, '<', "$keysfile" # read keys
   or die "Could not open $keysfile: $!\n";
 
@@ -101,18 +104,19 @@
   }
 
   # we update collected keys for this application and create a string of them
-  my $gpgcmd = "gpg --keyid-format 0xlong --fingerprint --with-subkey-fingerprints";
+  my $gpgcmd = "gpg2 --homedir $gpghomedir ";
+  my $gpgoptions = "--keyid-format 0xlong --fingerprint --with-subkey-fingerprints";
   foreach my $key (@keysforapp) {
     # update keys
     if ($forcekeyupdates or not $skipkeyupdates) {
       print "\nFetching $key\n";
       my $gpgresult;
-      do { $gpgresult = system "gpg --recv-key $key"; sleep 1; }
+      do { $gpgresult = system "$gpgcmd --recv-key $key"; sleep 1; }
       while ($gpgresult != 0);
     }
 
     # add output to key string
-    my $str = qx/$gpgcmd $key/;
+    my $str = qx/$gpgcmd $gpgoptions $key/;
     # replace html codes
     $str =~ s/</&lt;/g; $str =~ s/>/&gt;/g; $str =~ s/@/#/g; $str =~ s/@/&at;/g;
     $keys .= "$str";
@@ -124,7 +128,7 @@
     my $owner = "The Tor Browser Developers";
     die "Did not findTor Browser signing key.\n" if ($owners{$owner} eq '');
     # save Tor Browser signing key subkey fingerprints to $fpfile
-    my @fp = qx/$gpgcmd $owners{$owner}|grep "Key fingerprint"/;
+    my @fp = qx/$gpgcmd $gpgoptions $owners{$owner}|grep "Key fingerprint"/;
     shift @fp; # remove primary key fingerprint
     $subkey_fingerprints .= join ('', map { s/^\s+Key fingerprint = //; "$_" } @fp);
     if (open my $fpout, '>', "$fpfile.temp") {