aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:00:54 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 14:00:54 +1300
commit3de9597da74e483e5fc54a812cd5b78e6648c455 (patch)
tree6f4ca03289073ad1d602a8ca25ec44f586d0ddaa
parenta6ab29725291392c50850647f088b5d350e389da (diff)
parent5bf19171388612bb6db07e9a49e28b0f0a4eaa32 (diff)
downloaddotfiles-3de9597da74e483e5fc54a812cd5b78e6648c455.tar.gz
dotfiles-3de9597da74e483e5fc54a812cd5b78e6648c455.zip
Merge branch 'release/v0.22.0'v0.22.0
* release/v0.22.0: Rebuild dotfiles(7) manual page Bump version number to 0.22.0 Update key fingerprint for finger(1) Use only fingerprints for GnuPG keys Remove --batch option and wrapper for gpg(1)
-rw-r--r--Makefile2
-rw-r--r--README.md1
-rw-r--r--VERSION4
-rw-r--r--finger/pgpkey10
-rw-r--r--gnupg/gpg.conf.mi59
-rw-r--r--man/man7/dotfiles.7df2
-rw-r--r--sh/shrc.d/gpg.sh10
7 files changed, 10 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index d6f025b9..f5e78396 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@
NAME = 'Tom Ryder'
EMAIL = tom@sanctum.geek.nz
-KEY = 0xC14286EA77BB8872
+KEY = FA09C06E1B670CD0B2F5DE60C14286EA77BB8872
SENDMAIL = msmtp
BINS = bin/ap \
diff --git a/README.md b/README.md
index 3e602d65..e8b67350 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,6 @@ in `sh/shrc.d` to be loaded by any POSIX interactive shell. Those include:
* `ed()` tries to get verbose error messages, a prompt, and a Readline
environment for `ed(1)`.
* `gdb()` silences startup messages from `gdb(1)`.
-* `gpg()` quietens `gpg(1)` down for most commands.
* `grep()` tries to apply color and other options good for interactive use if
available.
* `hgrep()` allows searching `$HISTFILE`.
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
diff --git a/finger/pgpkey b/finger/pgpkey
index 6d2cbeec..b65b028d 100644
--- a/finger/pgpkey
+++ b/finger/pgpkey
@@ -1,5 +1,5 @@
-pub 4096R/0xC14286EA77BB8872 2013-03-12 [expires: 2018-01-02]
- Key fingerprint = FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872
-uid [ultimate] Thomas Ryder (tyrmored, tejr) <tom@sanctum.geek.nz>
-sub 4096R/0x96C2CD91E67AC61D 2013-03-12 [expires: 2018-01-02]
-sub 4096R/0xB5AF5F8925926609 2013-03-12 [expires: 2018-01-02]
+pub rsa4096 2013-03-12 [SC] [expires: 2018-12-17]
+ FA09C06E1B670CD0B2F5DE60C14286EA77BB8872
+uid [ultimate] Thomas Ryder (tyrmored, tejr) <tom@sanctum.geek.nz>
+sub rsa4096 2013-03-12 [E] [expires: 2018-12-17]
+sub rsa4096 2013-03-12 [S] [expires: 2018-12-17]
diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5
index 1617a979..c3f80b7e 100644
--- a/gnupg/gpg.conf.mi5
+++ b/gnupg/gpg.conf.mi5
@@ -1,11 +1,6 @@
# Retrieve certs automatically if possible
auto-key-locate cert pka
-# Prevent boilerplate about needing key decryption, which is handled by the
-# agent; the gpg function in my Bash scripts overrides this for certain
-# commands where it interferes
-batch
-
# Use SHA512 as the hash when making key signatures
cert-digest-algo SHA512
@@ -18,8 +13,8 @@ default-recipient-self
# Show complete dates and use proper column separation for --with-colon listing mode
fixed-list-mode
-# Use 16-character key IDs as the default 8-character key IDs can be forged
-keyid-format 0xlong
+# Use only fingerprints as key IDs
+keyid-format none
# 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
diff --git a/sh/shrc.d/gpg.sh b/sh/shrc.d/gpg.sh
deleted file mode 100644
index 62d123ea..00000000
--- a/sh/shrc.d/gpg.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wrapper around gpg(1) to stop ``--batch'' breaking things
-gpg() {
- # shellcheck disable=SC2048
- case $* in
- *--ed*|*--gen-k*|*--sign-k*)
- set -- --no-batch "$@"
- ;;
- esac
- command gpg "$@"
-}