From 0a0ac517dc7d65d22a602be95854956d780a3779 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 14:00:18 +1300 Subject: Bump version number to 0.22.0 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2c516c7c..0ecefce1 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.0 +Fri Dec 29 01:00:07 UTC 2017 -- cgit v1.2.3 From 5bf19171388612bb6db07e9a49e28b0f0a4eaa32 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 14:00:41 +1300 Subject: Rebuild dotfiles(7) manual page --- man/man7/dotfiles.7df | 2 -- 1 file changed, 2 deletions(-) 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 -- cgit v1.2.3 From 0d44dcf7f349361f34d6c12079af6bdea1867121 Mon Sep 17 00:00:00 2001 From: Tom Ryder 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 From 2437a2d0c97ae4a5eec921ea85da3bb70260bb98 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 14:11:17 +1300 Subject: Bump version number to 0.22.1 (hotfix) --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3