aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:11:38 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:11:38 +1300
commit95d9c2b446e93a1b968008573623ec83f67e3a31 (patch)
treed539eba6f7e6ad0e8da1f852d046ed6ce4a4eedf
parent3de9597da74e483e5fc54a812cd5b78e6648c455 (diff)
parent2437a2d0c97ae4a5eec921ea85da3bb70260bb98 (diff)
downloaddotfiles-95d9c2b446e93a1b968008573623ec83f67e3a31.tar.gz
dotfiles-95d9c2b446e93a1b968008573623ec83f67e3a31.zip
Merge branch 'hotfix/v0.22.1'v0.22.1
* hotfix/v0.22.1: Bump version number to 0.22.1 (hotfix) Allow specifying GnuPG --keyid-format at build
-rw-r--r--Makefile2
-rw-r--r--VERSION4
-rw-r--r--gnupg/gpg.conf.mi52
3 files changed, 5 insertions, 3 deletions
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/VERSION b/VERSION
index 0ecefce1..bf19fa24 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.22.0
-Fri Dec 29 01:00:07 UTC 2017
+tejr dotfiles v0.22.1
+Fri Dec 29 01:10:55 UTC 2017
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 %>