diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-12-29 14:11:38 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-12-29 14:11:38 +1300 |
commit | 95d9c2b446e93a1b968008573623ec83f67e3a31 (patch) | |
tree | d539eba6f7e6ad0e8da1f852d046ed6ce4a4eedf | |
parent | Merge branch 'release/v0.22.0' (diff) | |
parent | Bump version number to 0.22.1 (hotfix) (diff) | |
download | dotfiles-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-- | Makefile | 2 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | gnupg/gpg.conf.mi5 | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -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 @@ -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 %> |