diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-12-29 14:11:56 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-12-29 14:11:56 +1300 |
commit | 730cf9f77c884453658ace9b7a2f80b082169935 (patch) | |
tree | d539eba6f7e6ad0e8da1f852d046ed6ce4a4eedf | |
parent | Merge branch 'feature/gpg-fp-only' into develop (diff) | |
parent | Bump version number to 0.22.1 (hotfix) (diff) | |
download | dotfiles-730cf9f77c884453658ace9b7a2f80b082169935.tar.gz dotfiles-730cf9f77c884453658ace9b7a2f80b082169935.zip |
Merge branch 'hotfix/v0.22.1' into develop
* hotfix/v0.22.1:
Bump version number to 0.22.1 (hotfix)
Allow specifying GnuPG --keyid-format at build
Rebuild dotfiles(7) manual page
Bump version number to 0.22.0
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | gnupg/gpg.conf.mi5 | 2 | ||||
-rw-r--r-- | man/man7/dotfiles.7df | 2 |
4 files changed, 5 insertions, 5 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.21.0 -Thu Dec 28 04:07:24 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 %> diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 90f7506a..b00f9a8b 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -305,8 +305,6 @@ Readline environment for \f[C]ed(1)\f[]. .IP \[bu] 2 \f[C]gdb()\f[] silences startup messages from \f[C]gdb(1)\f[]. .IP \[bu] 2 -\f[C]gpg()\f[] quietens \f[C]gpg(1)\f[] down for most commands. -.IP \[bu] 2 \f[C]grep()\f[] tries to apply color and other options good for interactive use if available. .IP \[bu] 2 |