Merge branch 'master' into debian

5 files changed, 11 insertions, 106 deletions

diff --git a/debian/changelog b/debian/changelog
index 6d55a57..daf5e3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
+keyringer (0.2.3-1) unstable; urgency=low
+
+  * Packaging upstream 0.2.3
+
+ -- Silvio Rhatto <rhatto@riseup.net>  Thu, 05 Sep 2013 18:32:37 -0300
+
 keyringer (0.1-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release
 
  -- Silvio Rhatto <rhatto@riseup.net>  Tue, 26 Jun 2012 16:33:57 -0300
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 87ac26d..689c7d9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,14 @@ 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
+Homepage: https://keyringer.pw
 #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}
+Depends: ${shlibs:Depends}, ${misc:Depends}, bash, git-core, gnupg, grep, gawk, coreutils, sed
+Recommends: openssl, xdg-utils
 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,
diff --git a/debian/patches/debian-changes-0.1-1 b/debian/patches/debian-changes-0.1-1
deleted file mode 100644
index a6ad49a..0000000
--- a/debian/patches/debian-changes-0.1-1
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Upstream changes introduced in version 0.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- keyringer (0.1-1) unstable; urgency=low
- .
-   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
- .
- The person named in the Author field signed this changelog entry.
-Author: Silvio Rhatto <rhatto@riseup.net>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- keyringer-0.1.orig/Makefile
-+++ keyringer-0.1/Makefile
-@@ -23,7 +23,6 @@ clean:
- 	find . -name *~ | xargs rm -f # clean local backups
- 
- install_lib:
--	$(INSTALL) -D --mode=0644 lib/keyringer/csr.sh $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/csr.sh
- 	$(INSTALL) -D --mode=0644 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
- 
- install_share:
---- keyringer-0.1.orig/share/keyringer/genpair
-+++ keyringer-0.1/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
- 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/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0540e18..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-0.1-1