summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-11-03 10:55:25 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-11-03 10:55:25 -0200
commit7fca7cd0433e6f97080ecf12bee64ec4f38948ba (patch)
tree0a51277f829b08b792204c8b4fe06c33bff4591a
parentd3ca92a6b7ef5ae3cf97bd988c14dac5852343b7 (diff)
downloadkeyringer-7fca7cd0433e6f97080ecf12bee64ec4f38948ba.tar.gz
keyringer-7fca7cd0433e6f97080ecf12bee64ec4f38948ba.tar.bz2
Keyringer 0.5.20.5.2
-rw-r--r--ChangeLog8
-rwxr-xr-xkeyringer2
-rw-r--r--share/man/keyringer.130
3 files changed, 29 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b55279..69a4751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-11-03 - 0.5.2 - Silvio Rhatto <rhatto@riseup.net>
+
+ Fixed incorrect exit statement on append, thanks jamie (#79)
+
+ Fixed possible race condition on append-batch/decrypt, thanks jamie (#80)
+
+ Various fixes for running keyringer on *BSD systems, thanks rysiek
+
2017-05-31 - 0.5.1 - Silvio Rhatto <rhatto@riseup.net>
Do not abort when keys are expired on actions that are
diff --git a/keyringer b/keyringer
index 3b4cdc0..6d4b035 100755
--- a/keyringer
+++ b/keyringer
@@ -140,7 +140,7 @@ function keyringer_dispatch {
# Config
NAME="keyringer"
-KEYRINGER_VERSION="0.5.1"
+KEYRINGER_VERSION="0.5.2"
CONFIG_VERSION="0.1"
CONFIG_BASE="$HOME/.$NAME"
CONFIG="$CONFIG_BASE/config"
diff --git a/share/man/keyringer.1 b/share/man/keyringer.1
index 7b1b030..16cceb7 100644
--- a/share/man/keyringer.1
+++ b/share/man/keyringer.1
@@ -1,4 +1,7 @@
+.\" Automatically generated by Pandoc 1.17.2
+.\"
.TH "KEYRINGER" "1" "Oct 25, 2013" "Keyringer User Manual" ""
+.hy
.SH NAME
.PP
keyringer \- encrypted and distributed secret sharing software
@@ -186,7 +189,7 @@ variable and then re\-encrypting it.
.RS
.PP
Please make sure to use an
-\f[I]\f[I]E\f[]\f[I]D\f[]\f[I]I\f[]\f[I]T\f[]\f[I]O\f[]\f[I]R\f[] * \f[I]w\f[]\f[I]h\f[]\f[I]i\f[]\f[I]c\f[]\f[I]h\f[]\f[I]d\f[]\f[I]o\f[]\f[I]e\f[]\f[I]s\f[]\f[I]n\f[]\f[I]o\f[]\f[I]t\f[]\f[I]l\f[]\f[I]e\f[]\f[I]a\f[]\f[I]k\f[]\f[I]d\f[]\f[I]a\f[]\f[I]t\f[]\f[I]a\f[]\f[I]l\f[]\f[I]i\f[]\f[I]k\f[]\f[I]e\f[]\f[I]h\f[]\f[I]i\f[]\f[I]s\f[]\f[I]t\f[]\f[I]o\f[]\f[I]r\f[]\f[I]y\f[]\f[I]b\f[]\f[I]u\f[]\f[I]f\f[]\f[I]f\f[]\f[I]e\f[]\f[I]r\f[]\f[I]s\f[].\f[I]K\f[]\f[I]e\f[]\f[I]y\f[]\f[I]r\f[]\f[I]i\f[]\f[I]n\f[]\f[I]g\f[]\f[I]e\f[]\f[I]r\f[]\f[I]t\f[]\f[I]r\f[]\f[I]i\f[]\f[I]e\f[]\f[I]s\f[]\f[I]t\f[]\f[I]o\f[]\f[I]d\f[]\f[I]e\f[]\f[I]t\f[]\f[I]e\f[]\f[I]c\f[]\f[I]t\f[]\f[I]i\f[]\f[I]f\f[] * EDITOR\f[]
+\f[I]\f[I]E\f[]\f[I]D\f[]\f[I]I\f[]\f[I]T\f[]\f[I]O\f[]\f[I]R\f[] * \f[I]w\f[]\f[I]h\f[]\f[I]i\f[]\f[I]c\f[]\f[I]h\f[]\f[I]d\f[]\f[I]o\f[]\f[I]e\f[]\f[I]s\f[]\f[I]n\f[]\f[I]o\f[]\f[I]t\f[]\f[I]l\f[]\f[I]e\f[]\f[I]a\f[]\f[I]k\f[]\f[I]d\f[]\f[I]a\f[]\f[I]t\f[]\f[I]a\f[]\f[I]l\f[]\f[I]i\f[]\f[I]k\f[]\f[I]e\f[]\f[I]h\f[]\f[I]i\f[]\f[I]s\f[]\f[I]t\f[]\f[I]o\f[]\f[I]r\f[]\f[I]y\f[]\f[I]b\f[]\f[I]u\f[]\f[I]f\f[]\f[I]f\f[]\f[I]e\f[]\f[I]r\f[]\f[I]s\f[].\f[I]K\f[]\f[I]e\f[]\f[I]y\f[]\f[I]r\f[]\f[I]i\f[]\f[I]n\f[]\f[I]g\f[]\f[I]e\f[]\f[I]r\f[]\f[I]t\f[]\f[I]r\f[]\f[I]i\f[]\f[I]e\f[]\f[I]s\f[]\f[I]t\f[]\f[I]o\f[]\f[I]d\f[]\f[I]e\f[]\f[I]t\f[]\f[I]e\f[]\f[I]c\f[]\f[I]t\f[]\f[I]i\f[]\f[I]f\f[]*EDITOR\f[]
is set to VIM and disables the \f[I]\&.viminfo\f[] file.
.RE
.TP
@@ -359,15 +362,22 @@ to the \f[C]$KEYRING_FOLDER/config/recipients/\f[] folder.
.RE
.RE
.SH FILES
-.PP
-$HOME/.keyringer/config : User\[aq]s main configuration file used to map
-alias names to keyrings.
-.PP
-$HOME/.keyringer/\f[I]keyring\f[] : User preferences for the keyringer
-aliased \f[I]keyring\f[] keyring.
-.PP
-$KEYRING_FOLDER/config/options : Custom keyring options which will be
-applied for all users that use the keyringer repository.
+.TP
+.B $HOME/.keyringer/config
+User\[aq]s main configuration file used to map alias names to keyrings.
+.RS
+.RE
+.TP
+.B $HOME/.keyringer/\f[I]keyring\f[]
+User preferences for the keyringer aliased \f[I]keyring\f[] keyring.
+.RS
+.RE
+.TP
+.B $KEYRING_FOLDER/config/options
+Custom keyring options which will be applied for all users that use the
+keyringer repository.
+.RS
+.RE
.SH LIMITATIONS
.PP
Keyringer currently has the following limitations: