aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:10:00 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:10:00 +1300
commit0d44dcf7f349361f34d6c12079af6bdea1867121 (patch)
treeaf5f12128399817594214510a96d981740ae57e6
parent3de9597da74e483e5fc54a812cd5b78e6648c455 (diff)
downloaddotfiles-0d44dcf7f349361f34d6c12079af6bdea1867121.tar.gz
Allow specifying GnuPG --keyid-format at build
Old versions of gpg(1) don't support "none" as a --keyid-format; allow specifying it as a Makefile variable KEYID_FORMAT.
-rw-r--r--Makefile2
-rw-r--r--gnupg/gpg.conf.mi52
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f5e7839..dcb3b95 100644
--- a/Makefile
+++ b/Makefile
@@ -323,10 +323,12 @@ git/gitconfig: git/gitconfig.m4
git/gitconfig.m4 > $@
KEYSERVER = hkps://hkps.pool.sks-keyservers.net
+KEYID_FORMAT = none
gnupg/gpg.conf: gnupg/gpg.conf.m4
m4 \
-D KEYSERVER=$(KEYSERVER) \
+ -D KEYID_FORMAT=$(KEYID_FORMAT) \
gnupg/gpg.conf.m4 > $@
MAILDIR = $(HOME)/Mail
diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5
index c3f80b7..ee50269 100644
--- a/gnupg/gpg.conf.mi5
+++ b/gnupg/gpg.conf.mi5
@@ -14,7 +14,7 @@ default-recipient-self
fixed-list-mode
# Use only fingerprints as key IDs
-keyid-format none
+keyid-format <% KEYID_FORMAT %>
# Use a pool of servers which support HKPS (encrypted key retrieval)
keyserver <% KEYSERVER %>