From 0d44dcf7f349361f34d6c12079af6bdea1867121 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 29 Dec 2017 14:10:00 +1300
Subject: 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.
---
 Makefile           | 2 ++
 gnupg/gpg.conf.mi5 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f5e78396..dcb3b959 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 c3f80b7e..ee502692 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 %>
-- 
cgit v1.2.3