Merge branch 'master' into ssss

36 files changed, 1288 insertions, 174 deletions

diff --git a/.gitignore b/.gitignore
index 1377554..f9b9271 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
+debian/keyringer.debhelper.log
+debian/keyringer
+debian/files
 *.swp
+.pc
+debian/files
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..8d98a67
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,40 @@
+#
+#  Keyringer Makefile by Silvio Rhatto (rhatto at riseup.net).
+#
+#  This Makefile is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 2 of the License, or any later version.
+#
+#  This Makefile is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+#  Place - Suite 330, Boston, MA 02111-1307, USA
+#
+
+PACKAGE = keyringer
+VERSION = 0.1
+PREFIX = /usr
+INSTALL = /usr/bin/install
+
+clean:
+	find . -name *~ | xargs rm -f # clean local backups
+
+install_lib:
+	$(INSTALL) -D --mode=0644 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
+
+install_share:
+	$(INSTALL) -D --mode=0755 -d share/keyringer $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)
+	$(INSTALL) -D --mode=0755 share/keyringer/* $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)
+
+install_bin:
+	$(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
+
+install_doc:
+	$(INSTALL) -D --mode=0644 README $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)/README
+	$(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/doc/$(PACKAGE)/LICENSE
+
+install: clean
+	@make install_lib install_share install_bin install_doc
diff --git a/README b/README
index 0063a08..7d22529 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Keyringer lets you manage and share secrets using GPG and git in a distributed
 fashion. It has custom commands to encrypt, decrypt, recrypt, create key pairs,
 etc.
 
-Homepage: https://git.codecoop.org/projects/keyringer
+Homepage: https://keyringer.sarava.org
 
 Requirements
 ------------
@@ -15,9 +15,12 @@ Keyringer needs:
   - Bash - http://tiswww.case.edu/php/chet/bash/bashtop.html
   - Git - http://git-scm.com
   - GNU Privacy Guard - http://gnupg.org
-  - OpenSSL - http://www.openssl.org
   - Grep, awk, tail, cut, sed and other GNU tools
 
+Optional dependencies if you want to manage ssl keys:
+
+  - OpenSSL - http://www.openssl.org
+
 Installation
 ------------
 
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..cc5f42d
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,6 @@
+keyringer for Debian
+--------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Silvio Rhatto <rhatto@riseup.net>  Tue, 26 Jun 2012 16:33:57 -0300
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..da1fcdf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+keyringer for Debian
+--------------------
+
+<this file describes information about the source package, see Debian policy
+manual section 4.14. You WILL either need to modify or delete this file>
+
+
+
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6d55a57
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+keyringer (0.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+
+ -- Silvio Rhatto <rhatto@riseup.net>  Tue, 26 Jun 2012 16:33:57 -0300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..108adc9
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: keyringer
+Section: unknown
+Priority: extra
+Maintainer: Silvio Rhatto <rhatto@riseup.net>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: https://git.sarava.org/?p=keyringer.git;a=summary
+#Vcs-Git: git://git.debian.org/collab-maint/keyringer.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/keyringer.git;a=summary
+
+Package: keyringer
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, bash, git-core, gnupg, grep, gawk, coreutils, sed
+Recommends: openssl
+Description: Distributed secret management using GPG and git
+ Keyringer lets you manage and share secrets using GPG and git in a distributed
+ fashion. It has custom commands to encrypt, decrypt, recrypt, create key pairs,
+ etc.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..0c7a7af
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,39 @@
+This work was packaged for Debian by:
+
+    Silvio Rhatto <rhatto@riseup.net> on Tue, 26 Jun 2012 16:33:57 -0300
+
+It was downloaded from:
+
+    https://git.sarava.org/?p=keyringer.git;a=summary
+
+Upstream Author(s):
+
+    Silvio Rhatto <rhatto@riseup.net>
+    Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+    Jamie McClelland <jm@mayfirst.org>
+
+Copyright:
+
+    <Copyright (C) 2009-2012 Silvio Rhatto>
+    <Copyright (C) 2010 Daniel Kahn Gillmor>
+    <Copyright (C) 2012 Jamie McClelland>
+
+License:
+
+    GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007
+
+The Debian packaging is:
+
+    Copyright (C) 2012 Silvio Rhatto <rhatto@riseup.net>
+
+# Please chose a license for your packaging work. If the program you package
+# uses a mainstream license, using the same license is the safest choice.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+# If you just want it to be GPL version 3, leave the following lines in.
+
+and is licensed under the GPL version 3,
+see "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/emacsen-install.ex b/debian/emacsen-install.ex
new file mode 100644
index 0000000..a710d38
--- /dev/null
+++ b/debian/emacsen-install.ex
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/keyringer
+
+# Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
+
+FLAVOR=$1
+PACKAGE=keyringer
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+#FLAVORTEST=`echo $FLAVOR | cut -c-6`
+#if [ ${FLAVORTEST} = xemacs ] ; then
+#    SITEFLAG="-no-site-file"
+#else
+#    SITEFLAG="--no-site-file"
+#fi
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+# Install-info-altdir does not actually exist.
+# Maybe somebody will write it.
+if test -x /usr/sbin/install-info-altdir; then
+    echo install/${PACKAGE}: install Info links for ${FLAVOR}
+    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
+fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
diff --git a/debian/emacsen-remove.ex b/debian/emacsen-remove.ex
new file mode 100644
index 0000000..62b90e5
--- /dev/null
+++ b/debian/emacsen-remove.ex
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/keyringer
+
+FLAVOR=$1
+PACKAGE=keyringer
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/keyringer.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/debian/emacsen-startup.ex b/debian/emacsen-startup.ex
new file mode 100644
index 0000000..aa39fde
--- /dev/null
+++ b/debian/emacsen-startup.ex
@@ -0,0 +1,25 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50keyringer.el
+;; for the Debian keyringer package
+;;
+;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
+;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
+
+;; The keyringer package follows the Debian/GNU Linux 'emacsen' policy and
+;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
+;; xemacs19, emacs20, xemacs20...).  The compiled code is then
+;; installed in a subdirectory of the respective site-lisp directory.
+;; We have to add this to the load-path:
+(let ((package-dir (concat "/usr/share/"
+                           (symbol-name flavor)
+                           "/site-lisp/keyringer")))
+;; If package-dir does not exist, the keyringer package must have
+;; removed but not purged, and we should skip the setup.
+  (when (file-directory-p package-dir)
+    (setq load-path (cons package-dir load-path))
+    (autoload 'keyringer-mode "keyringer-mode"
+      "Major mode for editing keyringer files." t)
+    (add-to-list 'auto-mode-alist '("\\.keyringer$" . keyringer-mode))))
+
diff --git a/debian/init.d.ex b/debian/init.d.ex
new file mode 100644
index 0000000..34773e0
--- /dev/null
+++ b/debian/init.d.ex
@@ -0,0 +1,154 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          keyringer
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the sortware>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
+
+# Author: Silvio Rhatto <rhatto@riseup.net>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=keyringer             # Introduce a short description here
+NAME=keyringer             # Introduce the short server's name here
+DAEMON=/usr/sbin/keyringer # Introduce the server's location here
+DAEMON_ARGS=""             # Arguments to run the daemon with
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	[ "$?" = 2 ] && return 2
+	# Many daemons don't delete their pidfiles when they exit.
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+    do_start
+    case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+  ;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
diff --git a/debian/keyringer.cron.d.ex b/debian/keyringer.cron.d.ex
new file mode 100644
index 0000000..2bf1942
--- /dev/null
+++ b/debian/keyringer.cron.d.ex
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the keyringer package
+#
+0 4	* * *	root	[ -x /usr/bin/keyringer_maintenance ] && /usr/bin/keyringer_maintenance
diff --git a/debian/keyringer.default.ex b/debian/keyringer.default.ex
new file mode 100644
index 0000000..808251b
--- /dev/null
+++ b/debian/keyringer.default.ex
@@ -0,0 +1,10 @@
+# Defaults for keyringer initscript
+# sourced by /etc/init.d/keyringer
+# installed at /etc/default/keyringer by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
diff --git a/debian/keyringer.doc-base.EX b/debian/keyringer.doc-base.EX
new file mode 100644
index 0000000..0c3549b
--- /dev/null
+++ b/debian/keyringer.doc-base.EX
@@ -0,0 +1,20 @@
+Document: keyringer
+Title: Debian keyringer Manual
+Author: <insert document author here>
+Abstract: This manual describes what keyringer is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/keyringer/keyringer.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/keyringer/keyringer.ps.gz
+
+Format: text
+Files: /usr/share/doc/keyringer/keyringer.text.gz
+
+Format: HTML
+Index: /usr/share/doc/keyringer/html/index.html
+Files: /usr/share/doc/keyringer/html/*.html
diff --git a/debian/keyringer.substvars b/debian/keyringer.substvars
new file mode 100644
index 0000000..abd3ebe
--- /dev/null
+++ b/debian/keyringer.substvars
@@ -0,0 +1 @@
+misc:Depends=
diff --git a/debian/manpage.1.ex b/debian/manpage.1.ex
new file mode 100644
index 0000000..1a9bce1
--- /dev/null
+++ b/debian/manpage.1.ex
@@ -0,0 +1,59 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KEYRINGER SECTION "June 26, 2012"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+keyringer \- program to do something
+.SH SYNOPSIS
+.B keyringer
+.RI [ options ] " files" ...
+.br
+.B bar
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B keyringer
+and
+.B bar
+commands.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBkeyringer\fP is a program that...
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR bar (1),
+.BR baz (1).
+.br
+The programs are documented fully by
+.IR "The Rise and Fall of a Fooish Bar" ,
+available via the Info system.
+.SH AUTHOR
+keyringer was written by <upstream author>.
+.PP
+This manual page was written by Silvio Rhatto <rhatto@riseup.net>,
+for the Debian project (and may be used by others).
diff --git a/debian/manpage.sgml.ex b/debian/manpage.sgml.ex
new file mode 100644
index 0000000..9cf73ee
--- /dev/null
+++ b/debian/manpage.sgml.ex
@@ -0,0 +1,154 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
+  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>June 26, 2012</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
+  <!ENTITY dhemail     "<email>rhatto@riseup.net</email>">
+  <!ENTITY dhusername  "Silvio Rhatto">
+  <!ENTITY dhucpackage "<refentrytitle>KEYRINGER</refentrytitle>">
+  <!ENTITY dhpackage   "keyringer">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>-e <replaceable>this</replaceable></option></arg>
+
+      <arg><option>--example <replaceable>that</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the &gnu;
+      <application>Info</application> format; see below.</para>
+
+    <para><command>&dhpackage;</command> is a program that...</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual &gnu; command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <application>Info</application> files.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>
+          <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>bar (1), baz (1).</para>
+
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the
+      <application>Info</application> system.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (and may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+      later version published by the Free Software Foundation.
+    </para>
+    <para>
+      On Debian systems, the complete text of the GNU General Public
+      License can be found in /usr/share/common-licenses/GPL.
+    </para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
diff --git a/debian/manpage.xml.ex b/debian/manpage.xml.ex
new file mode 100644
index 0000000..81f3b8b
--- /dev/null
+++ b/debian/manpage.xml.ex
@@ -0,0 +1,291 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+
+<!--
+
+`xsltproc -''-nonet \
+          -''-param man.charmap.use.subset "0" \
+          -''-param make.year.ranges "1" \
+          -''-param make.single.year.ranges "1" \
+          /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
+          manpage.xml'
+
+A manual page <package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A typical entry
+in a Makefile or Makefile.am is:
+
+DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl
+XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
+
+manpage.1: manpage.xml
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The XSL files are in
+docbook-xsl. A description of the parameters you can use can be found in the
+docbook-xsl-doc-* packages. Please remember that if you create the nroff
+version in one of the debian/rules file targets (such as build), you will need
+to include xsltproc and docbook-xsl in your Build-Depends control field.
+Alternatively use the xmlto command/package. That will also automatically
+pull in xsltproc and docbook-xsl.
+
+Notes for using docbook2x: docbook2x-man does not automatically create the
+AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as
+<refsect1> ... </refsect1>.
+
+To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections
+read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be
+found in the docbook-xsl-doc-html package.
+
+Validation can be done using: `xmllint -''-noout -''-valid manpage.xml`
+
+General documentation about man-pages and man-page-formatting:
+man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "FIRSTNAME">
+  <!ENTITY dhsurname   "SURNAME">
+  <!-- dhusername could also be set to "&dhfirstname; &dhsurname;". -->
+  <!ENTITY dhusername  "Silvio Rhatto">
+  <!ENTITY dhemail     "rhatto@riseup.net">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1) and
+       http://www.tldp.org/HOWTO/Man-Page/q2.html. -->
+  <!ENTITY dhsection   "SECTION">
+  <!-- TITLE should be something like "User commands" or similar (see
+       http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
+  <!ENTITY dhtitle     "keyringer User Manual">
+  <!ENTITY dhucpackage "KEYRINGER">
+  <!ENTITY dhpackage   "keyringer">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2007</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    <legalnotice>
+      <para>This manual page was written for the Debian system
+        (and may be used by others).</para>
+      <para>Permission is granted to copy, distribute and/or modify this
+        document under the terms of the GNU General Public License,
+        Version 2 or (at your option) any later version published by
+        the Free Software Foundation.</para>
+      <para>On Debian systems, the complete text of the GNU General Public
+        License can be found in
+        <filename>/usr/share/common-licenses/GPL</filename>.</para>
+    </legalnotice>
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>&dhucpackage;</refentrytitle>
+    <manvolnum>&dhsection;</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <!-- These are several examples, how syntaxes could look -->
+      <arg choice="plain"><option>-e <replaceable>this</replaceable></option></arg>
+      <arg choice="opt"><option>--example=<parameter>that</parameter></option></arg>
+      <arg choice="opt">
+        <group choice="req">
+          <arg choice="plain"><option>-e</option></arg>
+          <arg choice="plain"><option>--example</option></arg>
+        </group>
+        <replaceable class="option">this</replaceable>
+      </arg>
+      <arg choice="opt">
+        <group choice="req">
+          <arg choice="plain"><option>-e</option></arg>
+          <arg choice="plain"><option>--example</option></arg>
+        </group>
+        <group choice="req">
+          <arg choice="plain"><replaceable>this</replaceable></arg>
+          <arg choice="plain"><replaceable>that</replaceable></arg>
+        </group>
+      </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <!-- Normally the help and version options make the programs stop
+           right after outputting the requested information. -->
+      <group choice="opt">
+        <arg choice="plain">
+          <group choice="req">
+            <arg choice="plain"><option>-h</option></arg>
+            <arg choice="plain"><option>--help</option></arg>
+          </group>
+        </arg>
+        <arg choice="plain">
+          <group choice="req">
+            <arg choice="plain"><option>-v</option></arg>
+            <arg choice="plain"><option>--version</option></arg>
+          </group>
+        </arg>
+      </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1 id="description">
+    <title>DESCRIPTION</title>
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+    <para>This manual page was written for the Debian distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the GNU <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> format; see below.</para>
+    <para><command>&dhpackage;</command> is a program that...</para>
+  </refsect1>
+  <refsect1 id="options">
+    <title>OPTIONS</title>
+    <para>The program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> files.</para>
+    <variablelist>
+      <!-- Use the variablelist.term.separator and the
+           variablelist.term.break.after parameters to
+           control the term elements. -->
+      <varlistentry>
+        <term><option>-e <replaceable>this</replaceable></option></term>
+        <term><option>--example=<replaceable>that</replaceable></option></term>
+        <listitem>
+          <para>Does this and that.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-h</option></term>
+        <term><option>--help</option></term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option></term>
+        <term><option>--version</option></term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="files">
+    <title>FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/foo.conf</filename></term>
+        <listitem>
+          <para>The system-wide configuration file to control the
+            behaviour of <application>&dhpackage;</application>. See
+            <citerefentry>
+              <refentrytitle>foo.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry> for further details.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><filename>${HOME}/.foo.conf</filename></term>
+        <listitem>
+          <para>The per-user configuration file to control the
+             behaviour of <application>&dhpackage;</application>. See
+             <citerefentry>
+               <refentrytitle>foo.conf</refentrytitle>
+               <manvolnum>5</manvolnum>
+             </citerefentry> for further details.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="environment">
+    <title>ENVIONMENT</title>
+    <variablelist>
+      <varlistentry>
+        <term><envar>FOO_CONF</envar></term>
+        <listitem>
+          <para>If used, the defined file is used as configuration
+            file (see also <xref linkend="files"/>).</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="diagnostics">
+    <title>DIAGNOSTICS</title>
+    <para>The following diagnostics may be issued
+      on <filename class="devicefile">stderr</filename>:</para>
+    <variablelist>
+      <varlistentry>
+        <term><errortext>Bad configuration file. Exiting.</errortext></term>
+        <listitem>
+          <para>The configuration file seems to contain a broken configuration
+            line. Use the <option>--verbose</option> option, to get more info.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para><command>&dhpackage;</command> provides some return codes, that can
+      be used in scripts:</para>
+    <segmentedlist>
+      <segtitle>Code</segtitle>
+      <segtitle>Diagnostic</segtitle>
+      <seglistitem>
+        <seg><errorcode>0</errorcode></seg>
+        <seg>Program exited successfully.</seg>
+      </seglistitem>
+      <seglistitem>
+        <seg><errorcode>1</errorcode></seg>
+        <seg>The configuration file seems to be broken.</seg>
+      </seglistitem>
+    </segmentedlist>
+  </refsect1>
+  <refsect1 id="bugs">
+    <!-- Or use this section to tell about upstream BTS. -->
+    <title>BUGS</title>
+    <para>The program is currently limited to only work
+      with the <package>foobar</package> library.</para>
+    <para>The upstreams <acronym>BTS</acronym> can be found
+      at <ulink url="http://bugzilla.foo.tld"/>.</para>
+  </refsect1>
+  <refsect1 id="see_also">
+    <title>SEE ALSO</title>
+    <!-- In alpabetical order. -->
+    <para><citerefentry>
+        <refentrytitle>bar</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>, <citerefentry>
+        <refentrytitle>baz</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>, <citerefentry>
+        <refentrytitle>foo.conf</refentrytitle>
+        <manvolnum>5</manvolnum>
+      </citerefentry></para>
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> system.</para>
+  </refsect1>
+</refentry>
+
diff --git a/debian/menu.ex b/debian/menu.ex
new file mode 100644
index 0000000..30b4aa5
--- /dev/null
+++ b/debian/menu.ex
@@ -0,0 +1,2 @@
+?package(keyringer):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+  title="keyringer" command="/usr/bin/keyringer"
diff --git a/debian/postinst.ex b/debian/postinst.ex
new file mode 100644
index 0000000..4c62489
--- /dev/null
+++ b/debian/postinst.ex
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for keyringer
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/postrm.ex b/debian/postrm.ex
new file mode 100644
index 0000000..65dec06
--- /dev/null
+++ b/debian/postrm.ex
@@ -0,0 +1,37 @@
+#!/bin/sh
+# postrm script for keyringer
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/preinst.ex b/debian/preinst.ex
new file mode 100644
index 0000000..6421ff8
--- /dev/null
+++ b/debian/preinst.ex
@@ -0,0 +1,35 @@
+#!/bin/sh
+# preinst script for keyringer
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/prerm.ex b/debian/prerm.ex
new file mode 100644
index 0000000..3ed5387
--- /dev/null
+++ b/debian/prerm.ex
@@ -0,0 +1,38 @@
+#!/bin/sh
+# prerm script for keyringer
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b760bee
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch.ex b/debian/watch.ex
new file mode 100644
index 0000000..48c8026
--- /dev/null
+++ b/debian/watch.ex
@@ -0,0 +1,23 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php keyringer-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/keyringer-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/keyringer-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/keyringer/keyringer-(.*)\.tar\.gz
+
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html keyringer-(.*)\.tar\.gz
diff --git a/keyringer b/keyringer
index 8904685..a59fd2f 100755
--- a/keyringer
+++ b/keyringer
@@ -24,6 +24,10 @@ function keyringer_init {
   RECIPIENTS="$BASEDIR/config/recipients"
   OPTIONS="$BASEDIR/config/options"
 
+  # We are initializing, so avoid some checks
+  export KEYRINGER_CHECK_VERSION="false"
+  export KEYRINGER_CHECK_RECIPIENTS="false"
+
   # Parse
   if [ -z "$BASEDIR" ]; then
     echo "Usage: $BASENAME <keyring> init <path> [url]"
@@ -68,7 +72,7 @@ function keyringer_init {
     fi
 
     # Secure
-    chmod 600 "$RECIPIENTS"
+    chmod 700 "$RECIPIENTS"
   fi
 
   # Reparse basedir to force absolute folder
@@ -129,17 +133,35 @@ function keyringer_preferences {
 
 # Config
 NAME="keyringer"
+KEYRINGER_VERSION="0.1"
 CONFIG="$HOME/.$NAME/config"
 BASENAME="`basename $0`"
 KEYRING="$1"
 ACTION="$2"
-ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
 
-# Export preferences for other scripts
+# Export preferences and version for other scripts
 export PREFERENCES="`dirname $CONFIG`/$KEYRING"
+export KEYRINGER_VERSION
+
+# Set functions location
+if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/functions" ]; then
+  # Development or local installation layout
+  LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"
+else
+  # System installation layout
+  LIB="`dirname $(readlink -f $0)`/../lib/$NAME/functions"
+fi
+
+# Set actions location
+if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then
+  # Development or local installation layout
+  ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
+else
+  # System installation layout
+  ACTIONS="`dirname $(readlink -f $0)`/../share/$NAME"
+fi
 
 # Load functions
-LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"
 source "$LIB" || exit 1
 
 # Setup main configuration and load preferences
diff --git a/lib/keyringer/csr.sh b/lib/keyringer/csr.sh
deleted file mode 100755
index 881a46f..0000000
--- a/lib/keyringer/csr.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-# csr.sh: Certificate Signing Request Generator
-# Copyright(c) 2005 Evaldo Gardenali <evaldo@gardenali.biz>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ChangeLog:
-# Mon May 23 00:14:37 BRT  2005 - evaldo - Initial Release
-# Thu Nov  3 10:11:51 GMT  2005 - chrisc - $HOME removed so that key and csr
-#                                          are generated in the current directory
-# Wed Nov 16 10:42:42 GMT  2005 - chrisc - Updated to match latest version on
-#                                          the CAcert wiki, rev #73
-#                                          http://wiki.cacert.org/wiki/VhostTaskForce 
-# Mon Jan  4 18:37:28 BRST 2010 - rhatto - Support for non-interactive mode
-
-
-# be safe about permissions
-LASTUMASK=`umask`
-umask 077
-
-# OpenSSL for HPUX needs a random file
-RANDOMFILE="$HOME/.rnd"
-
-# create a config file for openssl
-CONFIG=`mktemp -q /tmp/openssl-conf.XXXXXXXX`
-if [ ! $? -eq 0 ]; then
-    echo "Could not create temporary config file. exiting"
-    exit 1
-fi
-
-echo "Private Key and Certificate Signing Request Generator"
-echo "This script was designed to suit the request format needed by"
-echo "the CAcert Certificate Authority. www.CAcert.org"
-echo
-
-HOST="$1"
-COMMONNAME="$2"
-SAN="$3"
-
-if [ -z "$HOST" ]; then
-  printf "Short Hostname (ie. imap big_srv www2): "
-  read HOST
-fi
-
-if [ -z "$COMMONNAME" ]; then
-  printf "FQDN/CommonName (ie. www.example.com) : "
-  read COMMONNAME
-fi
-
-if [ -z "$SAN" ]; then
-  echo "Type SubjectAltNames for the certificate, one per line. Enter a blank line to finish"
-  SAN=1        # bogus value to begin the loop
-  SANAMES=""   # sanitize
-  while [ ! "$SAN" = "" ]; do
-    printf "SubjectAltName: DNS:"
-    read SAN
-    if [ "$SAN" = "" ]; then break; fi # end of input
-      if [ "$SANAMES" = "" ]; then
-        SANAMES="DNS:$SAN"
-      else
-        SANAMES="$SANAMES,DNS:$SAN"
-      fi
-    done
-else
-  SANAMES="DNS:$SAN"
-fi
-
-# Config File Generation
-
-cat <<EOF > "$CONFIG"
-# -------------- BEGIN custom openssl.cnf -----
- HOME                    = $HOME
-EOF
-
-if [ "`uname -s`" = "HP-UX" ]; then
-    echo " RANDFILE                = $RANDOMFILE" >> "$CONFIG"
-fi
-
-cat <<EOF >> "$CONFIG"
- oid_section             = new_oids
- [ new_oids ]
- [ req ]
- default_days            = 730            # how long to certify for
- default_keyfile         = ${HOST}_privatekey.pem
- distinguished_name      = req_distinguished_name
- encrypt_key             = no
- string_mask = nombstr
-EOF
-
-if [ ! "$SANAMES" = "" ]; then
-    echo "req_extensions = v3_req # Extensions to add to certificate request" >> "$CONFIG"
-fi
-
-cat <<EOF >> "$CONFIG"
- [ req_distinguished_name ]
- commonName              = Common Name (eg, YOUR name)
- commonName_default      = $COMMONNAME
- commonName_max          = 64
- [ v3_req ]
-EOF
-
-if [ ! "$SANAMES" = "" ]; then
-    echo "subjectAltName=$SANAMES" >> "$CONFIG"
-fi
-
-echo "# -------------- END custom openssl.cnf -----" >> "$CONFIG"
-
-echo "Running OpenSSL..."
-# The first one doesn't work, the second one does:
-#openssl req -batch -config "$CONFIG" -newkey rsa -out ${HOST}_csr.pem
-openssl req -batch -config "$CONFIG" -newkey rsa:2048 -out "${HOST}_csr.pem"
-
-echo "Copy the following Certificate Request and paste into CAcert website to obtain a Certificate."
-echo "When you receive your certificate, you 'should' name it something like ${HOST}_server.pem"
-echo
-cat ${HOST}_csr.pem
-echo
-printf "The Certificate request is also available in '%s_csr.pem'\n" "$HOST"
-printf "The Private Key is stored in '%s_privatekey.pem'\n" "$HOST"
-echo
-
-rm "$CONFIG"
-
-#restore umask
-umask "$LASTUMASK"
-
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index a1c95a8..dc1ce0f 100644
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -225,15 +225,45 @@ function keyringer_set_env {
 
 # Configuration version tracking to help keyring upgrades
 function keyringer_check_version {
+  if [ "$KEYRINGER_CHECK_VERSION" == "false" ]; then
+    return
+  fi
+
   if [ ! -f "$VERSION_INFO" ]; then
-    echo "Creating configuration version file..."
-    echo 0 > "$VERSION_INFO"
-    if keyringer_is_git "$BASEDIR"; then
-      keyringer_exec git "$BASEDIR" add config/version
+    echo "Configuration version file not found, trying to pull from remotes..."
+    # Do not use keyringer_exec as it would trigger keyringer_check_version again
+    ( cd "$BASEDIR" && git pull )
+
+    if [ ! -f "$VERSION_INFO" ]; then
+      echo "Creating configuration version file..."
+      echo 0 > "$VERSION_INFO"
+      if keyringer_is_git "$BASEDIR"; then
+        keyringer_exec git "$BASEDIR" add config/version
+        echo "Pushing configuration version file to remotes..."
+        for remote in "$BASEDIR/.git/refs/remotes/*"; do
+          keyringer_exec git "$BASEDIR" push $remote master
+        done
+      fi
     fi
   fi
 
   VERSION="`cat $VERSION_INFO`"
+
+  # Check if config version is supported by keyringer
+  if [ "$VERSION" != "$KEYRINGER_VERSION" ]; then
+    echo "Configuration version differs from keyringer version, trying to pull from remotes"
+    # Do not use keyringer_exec as it would trigger keyringer_check_version again
+    ( cd "$BASEDIR" && git pull )
+
+    if [ "$VERSION" != "$KEYRINGER_VERSION" ]; then
+      NEWEST="`echo -e "$VERSION\n$KEYRINGER_VERSION" | sort -V | tail -n 1`"
+      if [ "$NEWEST" == "$VERSION" ]; then
+        echo "Fatal: keyringer version: $KEYRINGER_VERSION / config version: $VERSION"
+        echo "Please upgrade your keyringer application"
+        exit 1
+      fi
+    fi
+  fi
 }
 
 # Configuration upgrades
@@ -248,7 +278,10 @@ function keyringer_upgrade {
       keyringer_exec git "$BASEDIR" add $RECIPIENTS_BASE/default
       keyringer_exec git "$BASEDIR" add config/version
       keyringer_exec git "$BASEDIR" commit -m "Config-upgrade-0.1"
-      echo "Upgrade to version 0.1 completed"
+      echo "Upgrade to version 0.1 completed, pushing to remotes..."
+      for remote in "$BASEDIR/.git/refs/remotes/*"; do
+        keyringer_exec git "$BASEDIR" push $remote master
+      done
     fi
 
     # Update version information
@@ -307,6 +340,10 @@ function keyringer_action_usage {
 
 # Check recipients
 function keyringer_check_recipients {
+  if [ "$KEYRINGER_CHECK_RECIPIENTS" == "false" ]; then
+    return
+  fi
+
   # Check if recipients file is empty.
   if [ "`grep -vE "^#|^$" "$RECIPIENTS"/* | wc -l`" == 0 ] && [ "$SUBCOMMAND" != "edit" ]; then
     echo "Fatal: no recipients configured for this keyring."
@@ -359,6 +396,7 @@ function keyringer_set_recipients {
     keyringer_set_default_recipients
   else
     candidate="$1"
+    candidate_no_extension="`echo $1 | sed -e 's/.asc$//'`"
 
     # Find the first matching recipient
     while [ ! -z "$candidate" ] && [ "$candidate" != "." ] && [ "$candidate" != "/" ]; do
@@ -366,6 +404,10 @@ function keyringer_set_recipients {
         RECIPIENTS_FILE="$RECIPIENTS/$candidate"
         RECIPIENTS_FILE_BASE="$RECIPIENTS_BASE/$candidate"
         return
+      elif [ -e "$RECIPIENTS/$candidate_no_extension" ]; then
+        RECIPIENTS_FILE="$RECIPIENTS/$candidate_no_extension"
+        RECIPIENTS_FILE_BASE="$RECIPIENTS_BASE/$candidate_no_extension"
+        return
       fi
 
       candidate="`dirname $candidate`"
diff --git a/misc/keyringer.png b/misc/keyringer.png
new file mode 100644
index 0000000..4076ef8
--- /dev/null
+++ b/misc/keyringer.png
diff --git a/misc/keyringer.svg b/misc/keyringer.svg
new file mode 100644
index 0000000..f200621
--- /dev/null
+++ b/misc/keyringer.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1052.3622"
+   height="1488.189"
+   id="svg2866"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="keyringer.svg">
+  <defs
+     id="defs2868">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2874" />
+    <inkscape:perspective
+       id="perspective2861"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="524.39219"
+     inkscape:cy="1176.4003"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1022"
+     inkscape:window-height="747"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2871">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,435.82683)">
+    <path
+       d="m 188.84106,-179.20584 c 0.009,-0.14357 -0.33849,-1.06645 -0.77117,-2.05087 -1.80869,-4.115 -3.29192,-8.34301 -6.25278,-17.82385 -3.07731,-9.85368 -4.69513,-14.35703 -6.81936,-18.98228 -1.16901,-2.54536 -2.5039,-5.06625 -2.82296,-5.33105 -0.19069,-0.15825 -0.41907,-0.13724 -1.29936,0.11955 -0.5874,0.17135 -1.11818,0.28055 -1.17949,0.24265 -0.26802,-0.16564 -1.03292,-1.72034 -1.24275,-2.52593 -0.43414,-1.66675 -0.17327,-3.626 0.81354,-6.11016 0.25428,-0.64008 0.44245,-1.2637 0.41817,-1.38581 -0.0369,-0.18548 -0.48596,-0.22656 -2.72891,-0.24962 -2.96376,-0.0305 -4.00857,-0.19752 -6.58343,-1.0526 -4.5592,-1.51407 -8.8025,-4.59053 -13.06289,-9.4708 -0.72137,-0.82633 -0.88609,-0.94563 -1.11535,-0.80788 -0.14795,0.0889 -1.13763,1.22991 -2.1993,2.53561 -3.83896,4.72131 -6.63453,7.14366 -9.47994,8.21432 -0.69729,0.26237 -1.33033,0.57586 -1.40675,0.69663 -0.0881,0.13917 -0.0725,0.5165 0.0425,1.03035 0.16928,0.7564 0.67474,1.7383 2.01511,3.91452 0.97445,1.58211 1.0637,2.66979 0.3404,4.14816 -0.41759,0.85352 -1.93947,2.6413 -2.24846,2.6413 -0.10345,0 -1.09144,-1.26687 -2.06102,0.15398 -0.94179,1.07661 -1.76669,2.71812 -3.01338,5.99641 -0.601,1.58037 -1.26848,3.26871 -1.48327,3.75185 -0.45656,1.02691 -0.38272,1.20946 0.55223,1.36502 1.51302,0.25176 2.59515,0.89057 3.06813,1.81118 0.31043,0.60422 0.1849,1.89862 -0.36846,3.79959 -0.29469,1.01241 -0.57088,2.17684 -0.61373,2.58761 -0.18124,1.73712 0.98001,2.78122 3.38574,3.04421 0.71474,0.0781 0.81488,0.12837 0.77072,0.38668 -0.0585,0.34243 -2.68679,11.50485 -2.79851,11.88554 -0.21321,0.72651 -2.86749,0.42343 -6.84571,-0.78169 -3.18634,-0.96521 -4.77269,-1.12124 -6.00596,-0.5907 -1.32638,0.57058 -2.23919,1.87083 -2.85705,4.06967 -0.24715,0.87954 -0.28642,0.93022 -0.75634,0.9762 -0.68172,0.0667 -2.33381,-0.2361 -3.07696,-0.56396 -1.1881,-0.52415 -2.29363,-1.77248 -2.29363,-2.58986 0,-0.19843 2.45665,-7.60165 5.45923,-16.45159 3.00258,-8.84992 5.93904,-17.52155 6.52547,-19.27028 l 1.06624,-3.17948 c 0,0 -1.31384,-1.24532 -1.40336,-1.4245 -0.30205,-0.60459 -0.18118,-1.70272 0.30891,-2.80644 0.25498,-0.57424 0.64175,-1.54746 0.85949,-2.16272 0.37591,-1.06221 0.43697,-1.14234 1.21033,-1.58838 1.11164,-0.64111 1.93312,-1.37071 1.93312,-1.7169 0,-0.15819 -0.42128,-0.80518 -0.93617,-1.43776 -3.88507,-4.77306 -5.37189,-10.36856 -4.12893,-15.53886 0.16723,-0.69566 1.03796,-2.61372 1.03796,-2.73178 0,-0.11806 -1.05101,-1.68341 -2.33558,-3.47855 -6.12853,-8.56438 -8.72506,-13.36329 -10.19653,-18.84519 -0.23199,-0.86425 -0.4348,-1.50424 -0.45068,-1.42221 -0.23171,1.19686 -0.41268,-10.21077 -0.19502,-12.29331 0.061,-0.58353 1.05261,-5.49941 4.0695,-9.25938 3.12242,-5.25952 3.88259,-7.61654 3.68891,-11.43799 l -0.0947,-1.86806 1.37736,-1.37383 c 3.72911,-3.71955 8.2862,-5.64231 14.72662,-6.21356 2.60805,-0.23133 8.24742,-0.10246 13.37045,0.30555 2.14458,0.1708 5.63477,0.39961 7.75599,0.50846 3.68179,0.18894 3.92107,0.2196 5.27374,0.67567 2.40143,0.80968 4.61421,2.10739 8.79071,5.15537 2.54459,1.85703 4.13106,2.91272 4.37718,2.91272 0.11276,0 0.73664,-0.30332 1.38641,-0.67404 2.04306,-1.16566 4.38625,-1.93581 7.07297,-2.32469 1.75828,-0.25451 6.59937,-0.21461 9.54584,0.0787 1.35357,0.13474 3.62064,0.34693 5.03794,0.47155 l 2.57693,0.22657 1.22649,1.27958 c 2.9838,3.11292 5.99675,4.84032 8.46045,4.85057 1.95924,0.008 3.5254,-0.83228 3.95364,-2.12159 0.58616,-1.76477 1.36642,-2.17969 4.77184,-2.53758 l 3.35615,-0.74381 1.15584,0.58016 c 3.39489,1.704 7.88286,2.42054 13.17475,2.10346 3.18026,-0.19056 17.4091,-2.32677 18.55758,-2.45797 2.1822,-0.24928 37.71283,-3.35277 37.76683,-3.29881 0.017,0.017 0.59874,4.93558 0.66564,4.83022 0.0655,-0.10324 0.11917,1.02043 0.11917,2.49705 0,1.54628 -0.28742,2.49558 -0.35521,2.94764 -0.11641,0.7763 -0.92115,2.52276 -1.4596,3.16766 -0.65377,0.78301 -0.71625,1.03264 -0.71602,2.8614 2.2e-4,1.9923 0.17377,3.12487 1.04131,6.79545 0.33457,1.41555 0.64355,2.7346 0.68664,2.9312 0.0628,0.28679 -0.0737,0.50018 -0.69047,1.07926 -1.57548,1.47915 -3.64567,2.14277 -7.42972,2.38168 -1.34171,0.0847 -2.52494,0.12123 -2.62941,0.0811 -0.14229,-0.0546 -0.17091,-0.40677 -0.11409,-1.40362 0.12683,-2.22439 -0.37357,-4.18993 -1.36517,-5.3623 -0.22327,-0.26397 -0.83344,-0.6904 -1.35594,-0.94762 -0.84312,-0.41508 -1.03762,-0.45564 -1.72884,-0.36057 -1.56375,0.21507 -2.5564,0.91007 -3.13817,2.19721 -0.34036,0.75298 -0.35344,0.90939 -0.32929,3.93623 l 0.0251,3.15208 -1.51667,-0.0115 c -0.83418,-0.006 -2.33255,0.0779 -3.32973,0.1872 -2.03231,0.22276 -4.5202,0.14999 -5.19717,-0.15201 -0.92054,-0.41066 -1.73435,-1.07301 -2.23891,-1.82222 -0.49844,-0.74016 -0.52049,-0.82958 -0.52171,-2.11717 -0.003,-2.99746 -0.4392,-6.05031 -1.08758,-7.60882 -0.44949,-1.08045 -1.4439,-2.61875 -1.7711,-2.73978 -0.15483,-0.0573 -1.80641,0.0466 -3.67014,0.23089 -4.44655,0.43964 -12.9506,1.14029 -19.64636,1.61867 -3.52157,0.25159 -5.42729,0.44513 -5.53737,0.56234 -0.0923,0.0983 -0.30992,0.65725 -0.48358,1.24211 -0.80761,2.71992 -2.6555,4.00028 -6.31822,4.37771 -1.97714,0.20374 -5.30929,0.0519 -5.66545,-0.25813 -0.14043,-0.12226 -0.49967,-0.81174 -0.79829,-1.53219 -0.64802,-1.56341 -1.24538,-2.22047 -2.12612,-2.3386 -0.33311,-0.0447 -0.76071,-0.0412 -0.95024,0.008 -0.68605,0.1773 -1.5336,2.20396 -3.00639,7.18885 -1.09313,3.69986 -1.61707,5.11024 -2.5597,6.89024 -1.16794,2.2055 -2.4539,3.6378 -4.39146,4.8912 -0.5704,0.36899 -1.07401,0.73063 -1.11915,0.80366 -0.0451,0.073 0.15807,0.69273 0.45156,1.37712 1.77745,4.14471 2.6447,7.66213 3.44739,13.98198 0.0758,0.59698 0.20503,0.99889 0.34496,1.07303 0.12305,0.0652 0.81052,0.29781 1.52771,0.51693 1.77373,0.54192 4.11835,1.7498 7.49608,3.86176 5.15411,3.22265 7.7227,4.37412 10.55548,4.73191 1.1026,0.13926 1.72605,0.14051 2.73536,0.005 0.71899,-0.0962 1.33298,-0.14918 1.36442,-0.11774 0.0314,0.0314 0.25458,1.32215 0.49587,2.86825 0.24128,1.5461 0.49674,2.94533 0.56768,3.1094 l 46.96886,27.24869 c 0,0 1.43241,3.83288 0.40041,8.399 -0.34346,1.2658 -1.40768,3.44491 -2.11761,4.33604 -0.3314,0.41599 -1.29204,1.96383 -1.50313,2.18943 -0.57446,0.614 -1.12421,0.5428 -2.87888,-0.37289 -1.46058,-0.7622 -1.53366,-0.78305 -2.74523,-0.78305 -1.02784,0 -1.31809,0.0542 -1.66583,0.31116 -0.2316,0.17114 -4.87211,6.72642 -5.50021,7.13797 -0.35241,0.2309 -0.39188,0.21797 -1.14033,-0.37365 -1.0485,-0.82879 -2.10326,-1.34107 -5.24119,-2.54556 -3.1875,-1.22353 -4.21964,-1.75471 -5.2637,-2.70892 -1.1676,-1.06714 -1.58598,-2.03095 -1.68829,-3.88939 l -0.0824,-1.49762 -1.49154,-0.92661 c -1.74411,-1.08351 -2.99443,-2.32728 -3.14469,-3.12822 -0.13436,-0.71619 0.16138,-1.64734 0.67666,-2.13054 0.618,-0.57949 0.75277,-0.93971 0.75277,-2.01223 0,-1.34206 -0.14262,-1.64092 -0.8899,-1.86481 -0.83923,-0.25144 -1.71968,-1.08164 -2.04718,-1.93032 -0.36571,-0.94771 -0.32834,-2.9921 0.083,-4.54194 0.33085,-1.24657 0.30476,-1.53808 -0.15054,-1.68259 -0.16077,-0.051 -1.41305,-0.84762 -2.78287,-1.77021 -1.36979,-0.9226 -3.56371,-2.40068 -4.87535,-3.28462 -4.14612,-2.79414 -6.97209,-3.96182 -9.69663,-4.00656 -1.60317,-0.0263 -2.54066,0.18593 -4.30177,0.97399 -1.96571,0.87961 -2.43411,0.6948 -3.59966,-1.42026 -0.30696,-0.55702 -0.8193,-1.22266 -1.13855,-1.47921 -0.31923,-0.25655 -1.69616,-3.16698 -2.54246,-4.07166 -1.67608,-1.79174 -3.31481,-2.67987 -8.5533,-4.63552 -1.72272,-0.64314 -3.76384,-1.49069 -4.5358,-1.88344 -0.77198,-0.39276 -1.45962,-0.71411 -1.52808,-0.71411 -0.0685,0 -0.54432,0.3403 -1.05745,0.75623 -1.30645,1.05897 -2.88812,1.77861 -6.03937,2.74783 -1.49597,0.46012 -3.18985,1.03035 -3.76419,1.26718 -2.5416,1.04808 -4.06979,2.61076 -4.69936,4.80541 -0.36969,1.28872 -0.0889,1.6113 2.36352,2.71582 2.4565,1.10632 2.86075,1.48875 3.08793,2.92118 0.081,0.51078 0.0231,0.93856 -0.24211,1.78984 -0.55651,1.78609 -0.71531,3.02897 -0.60919,4.76794 0.15451,2.53197 0.53919,4.02317 2.42534,9.40165 0.61851,1.76374 1.30371,3.878 1.52263,4.69834 l 0.39808,1.49153 0.89492,0.44746 c 0.85771,0.42887 0.97555,0.44738 2.83392,0.44518 1.84343,-0.002 2.01744,-0.0294 3.53069,-0.55127 0.87543,-0.30193 1.99776,-0.75395 2.49407,-1.00449 0.49631,-0.25055 1.03404,-0.45553 1.19494,-0.45553 0.64215,0 1.5279,1.4611 3.23525,5.33669 0.99655,2.26213 2.01377,3.94374 2.77105,4.58094 1.63627,1.37683 3.46148,1.44494 5.85943,0.21861 0.63497,-0.32472 1.20745,-0.59041 1.27221,-0.59041 0.18558,0 1.27495,2.21168 1.61627,3.28138 0.46242,1.44928 0.62285,2.56522 0.62285,4.33248 l 0,1.59293 -0.86849,0.38975 c -1.05409,0.47306 -2.93784,0.98081 -5.91799,1.59514 -4.88064,1.00611 -6.93928,2.09611 -8.09291,4.28494 -0.58385,1.10776 -0.78173,2.09488 -0.78173,3.89956 l 0,1.46306 c 0,0 -2.26341,1.30513 -2.38646,1.38464 -0.1294,0.0836 -1.83912,0.14556 -4.05517,0.14687 -3.55627,0.002 -3.83031,-0.0165 -3.8159,-0.25873 z m 5,-1.52938 c 1.41056,-0.49577 1.45467,-0.58385 1.24525,-2.48636 -0.3879,-3.52423 -0.94791,-6.26449 -2.0522,-10.04199 -1.35986,-4.65171 -3.1536,-9.0511 -7.5105,-18.42046 -1.41146,-3.03528 -3.16202,-6.92818 -3.89014,-8.65091 -1.57926,-3.73649 -1.80429,-4.19805 -1.99943,-4.10119 -0.21642,0.10743 -0.12086,0.72734 0.44827,2.90796 0.76075,2.91485 2.08632,6.68906 4.40918,12.55406 2.39117,6.03743 3.33343,8.57073 4.07904,10.96642 1.11956,3.59731 2.02787,8.07505 2.02517,9.98365 l -1.02507,-1.73442 c -1.00934,-2.49945 -2.1787,-5.21335 -5.91259,-13.72212 -3.27331,-7.45921 -5.23264,-12.59421 -6.5733,-17.22724 -0.39168,-1.35358 -0.77519,-2.54494 -0.85224,-2.64748 -0.16645,-0.22151 -0.79337,-0.24852 -0.92241,-0.0397 -0.19627,0.31757 1.40057,5.16727 4.81369,14.61951 3.02103,8.36641 3.92546,11.18442 5.01668,15.63103 0.45302,1.84601 0.59493,2.21626 1.05592,2.75481 0.76332,0.89175 1.15319,1.79136 2.01889,4.65839 0.77148,2.55507 1.39257,3.97112 1.98527,4.5263 0.88152,0.82576 2.15877,0.99059 3.64052,0.46979 z m -79.49461,-5.48084 c 0.77203,-0.67519 4.40015,-10.11683 8.23899,-21.44083 1.16801,-3.44544 2.72499,-7.90886 3.45997,-9.9187 1.58777,-4.34185 1.60351,-4.39069 1.47897,-4.59219 -0.21462,-0.34727 -1.45519,-1.22201 -1.735,-1.22336 -0.81389,-0.004 -5.25534,8.34029 -7.58108,14.24272 -2.42323,6.14987 -3.99977,11.18549 -5.87783,18.77426 -1.15558,4.6695 -1.19206,4.41912 0.6439,4.41912 0.80937,0 1.14708,-0.0642 1.37208,-0.26102 z m 14.94768,-4.32891 c 1.33882,-1.38688 1.97193,-2.54729 2.06091,-3.77739 0.10979,-1.51788 -0.42239,-2.26773 -3.32357,-4.68299 -1.89825,-1.5803 -2.68831,-2.60642 -2.90914,-3.77829 -0.28258,-1.49962 -0.40119,-1.44996 -1.27454,0.53357 -2.14458,4.87069 -3.12555,7.8836 -3.3011,10.13879 -0.0853,1.09618 -0.0668,1.23785 0.17354,1.33011 0.26214,0.10059 6.78725,1.34442 7.23151,1.37849 0.12274,0.009 0.72682,-0.50462 1.34239,-1.14229 z m 74.14657,-0.0179 c 0.52405,-0.23734 2.04657,-0.71714 3.38336,-1.06621 4.0086,-1.04676 5.37707,-1.94747 5.51668,-3.63095 0.0704,-0.84854 -0.26409,-2.16724 -0.62582,-2.46744 -0.14135,-0.11733 -0.37258,-0.0986 -0.84607,0.0684 -4.61283,1.62749 -8.25735,-1.13786 -10.79629,-8.19188 -0.60158,-1.67139 -0.74454,-1.77205 -2.39093,-1.68354 -1.40383,0.0755 -2.38116,0.47229 -3.0559,1.24076 -0.6219,0.7083 -0.64685,1.32341 -0.0839,2.06736 0.94031,1.24258 1.60079,3.03681 2.33351,6.33902 0.86734,3.90893 1.45537,5.37175 2.61067,6.49458 0.67266,0.65376 1.89277,1.23929 2.6123,1.25363 0.21424,0.004 0.81832,-0.18642 1.34238,-0.42377 z m 54.28047,-8.06919 c 0.75222,-0.20898 1.52513,-1.08391 2.1749,-2.46205 1.21464,-2.57622 3.368,-3.76364 7.74879,-4.27287 1.58524,-0.18427 2.09018,-0.36164 1.88872,-0.66347 -0.13958,-0.20913 -27.35634,-14.79073 -27.72488,-14.85384 -0.60464,-0.10354 -0.2021,0.5115 1.63059,2.49133 l 1.90651,2.05959 -0.92044,0.90772 c -2.0337,2.00563 -2.36109,3.44781 -1.09963,4.84408 0.27998,0.30992 1.47596,1.21041 2.65772,2.00107 3.19706,2.13903 3.75315,2.89535 3.71347,5.05058 l -0.0238,1.29303 0.66419,0.22632 c 0.36531,0.12447 1.59107,0.82985 2.72391,1.5675 1.89561,1.23432 2.75141,1.68408 3.53608,1.85831 0.49062,0.10894 0.5741,0.10543 1.12387,-0.0473 z m 14.30955,-10.26548 c -0.002,-0.13797 -0.42167,-0.55069 -0.9322,-0.91714 -13.23959,-9.50335 -25.53176,-16.99662 -40.08107,-24.4333 -5.54574,-2.83464 -8.04209,-3.98265 -8.23682,-3.78791 -0.11514,0.11512 -0.003,0.3009 0.39466,0.65279 1.71854,1.52148 9.48357,6.83501 14.92696,10.21438 4.26452,2.6475 7.49089,4.54069 18.6442,10.94017 5.25021,3.01243 10.55262,6.08354 11.78313,6.82469 1.23052,0.74116 2.32762,1.35353 2.43801,1.36083 0.11039,0.007 0.71724,-0.21928 1.06313,-0.85451 z m -0.3631,-4.36199 c 0.11612,-0.18787 -0.54904,-0.82377 -3.06346,-2.92871 -6.82254,-5.71148 -15.81918,-11.49062 -26.44258,-16.98582 -5.82631,-3.01381 -15.46077,-7.58566 -16.36787,-7.76708 -0.58447,-0.1169 -0.4853,0.1935 0.20502,0.6417 1.25886,0.81732 45.61499,27.12711 45.66889,27.03991 z m -138.34775,-13.41814 c -0.0831,-0.15532 -0.45541,-0.41699 -0.82728,-0.58149 -0.41684,-0.18439 -1.31701,-0.91769 -2.34718,-1.91207 -0.91909,-0.88715 -1.93952,-1.7453 -2.26766,-1.90702 -0.7971,-0.39286 -2.90444,-0.41178 -3.60547,-0.0324 -0.89591,0.48487 -1.41106,2.79211 -0.86092,3.85595 0.33181,0.64164 1.42961,1.27881 2.65953,1.54358 0.58359,0.12564 2.29678,0.32913 3.80709,0.45221 1.51029,0.12308 2.77996,0.25775 2.82149,0.29927 0.16547,0.16547 1.06441,-0.65684 0.6204,-1.71805 z m 40.49312,0.36168 c 4.4041,-0.76198 6.55872,-1.79588 7.88666,-3.78441 0.61243,-0.91708 -0.0649,-1.28511 -2.12646,-1.15535 -1.49512,0.0941 -2.10171,0.29271 -5.4814,1.79462 -1.38162,0.614 -2.79617,1.19253 -3.14341,1.28563 -0.99894,0.26783 -1.17878,0.96145 -0.47971,1.85018 0.38975,0.49548 0.53217,0.49588 3.34432,0.009 z m 0.93578,-6.277 c 0.71343,-0.33854 2.42424,-1.95075 2.42424,-2.28452 0,-0.34572 -0.85231,-0.7457 -1.58867,-0.74555 -0.80847,1.7e-4 -2.17864,0.69996 -3.40798,1.74059 -1.49033,1.26156 -1.43463,1.68267 0.24066,1.81935 0.13236,0.0108 2.0365,-0.38977 2.33175,-0.52987 z m 42.52663,-3.77476 c 1.89222,-1.22301 3.60878,-3.34491 4.88443,-6.03782 0.74795,-1.57893 1.39994,-3.91683 1.39994,-5.01985 0,-0.70038 -0.0155,-0.72664 -0.42743,-0.72664 -0.23507,0 -0.9067,0.23977 -1.49248,0.53284 -2.90447,1.45304 -5.25039,5.33202 -5.84322,9.66175 -0.19631,1.43376 -0.0969,2.18514 0.2891,2.18514 0.14763,0 0.68297,-0.26794 1.18966,-0.59542 z m -83.72981,-0.21743 c 3.78741,-0.89649 6.52593,-3.1975 9.39062,-7.89039 0.50824,-0.83257 1.54086,-2.66673 2.29474,-4.0759 l 1.37067,-2.56213 0.38812,-2.58367 c 0.71309,-4.74697 0.52699,-7.78177 -0.6259,-10.2068 -0.84738,-1.78242 -2.70921,-3.89198 -4.04421,-4.58234 -1.23379,-0.63802 -4.68622,-0.87639 -6.72948,-0.46463 -1.94529,0.39202 -3.77491,1.40385 -3.19102,1.76472 0.0667,0.0413 1.88242,-0.13684 4.03483,-0.39577 2.82143,-0.33941 3.98415,-0.42739 4.1668,-0.31528 0.52213,0.32046 2.55227,3.10904 3.27796,4.50257 1.09749,2.10752 1.44567,3.3544 1.44502,5.17487 -4.2e-4,1.16177 -0.0757,1.71069 -0.34036,2.48275 -0.39775,1.1602 -0.41063,1.16657 -2.36593,1.16948 -5.24048,0.008 -10.6214,-2.0884 -18.17266,-7.07936 -1.97047,-1.30237 -2.79614,-1.95185 -3.69212,-2.90429 -2.92357,-3.10778 -5.21518,-7.82594 -6.27127,-12.91187 -0.69556,-3.34974 -0.77369,-4.24874 -0.76454,-8.79758 0.007,-3.7088 0.055,-4.6085 0.33365,-6.31086 0.38493,-2.3517 0.94389,-4.69133 1.53878,-6.44061 0.50669,-1.48994 0.52089,-1.64185 0.15344,-1.64185 -0.61604,0 -2.44668,1.99397 -3.42341,3.72884 -1.77864,3.15922 -2.5329,6.72619 -2.66855,12.61993 l -0.0828,3.59613 0.62738,2.51916 c 2.01911,8.10754 4.77908,13.73578 8.65859,17.65696 1.71959,1.73808 2.73333,2.49894 5.69905,4.2775 4.38046,2.62697 8.66122,4.02133 13.93715,4.53972 1.4772,0.14514 4.96459,0.1163 5.74013,-0.0475 0.1535,-0.0324 0.20263,0.16664 0.19996,0.81002 -0.003,0.74483 -0.0618,0.91506 -0.46292,1.34238 -0.25265,0.26916 -0.91777,1.16058 -1.47803,1.98092 -3.01167,4.40968 -5.07112,6.34078 -7.59514,7.12177 -1.62518,0.50287 -4.1975,0.38693 -5.39404,-0.24313 -0.61129,-0.32188 -3.84734,-4.48522 -4.59301,-5.90914 -0.79971,-3.20697 -0.50547,-4.12658 -0.7582,-6.18987 l -1.93899,0 -0.0397,4.14701 c -0.0389,4.0644 -0.0324,4.1679 0.32504,5.19571 0.48539,1.39575 1.15728,2.48426 2.29626,3.72006 2.46008,2.66922 5.81762,3.89749 8.75404,3.20244 z m 30.21151,-0.90241 c 0.12145,-1.5366 0.44357,-1.92182 2.67685,-3.2012 0.61526,-0.35246 1.37035,-0.88069 1.67797,-1.17383 0.56119,-0.53478 0.738,-1.06907 0.35378,-1.06907 -0.11305,0 -5.63008,3.57141 -6.65551,4.17187 -2.13812,1.25203 -2.36577,1.42715 -2.14382,1.64912 0.16331,0.16329 3.19727,0.72687 3.70993,0.68914 0.25914,-0.0191 0.30914,-0.15904 0.3808,-1.06603 z m 7.56218,0.38497 c 1.80704,-0.59063 3.38271,-1.36835 4.20148,-2.07376 1.17133,-1.00917 0.50221,-1.19472 -1.68171,-0.46635 -2.5397,0.847 -5.1678,2.33605 -5.1678,2.92801 0,0.32409 0.85119,0.1994 2.64803,-0.3879 z m -10.04071,-4.41589 c 1.66026,-0.43244 5.01228,-2.49057 5.19513,-3.18979 0.15938,-0.60948 -0.18096,-1.70754 -0.6961,-2.24588 -0.2772,-0.28968 -0.60861,-0.73476 -0.73643,-0.98906 -0.35047,-0.69718 -1.54914,-1.80751 -2.40005,-2.22315 -2.08877,-1.02031 -4.81936,-0.78059 -7.1421,0.62701 -0.98784,0.59863 -2.29371,1.84341 -2.49823,2.38136 0.81924,3.92333 2.59463,4.3124 2.59463,4.48893 0.94478,1.19162 3.29817,1.77179 5.68315,1.15058 z m 52.83504,-0.40639 c 0.46773,-0.49668 1.9552,-4.89368 1.75062,-4.72389 -0.33095,0.27466 -2.62491,4.89211 -2.5171,5.06657 0.14326,0.2318 0.28528,0.1683 0.76648,-0.34268 z m -4.56619,-0.68253 c 1.51493,-0.96296 2.86664,-2.92157 3.55438,-5.15018 0.49596,-1.60719 0.49519,-1.60951 -1.18738,-3.57048 -2.86914,-3.34383 -5.20845,-4.73645 -8.3674,-4.98122 l -1.14481,-0.0887 -0.43573,0.95346 c -0.23963,0.5244 -0.88925,1.615 -1.44358,2.42355 -1.17572,1.71493 -1.68418,2.75697 -1.81658,3.72296 -0.10927,0.7973 0.15255,1.91271 0.52897,2.25335 0.52442,0.47461 1.97967,-0.31496 2.67872,-1.4534 0.16019,-0.26088 0.47273,-1.04483 0.69452,-1.74212 0.46518,-1.46249 1.05974,-2.64533 1.42898,-2.84294 0.34129,-0.18266 1.66318,0.24593 2.14996,0.69707 0.67473,0.6253 0.46736,1.23154 -1.1932,3.48825 -1.3301,1.80763 -1.67469,2.42737 -1.80589,3.24781 -0.13914,0.87013 0.1065,1.22679 0.84493,1.22679 1.19682,0 1.87422,-0.62665 2.89953,-2.68236 0.83109,-1.66629 1.2695,-2.27567 1.93156,-2.68485 0.78046,-0.48235 1.09461,-0.40135 1.43592,0.37022 0.41754,0.94394 0.2745,1.46106 -0.85553,3.09278 -2.03637,2.30002 -1.18313,3.96813 -1.14691,4.02965 0.12985,0.22064 0.59771,0.1047 1.24954,-0.30964 z m -73.8027,-1.35857 c 1.87173,-0.47871 3.40658,-1.37647 4.00292,-2.34137 0.41617,-0.67338 0.29433,-0.94977 -0.41873,-0.94977 -0.76413,0 -2.59317,-0.52145 -5.63417,-1.60628 -4.35314,-1.5529 -5.50411,-1.82611 -6.41981,-1.5239 -1.27912,0.42215 -1.05654,1.76695 0.73885,4.46384 1.04219,1.56548 1.26071,1.72527 2.84704,2.08192 1.11822,0.25141 3.6684,0.18643 4.8839,-0.12444 z m 15.62472,-0.27705 c 0,-0.147 -0.52018,-1.03633 -1.15594,-1.97628 -1.42384,-2.10506 -1.61462,-2.16836 -2.0039,-0.66493 -0.42719,1.64988 -0.41063,1.68349 1.14626,2.32763 1.53574,0.63539 2.01358,0.70981 2.01358,0.31358 z m 35.1069,-1.80998 c 5.16381,-1.74799 6.73088,-2.41273 8.5394,-3.62234 1.38846,-0.92866 3.22461,-2.71048 4.00571,-3.88721 l 0.57175,-0.86134 -0.24927,-1.39549 c -0.2813,-1.57494 -0.47049,-3.91572 -0.69425,-8.59039 -0.1705,-3.56182 -0.38334,-5.00498 -1.03926,-7.04649 -0.94235,-2.93307 -2.35923,-5.13241 -4.21609,-6.54437 -0.67726,-0.51499 -1.82931,-1.38915 -2.56009,-1.94257 -2.47101,-1.8713 -4.15312,-2.55259 -6.27813,-2.54278 -1.61924,0.007 -2.6655,0.28125 -2.72863,0.71401 -0.0696,0.47716 1.1616,1.56192 3.00638,2.64874 5.00623,2.94935 6.07204,3.77509 6.74888,5.22868 0.39244,0.84278 0.48887,2.39207 0.1848,2.96911 -0.0944,0.17919 -0.72199,0.90597 -1.3946,1.61508 -2.36177,2.48989 -4.28394,5.31943 -7.07802,10.41927 -2.38192,4.34758 -3.7287,6.57325 -5.07355,8.38453 -1.30111,1.75238 -1.42532,1.82519 -3.05351,1.78975 -1.23565,-0.0269 -2.31853,-0.59999 -4.3624,-2.30874 -0.91805,-0.76753 -1.90504,-1.52252 -2.1933,-1.67776 -0.97463,-0.52487 -3.70449,-5.50995 -4.49111,-8.20136 -0.68683,-2.34999 -0.65541,-5.09974 0.0816,-7.13744 0.1527,-0.42223 0.47599,-1.31693 0.71841,-1.98822 0.60547,-1.67668 1.09356,-2.33466 3.52023,-4.74562 2.59814,-2.58131 2.9857,-3.21416 2.98783,-4.87906 0.002,-1.87176 -0.0478,-1.87702 -2.62143,-0.27498 -2.69327,1.67648 -3.96685,2.71999 -4.68155,3.83584 -3.54827,5.53986 -4.47718,7.95832 -4.65973,12.13184 -0.12085,2.76261 0.37152,5.72837 1.3962,8.4099 0.53774,1.40726 1.88831,3.37371 3.22222,4.69158 3.15458,3.11665 6.73009,4.56225 14.65431,5.92481 1.55865,0.26801 2.85386,0.49304 2.87824,0.50006 0.0244,0.007 2.21094,-0.72065 4.85898,-1.61704 z m -1.63762,-4.84359 c 0.39104,-4.31535 2.7029,-8.52696 6.18648,-11.27026 1.15888,-0.9126 3.22301,-2.24292 3.48012,-2.24292 0.21876,0 0.12206,0.67297 -0.40523,2.82043 -1.15128,4.6887 -2.80418,7.91296 -5.28265,9.87602 -0.15116,0.07 -1.20413,1.16643 -4.08295,1.96695 l 0.10423,-1.15022 z m 4.93278,-3.83947 c 1.44276,-1.71463 2.19908,-5.31712 1.14855,-5.47081 -0.40337,-0.059 -1.38902,0.695 -1.98626,1.51947 -0.46758,0.64547 -1.54501,3.85816 -1.41101,4.20736 1.07333,0.68299 1.88799,0.17268 2.24872,-0.25602 z m -34.81947,2.28915 c 1.02704,-0.33043 2.11835,-0.64787 2.42513,-0.70542 0.67041,-0.12577 0.77877,-0.39856 0.77877,-1.96062 -0.1103,-1.14706 -0.83905,-1.83914 -0.98066,-1.83914 -0.59084,0 -4.70263,1.07792 -5.43697,1.42532 -1.2832,0.60705 -2.1587,1.81351 -2.1587,2.97472 0,0.71668 0.32308,0.83478 2.08814,0.7633 1.14279,-0.0463 1.77827,-0.17363 3.28429,-0.65816 z m 21.12617,0.47014 c 0.28402,-0.13477 1.49807,-1.50713 1.87536,-1.83924 2.03951,-1.79524 1.69372,-4.10838 -1.00085,-6.69528 -0.69534,-0.66754 -1.35636,-1.21372 -1.46894,-1.21372 -0.37972,0 -5.43128,3.11756 -5.84149,3.60506 -0.57686,0.68557 -0.21179,3.02621 1.09805,4.31335 1.26132,1.64097 3.21096,1.93663 3.37503,1.97341 0.65999,0.14794 1.47401,0.0884 1.96284,-0.14358 z m -23.60856,-5.72432 c 1.77053,-0.27219 2.74886,-0.86963 3.08324,-1.88288 0.23818,-0.72167 0.0878,-0.85019 -0.87833,-0.75048 -1.09589,0.11311 -2.75104,0.94217 -3.58634,1.79639 -0.74464,0.76151 -0.76802,1.2242 -0.0545,1.07845 0.22567,-0.0461 0.87183,-0.15476 1.43593,-0.24148 z m 16.44758,-3.27293 c 0.83632,-0.36953 1.63653,-1.2021 2.75336,-2.86469 0.51407,-0.76527 1.25933,-1.73525 1.65614,-2.1555 0.80928,-0.85711 1.6937,-2.68668 2.87288,-5.94307 2.98587,-8.24568 3.20453,-16.21934 0.66282,-24.16977 -0.97182,-3.03989 -2.77225,-7.08265 -3.15422,-7.08265 -0.2497,0 -1.75557,1.50947 -1.75557,1.75977 0,0.11212 0.36689,1.1212 0.81533,2.2424 0.98069,2.45197 1.75845,5.40847 2.07997,7.90651 0.27163,2.11056 0.30958,5.92773 0.08,8.04649 -0.38193,3.52411 -1.64404,8.314 -3.13411,11.89426 -1.16079,2.7891 -3.22386,6.6588 -4.78471,8.97462 -0.76477,1.13471 -0.89261,1.61431 -0.46326,1.7381 0.44287,0.1277 1.72085,-0.059 2.37141,-0.34647 z m -25.97709,-0.50726 c 0.45098,-0.32976 0.0527,-1.04766 -0.94905,-1.71053 -0.65643,-0.43437 -0.88359,-0.69111 -1.07917,-1.21967 l -0.24775,-0.66948 -2.81352,0 c -2.72492,0 -2.83452,0.0117 -3.4802,0.3733 -0.89688,0.5022 -1.34122,1.2995 -1.34445,2.41239 -0.002,0.68223 0.0483,0.85994 0.25858,0.9149 0.14356,0.0375 2.3121,0.076 4.81897,0.0855 3.63835,0.0138 4.61419,-0.0238 4.83659,-0.18643 z m 38.40918,-0.58962 c 0,-0.42575 -0.18339,-0.6745 -1.31008,-1.77703 -0.9925,-0.9712 -1.44066,-1.30647 -1.84871,-1.38302 -0.54188,-0.10166 -1.16667,0.10085 -1.16667,0.37814 0,0.23866 3.38789,3.99067 4.32546,2.78191 z m -27.01482,-1.01884 c 0.75951,-0.38618 1.10111,-0.6718 1.4795,-1.23707 0.60401,-0.90232 0.59093,-1.40616 -0.0445,-1.71562 -0.2461,-0.11985 -0.69539,-0.2195 -0.99839,-0.22145 -0.7252,-0.005 -1.1966,0.44386 -1.87034,1.77953 -0.28967,0.57424 -1.03839,1.8173 -0.9878,1.89916 0.16569,0.26809 1.41317,0.008 2.42155,-0.50455 z m 30.18513,-3.01686 c 0.95366,-0.287 1.96343,-1.0555 2.73424,-2.08088 0.75703,-1.00707 2.14975,-3.70759 2.14975,-4.16842 0,-0.95481 -1.27531,-2.4481 -2.63759,-3.08845 -0.91844,-0.43172 -4.36937,-1.66355 -4.74552,-1.69395 -0.23704,-0.0191 -0.47237,0.31288 -1.14574,1.61659 -1.19663,2.31679 -1.65358,3.74302 -1.67255,5.22037 -0.013,1.01332 0.0454,1.31692 0.38746,2.01357 0.95686,1.9489 2.8778,2.79878 4.92995,2.18117 z m -33.69656,-1.69642 c 1.08261,-0.7178 2.94047,-1.89564 4.12858,-2.61741 4.05273,-2.46204 6.68522,-4.73388 8.05177,-6.94869 0.36916,-0.5983 0.93411,-1.40061 1.25545,-1.78293 1.42425,-1.6945 1.87724,-3.72647 1.35701,-6.08698 -0.14193,-0.64399 -0.71458,-2.4126 -1.27253,-3.93023 -1.1569,-3.14672 -1.43599,-4.13368 -1.64873,-5.83019 -0.19445,-1.55087 0.005,-3.02668 0.62829,-4.64219 l 0.47125,-1.22199 -0.43266,-0.80122 c -0.67896,-1.25737 -2.0679,-2.91021 -3.21052,-3.82056 -1.95339,-1.55632 -3.97703,-2.49987 -7.07654,-3.29954 -1.80786,-0.46643 -7.60139,-1.56412 -8.25528,-1.56412 -0.39547,0 -1.28221,1.07531 -1.82697,2.21546 -0.41991,0.87883 -0.63642,1.66358 -1.66838,6.04696 -0.88,3.73781 -2.46872,5.66251 -5.62487,6.81436 -3.49057,1.2739 -7.04767,1.41389 -12.55785,0.49421 -2.01312,-0.33601 -2.40264,-0.36488 -2.5668,-0.19028 -0.18781,0.19975 -0.74508,2.91104 -1.19191,5.7991 -1.14294,7.38727 -0.30469,13.25491 2.525,17.67469 0.67309,1.05132 2.29093,3.03367 2.61923,3.20937 0.2109,0.11288 0.70546,-0.0243 2.11158,-0.58582 1.0099,-0.40328 3.6484,-1.30916 5.86333,-2.01307 2.21493,-0.70391 4.3963,-1.42257 4.84749,-1.59701 3.11645,-1.20493 8.24278,1.16102 10.64885,4.91473 0.37667,0.58765 0.72355,1.06845 0.77084,1.06845 0.0473,0 0.97175,-0.5873 2.05437,-1.3051 z m 47.87086,-12.21271 c 1.23536,-0.62238 1.57633,-0.91934 2.52554,-2.19955 3.35623,-4.52652 4.76098,-11.43444 3.54225,-17.41891 -0.38905,-1.91035 -0.89537,-3.13462 -1.99248,-4.81773 -3.43754,-5.27366 -10.03316,-8.18236 -18.0434,-7.95721 -2.18136,0.0613 -3.05841,0.23858 -2.84986,0.57601 0.0503,0.0813 1.28258,0.14167 2.89353,0.14167 l 2.80599,0 1.16889,0.76306 c 2.11634,1.38156 3.64124,3.17946 4.53504,5.34694 1.1007,2.66924 1.41535,5.77614 1.23162,12.16131 -0.19257,6.69227 0.0279,9.38186 1.01455,12.37974 0.47255,1.43576 0.92804,2.31188 1.20195,2.31188 0.0929,0 1.37328,-0.24449 1.96638,-1.28721 z m -0.33236,-13.09677 c -0.63945,-0.98955 -1.29653,-2.06765 -1.46017,-2.39579 -1.1614,-2.32895 -0.99536,-4.07101 0.52954,-5.55597 0.82874,-0.80703 1.17526,-0.81031 1.89117,-0.0179 1.1997,1.32794 1.65212,3.10766 1.52694,6.00673 -0.0784,1.81551 -0.51801,4.86209 -0.70162,4.86209 -0.0543,0 -1.14639,-1.90961 -1.78586,-2.89916 z m -5.33938,10.56482 c 0.54147,-0.12389 0.58929,-0.35883 0.61282,-3.01117 0.0237,-2.67337 -0.10822,-3.03998 -1.64856,-4.57991 -1.89477,-1.89427 -2.01586,-3.3316 -0.60485,-7.17932 1.15387,-3.1465 1.35512,-4.05825 1.26957,-5.75147 -0.0869,-1.71994 -0.48456,-2.81805 -1.38182,-3.81602 -2.39436,-2.66311 -8.37592,-3.13209 -12.62917,-0.99019 -1.08107,0.54441 -2.43346,1.67037 -2.58687,2.15375 -0.063,0.19835 0.2459,0.60106 1.16054,1.51316 2.37065,2.36405 3.03388,4.24986 4.05667,11.53447 0.46155,3.28735 0.84704,4.8962 1.50481,6.28046 1.02834,2.16413 2.61042,3.39585 5.06218,3.94112 0.62362,0.13869 4.47162,0.0683 5.18468,-0.0949 z m -22.72107,-2.98744 c 0.53197,-0.67629 0.41038,-1.14637 -0.56872,-2.19884 -0.48283,-0.51899 -0.91743,-1.07103 -0.9658,-1.22676 -0.65741,-2.11651 -0.89468,-6.79761 -0.47277,-9.32672 0.78076,-4.68006 2.93609,-8.27427 6.11984,-10.20545 0.66393,-0.40272 0.97167,-0.68794 0.88811,-0.82313 -0.23607,-0.38197 -2.58652,1.04799 -3.98358,2.42351 -1.92878,1.89904 -3.52384,4.36981 -4.26807,6.6113 -1.7983,5.41615 -1.17553,10.41816 1.78738,14.35603 0.66513,0.88402 1.00403,0.97433 1.46361,0.39006 z m 95.50199,-1.87758 c 1.72967,-0.79798 2.67416,-2.20451 3.93276,-5.85668 0.54884,-1.9079 1.09767,-1.72734 1.64651,-2.59102 0.59212,-0.24017 1.29713,-0.38022 2.17531,-0.43214 1.1917,-0.0704 1.36709,-0.0436 2.11837,0.32394 1.02992,0.50389 1.85377,1.41592 3.06016,3.38767 1.29459,2.11591 1.8359,2.73758 2.79026,3.20451 0.68531,0.3353 0.94453,0.38462 1.67378,0.31849 1.66694,-0.15115 2.61562,-0.94081 3.0856,-2.56837 0.35617,-1.23344 0.21207,-3.703 -0.41796,-7.16337 l -0.48882,-2.68476 c 0,0 -4.77949,0.30426 -7.22908,0.67323 -6.14622,0.9258 -14.10458,1.17477 -14.30879,-0.35888 0.0636,-0.0625 6.12135,-1.32727 10.50537,-2.1934 4.81495,-0.95127 8.06008,-1.40622 13.32159,-1.86759 0.55071,-0.0483 0.97169,-0.16038 1.01373,-0.26992 0.10204,-0.26591 -0.92908,-2.46856 -1.16403,-2.48655 -0.6145,-0.0471 -3.13312,0.0589 -5.93734,0.24976 -5.82573,0.39654 -9.73955,0.80245 -22.89507,2.37449 -16.54551,1.97713 -22.04176,2.5137 -29.86609,2.9157 l -3.16759,0.16274 c 0,0 -3.68726,1.19274 -1.5865,3.71229 0.71545,0.75023 0.74221,0.76299 1.41696,0.6757 1.76365,-0.22817 29.89553,-3.21469 30.28118,-3.21469 0.32996,0 0.57039,0.15496 0.97637,0.62924 1.39935,1.63483 1.89068,3.11533 2.54802,7.67784 0.50489,3.50435 0.87076,5.19081 1.16567,5.37307 0.45639,0.28207 1.81102,0.47619 3.07947,0.4413 1.16323,-0.032 1.56974,-0.10947 2.27016,-0.4326 z m -93.62674,-3.41153 c 0,-2.41941 -1.74592,-4.14465 -1.89883,-3.68593 -0.061,0.18309 0.43181,4.218 0.55778,4.56648 l 1.34105,0.10322 0,-0.98377 z m 46.67374,-2.21872 c 1.84347,-0.96595 2.29464,-2.27998 2.84526,-3.7929 l -0.01,-2.17014 c -0.009,-2.00953 -0.0571,-2.37435 -0.64971,-4.92948 -0.35199,-1.51763 -0.85729,-5.41241 -0.93147,-5.55597 -0.12117,-0.23458 -0.41946,-0.26102 -2.94524,-0.26102 -2.08715,0 -2.85079,0.0487 -2.96731,0.18907 -0.0863,0.10398 -0.38778,2.93977 -0.66995,6.30174 -0.46289,5.51523 -0.49294,6.19041 -0.3075,6.90805 0.3732,1.44421 1.42455,2.60671 2.8682,3.17139 0.85634,0.24633 2.16827,0.36708 2.76748,0.13926 z m -91.34832,-4.22296 c 0.20896,-0.10574 0.58194,-0.59693 0.85763,-1.12948 0.59396,-1.1474 0.63265,-2.0302 0.18907,-4.31485 -0.16382,-0.84376 -0.29785,-2.05343 -0.29785,-2.68816 0,-1.06593 -0.0427,-1.22619 -0.55904,-2.09904 -0.30748,-0.51976 -1.03787,-1.39984 -1.6231,-1.95576 -3.44612,-3.27348 -7.8545,-3.59901 -9.35603,-0.69087 -0.3929,0.76098 -0.24095,0.83907 1.63262,0.83907 l 1.69652,0 1.06837,1.00679 c 2.65575,2.50265 3.88569,5.49983 3.66124,8.92193 -0.0488,0.74382 -0.15724,1.92529 -0.0236,2.05891 0.30032,0.30033 2.19245,0.33568 2.75418,0.0515 z m 83.28587,-0.57169 c 0.33488,-0.47811 0.17476,-2.20839 -0.0393,-1.75664 l -2.32766,-0.2188 c 0,0 -0.0536,2.57381 0.1808,2.63473 1.35943,0.0839 2.05238,-0.46831 2.18616,-0.65929 z m -77.4104,-2.08229 c 0.64208,-0.50505 0.75092,-0.86612 0.8349,-2.76982 0.0645,-1.4622 0.13198,-1.86937 0.34952,-2.10975 0.42215,-0.46646 0.98424,-0.50519 1.39342,-0.096 0.30925,0.30925 0.34984,0.48956 0.34984,1.55452 0,0.92044 0.0516,1.22447 0.21851,1.28854 0.12517,0.048 0.72196,-0.27095 1.39713,-0.74676 1.14562,-0.80734 1.18094,-0.85057 1.2605,-1.54278 0.045,-0.39169 0.0205,-1.25842 -0.0545,-1.92605 -0.43832,-3.90253 -2.51107,-6.78157 -7.07255,-9.82374 -3.02089,-2.01471 -3.24749,-2.01827 -2.85578,-0.0449 0.1352,0.6811 0.24577,1.32227 0.2457,1.42481 -8e-5,0.14153 -0.58612,0.18645 -2.43264,0.18645 -1.81548,0 -2.5029,0.0514 -2.70992,0.20284 -0.26466,0.19352 -0.25805,0.21922 0.14362,0.55932 1.53782,1.30209 2.12561,1.85241 2.79867,2.62025 2.20635,2.51707 3.59763,5.75653 4.5848,10.67531 0.16771,0.83568 0.1847,0.85764 0.66347,0.85764 0.27161,0 0.66752,-0.13858 0.88528,-0.30988 z m 76.7587,-4.38846 c 0,-1.36739 -0.0626,-1.41696 -1.78984,-1.41696 -1.72723,0 -1.78984,0.0496 -1.78984,1.41696 0,1.36739 0.0626,1.41696 1.78984,1.41696 1.95804,0.3978 1.78984,-0.95498 1.78984,-1.41696 z m 51.60715,-4.47006 c 1.84756,-0.23244 16.53984,-1.20407 18.72748,-1.64542 2.80547,-0.566 6.4333,-1.92487 6.29128,-2.35652 -0.0933,-0.28345 -1.27705,-0.29159 -4.95761,-0.0341 -9.92135,0.69416 -21.29198,1.8448 -36.2313,3.66642 -7.90183,0.9635 -21.45471,2.67491 -21.89658,2.76502 -0.31652,0.0645 -0.42594,0.19197 -0.49892,0.58094 -0.15677,0.83571 0.0174,1.12081 0.68488,1.12081 0.31943,0 36.93737,-3.9785 37.88077,-4.09718 z m -97.99392,3.22988 c 0,-0.6826 -0.0277,-0.73146 -0.55932,-0.98716 -0.85914,-0.69949 -1.70168,-0.64379 -1.77963,-0.44067 -0.11055,0.28808 1.68471,2.14597 2.07362,2.14597 0.2176,0 0.26533,-0.12919 0.26533,-0.71814 z m 4.19872,-2.64219 c -0.19403,-1.08591 -3.16935,-4.28957 -5.30767,-5.71503 -4.39067,-2.92692 -11.01575,-4.64431 -17.92364,-4.64626 -1.70995,-4.8e-4 -1.8262,0.0188 -2.20001,0.36525 -0.28976,0.26855 -0.39466,0.51244 -0.39466,0.91762 0,0.46814 0.12099,0.67286 0.79764,1.3495 l 0.79764,0.79765 2.69264,0 c 6.00515,0 10.34615,1.37528 18.53257,5.8713 1.43561,0.78844 3.03625,1.23208 3.00549,1.05997 z m -27.16836,-4.26226 c 0,-1.055 -0.0451,-1.2626 -0.35425,-1.62996 -0.19482,-0.23154 -0.70378,-1.06941 -1.13101,-1.86193 -0.94498,-1.75293 -1.60458,-2.50982 -2.47783,-2.84332 -1.06992,-0.40861 -3.00087,-0.0354 -2.95299,0.57074 0.0277,0.35142 6.33918,6.95833 6.65506,6.96661 0.22768,0.006 0.26102,-0.14755 0.26102,-1.20214 z"
+       id="path3537"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
+       style="fill:#030303"
+       inkscape:export-filename="/home/rhatto/upload/keyringer.png"
+       inkscape:export-xdpi="32.869999"
+       inkscape:export-ydpi="32.869999" />
+    <text
+       xml:space="preserve"
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:LMRomanDunh10;-inkscape-font-specification:LMRomanDunh10"
+       x="299.00513"
+       y="-178.00362"
+       id="text2885"
+       sodipodi:linespacing="100%"
+       inkscape:export-filename="/home/rhatto/upload/keyringer.png"
+       inkscape:export-xdpi="32.869999"
+       inkscape:export-ydpi="32.869999"><tspan
+         sodipodi:role="line"
+         id="tspan2887"
+         x="299.00513"
+         y="-178.00362">keyringer</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:10px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:LMMathItalic6;-inkscape-font-specification:LMMathItalic6"
+       x="109.81076"
+       y="-96.293655"
+       id="text2910"><tspan
+         sodipodi:role="line"
+         id="tspan2912"
+         x="109.81076"
+         y="-96.293655">Clipart from    </tspan><tspan
+         sodipodi:role="line"
+         x="109.81076"
+         y="-81.638664"
+         id="tspan2914">http://openclipart.org/detail/12889/keyring-by-anonymous-12889</tspan></text>
+  </g>
+</svg>
diff --git a/share/keyringer/genpair b/share/keyringer/genpair
index 140361a..85ec1ac 100755
--- a/share/keyringer/genpair
+++ b/share/keyringer/genpair
@@ -101,10 +101,6 @@ function genpair_ssl {
   cd "$TMPWORK"
 
   # Generate certificate
-  if [ "$KEYTYPE" == "ssl-cacert" ]; then
-    # We use a custom script for CaCert
-    "$LIB/csr.sh" "$NODE"
-  else
 cat <<EOF >> openssl.conf
 [ req ]
 default_keyfile         = ${NODE}_privatekey.pem
@@ -127,22 +123,21 @@ commonName                      = Common Name
 extendedKeyUsage=serverAuth,clientAuth
 EOF
 
-    # Add SubjectAltNames so wildcard certs can work correctly.
-    if [ "$WILDCARD" == "yes" ]; then
+  # Add SubjectAltNames so wildcard certs can work correctly.
+  if [ "$WILDCARD" == "yes" ]; then
 cat <<EOF >> openssl.conf
 subjectAltName=DNS:${NODE}, DNS:${CNAME}
 EOF
-    fi
+  fi
 
-    echo "Please review your OpenSSL configuration:"
-    cat openssl.conf
-    read -p "Hit ENTER to continue." prompt
+  echo "Please review your OpenSSL configuration:"
+  cat openssl.conf
+  read -p "Hit ENTER to continue." prompt
 
-    openssl req -batch -nodes -config openssl.conf -newkey rsa:2048 -sha256 \
-            -keyout ${NODE}_privatekey.pem -out ${NODE}_csr.pem
+  openssl req -batch -nodes -config openssl.conf -newkey rsa:2048 -sha256 \
+          -keyout ${NODE}_privatekey.pem -out ${NODE}_csr.pem
 
-    openssl req -noout -text -in ${NODE}_csr.pem
-  fi
+  openssl req -noout -text -in ${NODE}_csr.pem
 
   # Self-sign
   if [ "$KEYTYPE" == "ssl-self" ]; then
@@ -199,9 +194,9 @@ CWD="`pwd`"
 
 # Verify
 if [ -z "$NODE" ]; then
-  echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl|ssl-cacert|ssl-self> <file> <hostname> [outfile]"
+  echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|ssl|ssl-self> <file> <hostname> [outfile]"
   echo -e "Options:"
-  echo -e "\t gpg|ssh|ssl[-cacert,-self]: key type."
+  echo -e "\t gpg|ssh|ssl[-self]: key type."
   echo -e "\t file                      : base file name for encrypted output (relative to keys folder)"
   echo -e "\t hostname                  : host for the key pair"
   echo -e "\t outfile                   : optional unencrypted output file, useful for deployment"
@@ -216,7 +211,7 @@ keyringer_set_tmpfile genpair -d
 
 # Dispatch
 echo "Generating $KEYTYPE key for $NODE..."
-if [ "$KEYTYPE" == "ssl-self" ] || [ "$KEYTYPE" == "ssl-cacert" ]; then
+if [ "$KEYTYPE" == "ssl-self" ]; then
   genpair_ssl
 else
   genpair_"$KEYTYPE"
diff --git a/share/keyringer/recipients b/share/keyringer/recipients
index ab61bd7..0460842 100755
--- a/share/keyringer/recipients
+++ b/share/keyringer/recipients
@@ -32,7 +32,7 @@ if [ "$COMMAND" == "ls" ]; then
 elif [ "$COMMAND" == "edit" ]; then
   if [ ! -z "$3" ]; then
     keyringer_create_new_recipients $RECIPIENTS_FILE
-    "$EDITOR" "$RECIPIENTS_FILE"
+    $EDITOR "$RECIPIENTS_FILE"
     keyringer_check_recipients
     keyringer_exec git "$BASEDIR" add "$RECIPIENTS_FILE_BASE"
   else