forked from Lainports/freebsd-ports
b1d97de0ca
- Makefile
adopt the port;
pet portlint;
remove comment about 'applying patches' on the post-patch stage;
unmute post-patch.
- files/*
patch src/share/mh/revoke_keys, to use gpg2;
move patch-gpg2 (410 lines), and split it to have separated patches;
regen all patches using makepatch.
Approved by: rene (mentor)
Differential Revision: https://reviews.freebsd.org/D18871
20 lines
642 B
Text
20 lines
642 B
Text
--- src/monkeysphere.orig 2018-10-16 16:24:55 UTC
|
|
+++ src/monkeysphere
|
|
@@ -62,7 +62,7 @@ EOF
|
|
|
|
# user gpg command to define common options
|
|
gpg_user() {
|
|
- LC_ALL=C "${GPG:-gpg}" --fixed-list-mode --no-greeting --quiet --no-tty "$@"
|
|
+ LC_ALL=C "${GPG:-gpg2}" --fixed-list-mode --no-greeting --quiet --no-tty "$@"
|
|
}
|
|
|
|
# output the ssh fingerprint of a gpg key
|
|
@@ -92,7 +92,7 @@ check_gpg_sec_key_id() {
|
|
case $(echo "$gpgSecOut" | grep -c '^sec:') in
|
|
0)
|
|
failure "No secret keys found. Create an OpenPGP key with the following command:
|
|
- gpg --gen-key"
|
|
+ gpg2 --gen-key"
|
|
;;
|
|
1)
|
|
echo "$gpgSecOut" | cut -d: -f5
|