diff options
Diffstat (limited to 'security/monkeysphere/files/patch-src_share_mh_revoke__key')
| -rw-r--r-- | security/monkeysphere/files/patch-src_share_mh_revoke__key | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/security/monkeysphere/files/patch-src_share_mh_revoke__key b/security/monkeysphere/files/patch-src_share_mh_revoke__key deleted file mode 100644 index 2616c1b6191b..000000000000 --- a/security/monkeysphere/files/patch-src_share_mh_revoke__key +++ /dev/null @@ -1,29 +0,0 @@ ---- src/share/mh/revoke_key.orig 2018-10-16 16:24:55 UTC -+++ src/share/mh/revoke_key -@@ -72,11 +72,11 @@ y - else - # note: we're not using the gpg_host function because we actually - # want to use gpg's UI in this case, so we want to omit --no-tty -- revcert=$(GNUPGHOME="$GNUPGHOME_HOST" gpg --no-greeting --quiet --armor --gen-revoke "0x${keyID}!") \ -+ revcert=$(GNUPGHOME="$GNUPGHOME_HOST" gpg2 --no-greeting --quiet --armor --gen-revoke "0x${keyID}!") \ - || failure "Failed to generate revocation certificate!" - fi - -- # if you run gpg --gen-revoke but cancel it or quit in the middle, -+ # if you run gpg2 --gen-revoke but cancel it or quit in the middle, - # it returns success, but emits no revocation certificate: - if ! [ "$revcert" ] ; then - failure "Revocation canceled." -@@ -94,9 +94,9 @@ y - printf "Not publishing.\n" >&2 - else - local newhome=$(msmktempdir) -- GNUPGHOME="$newhome" gpg --no-tty --quiet --import < "$HOST_KEY_FILE" -- GNUPGHOME="$newhome" gpg --no-tty --quiet --import <<< "$revcert" -- GNUPGHOME="$newhome" gpg --keyserver "$KEYSERVER" --send-keys "0x${keyID}!" -+ GNUPGHOME="$newhome" gpg2 --no-tty --quiet --import < "$HOST_KEY_FILE" -+ GNUPGHOME="$newhome" gpg2 --no-tty --quiet --import <<< "$revcert" -+ GNUPGHOME="$newhome" gpg2 --keyserver "$KEYSERVER" --send-keys "0x${keyID}!" - rm -rf "$newhome" - fi - fi |