aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:11:56 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:11:56 +1300
commit730cf9f77c884453658ace9b7a2f80b082169935 (patch)
treed539eba6f7e6ad0e8da1f852d046ed6ce4a4eedf
parentd496d7de9b51eef2195d286e758b247c724c9e06 (diff)
parent2437a2d0c97ae4a5eec921ea85da3bb70260bb98 (diff)
downloaddotfiles-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--Makefile2
-rw-r--r--VERSION4
-rw-r--r--gnupg/gpg.conf.mi52
-rw-r--r--man/man7/dotfiles.7df2
4 files changed, 5 insertions, 5 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 2c516c7c..bf19fa24 100644
--- a/VERSION
+++ b/VERSION
@@ -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