aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@ratatosk.fluxo.info>2014-03-22 16:47:22 -0300
committerrhatto <rhatto@ratatosk.fluxo.info>2014-03-22 16:47:22 -0300
commitfc9954384ee5543d742395c5b9245e83d6e9fd07 (patch)
tree6cb014b5117c9516880f9576c46bf90fae1754d3
parent82ec9c59d31a429335d1f953927775a80bb10808 (diff)
downloadkeyringer-fc9954384ee5543d742395c5b9245e83d6e9fd07.tar.gz
keyringer-fc9954384ee5543d742395c5b9245e83d6e9fd07.tar.bz2
Keyringer 0.3.30.3.3
-rw-r--r--ChangeLog10
-rwxr-xr-xkeyringer2
-rwxr-xr-xlib/keyringer/functions1
-rw-r--r--share/man/keyringer.18
4 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d53db7..5b1c53e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-22 - 0.3.3 - Silvio Rhatto <rhatto@riseup.net>
+
+ Use --recv-keys instead of --refresh-keys
+
+ Use -iname at find action
+
+ Removing --prune from git gc
+
+ Spell checking as suggested by Debian #741644
+
2014-03-14 - 0.3.2 - Silvio Rhatto <rhatto@riseup.net>
Subkey expiration date check shall not happen with expired keys
diff --git a/keyringer b/keyringer
index 7ea9752..6a1eda5 100755
--- a/keyringer
+++ b/keyringer
@@ -138,7 +138,7 @@ function keyringer_dispatch {
# Config
NAME="keyringer"
-KEYRINGER_VERSION="0.3.2"
+KEYRINGER_VERSION="0.3.3"
CONFIG_VERSION="0.1"
CONFIG_BASE="$HOME/.$NAME"
CONFIG="$CONFIG_BASE/config"
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index e2d23ac..f1af951 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -652,7 +652,6 @@ function keyringer_check_recipients {
# Check key expiration
keyringer_check_expiration "$recipient"
-
done
}
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 29c618b..f460cbf 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -16,8 +16,8 @@ It also supports encryption to multiple recipients and groups of
recipients, to allow a workgroup to share access to a single repository
while restricting some secrets to subsets of the group.
.PP
-Secrets are encrypted using GPG and added to a Git tree so that they can
-be synced with remote branches later.
+Secrets are encrypted using OpenPGP and added to a Git tree so that they
+can be synced with remote branches later.
.SH ACTIONS
.PP
Keyringer has three types of actions:
@@ -219,7 +219,7 @@ password-store convention.
.RE
.TP
.B xclip <\f[I]secret\f[]>
-Alis to clip action.
+Alias to clip action.
.RS
.RE
.SH CONFIGURATION ACTIONS
@@ -286,7 +286,7 @@ file\f[C]$KEYRING_FOLDER/config/recipients/accounting\f[].
.PP
Each line in a recipients file has entries in the format
\[aq]john\@doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\[aq], where
-\f[I]john\@doe.com\f[] is an alias for the GPG public key whose
+\f[I]john\@doe.com\f[] is an alias for the OpenPGP public key whose
fingerprint is \f[I]XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.\f[]
.PP
All lines starting with the hash (#) character are interpreted as