From 3492507e7dc279be4e6c703733d8a174d0204d91 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 21 Feb 2009 18:28:20 -0500
Subject: preparing for stupid brown paper bag 0.23.1 release.

---
 packaging/debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 50a7071..96b719b 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.23.1-1) unstable; urgency=low
+
+  * New Upstrem "Brown Paper Bag" Release:
+   - adjusts internal version numbers
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sat, 21 Feb 2009 18:09:47 -0500
+
 monkeysphere (0.23-1) unstable; urgency=low
   
   "The Golden Bezoar Release"
-- 
cgit v1.2.3


From e71c7bb4dff26178f714cd0fcdbb3058effa4066 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 22 Feb 2009 12:07:34 -0500
Subject: Fix how version number is saved/retrieved.  Version is now stored in
 VERSION file, which is created in the tarball target.  This is then installed
 at /usr/share/monkeysphere/VERSION, and cat'ed when the version number is
 requested by the front-end ui.  No more manual setting of version number
 required (to avoid future problems, aka "0.23.1").  This system is also more
 flexible, as the VERSION file could potentially hold more info than just the
 release number.

---
 Makefile                        |  2 ++
 packaging/debian/changelog      |  7 +++++++
 src/monkeysphere                |  2 +-
 src/monkeysphere-authentication |  2 +-
 src/monkeysphere-host           |  2 +-
 src/share/common                |  8 +++++---
 tests/basic                     | 16 ----------------
 utils/preparing-release         |  3 ---
 8 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'packaging/debian/changelog')

diff --git a/Makefile b/Makefile
index 71df92b..0284a8a 100755
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ tarball: clean
 	mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
 	ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
 	ln -s ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
+	echo $(MONKEYSPHERE_VERSION) > monkeysphere-$(MONKEYSPHERE_VERSION)/VERSION
 	tar -ch --exclude='*~' monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
@@ -50,6 +51,7 @@ install: all installman
 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+	install -m 0644 VERSION $(DESTDIR)$(PREFIX)/share/monkeysphere
 	install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
 	install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 96b719b..58a80a3 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - Fixed how version information is stored/retrieved.
+
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Sun, 22 Feb 2009 12:02:06 -0500
+
 monkeysphere (0.23.1-1) unstable; urgency=low
 
   * New Upstrem "Brown Paper Bag" Release:
diff --git a/src/monkeysphere b/src/monkeysphere
index 371983f..6db4827 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -239,7 +239,7 @@ case $COMMAND in
 	;;
 
     'version'|'v')
-	echo "$VERSION"
+	version
 	;;
 
     '--help'|'help'|'-h'|'h'|'?')
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 497470d..c009653 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -199,7 +199,7 @@ case $COMMAND in
 	;;
 
     'version'|'v')
-	echo "$VERSION"
+	version
 	;;
 
     '--help'|'help'|'-h'|'h'|'?')
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 1b0de0c..c454354 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -315,7 +315,7 @@ case $COMMAND in
 	;;
 
     'version'|'v')
-	echo "$VERSION"
+	version
 	;;
 
     '--help'|'help'|'-h'|'h'|'?')
diff --git a/src/share/common b/src/share/common
index 0c26a91..b2dcd35 100644
--- a/src/share/common
+++ b/src/share/common
@@ -20,9 +20,6 @@
 SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
 export SYSCONFIGDIR
 
-# monkeysphere version
-VERSION=0.23.1
-
 # default log level
 LOG_LEVEL="INFO"
 
@@ -41,6 +38,11 @@ PROMPT="true"
 ########################################################################
 ### UTILITY FUNCTIONS
 
+# output version info
+version() {
+    cat "${SYSSHAREDIR}/VERSION"
+}
+
 # failure function.  exits with code 255, unless specified otherwise.
 failure() {
     [ "$1" ] && echo "$1" >&2
diff --git a/tests/basic b/tests/basic
index 9308e21..b1fe9ed 100755
--- a/tests/basic
+++ b/tests/basic
@@ -138,22 +138,6 @@ export SOCKET="$TEMPDIR"/ssh-socket
 # *anything* with any running X11 session.
 export DISPLAY=monkeys
 
-## make sure that the version number matches the debian changelog
-## (don't bother if this is being run from the tests).
-
-if [ -f "$TESTDIR"/../packaging/debian/changelog ]; then
-    echo
-    echo "##################################################"
-    echo "### checking version string match..."
-    repver=$(monkeysphere version)
-    debver=$(head -n1 "$TESTDIR"/../packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/')
-    if [ "$repver" = "$debver" ] ; then
-	echo "Versions match!"
-    else
-	printf "reported version string (%s) does not match debian changelog (%s)\n" "$repver" "$debver"
-	exit 1
-    fi
-fi
 
 ######################################################################
 ### CONFIGURE ENVIRONMENTS
diff --git a/utils/preparing-release b/utils/preparing-release
index 3c7ded5..dd9d224 100644
--- a/utils/preparing-release
+++ b/utils/preparing-release
@@ -3,9 +3,6 @@
  * make sure that packaging/debian/changelog has a reasonable version
    number.
 
- * make sure that src/share/common contains the upstream part of that
-   version number in the VERSION= line
-
  * make tarball
 
  * make releasenote
-- 
cgit v1.2.3


From 54abd85dc6b4c54a99644eec21ce51635012ea8b Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 28 Feb 2009 13:07:36 -0500
Subject: work on maintainer scripts: - remove preinst and prerm because they
 were empty - put everything in postint into 'config' argument, since that's  
 really what it is - make sure deletion of monkeysphere user is correct, based
 on what we   found here:
 http://wiki.debian.org/AccountHandlingInMaintainerScripts

---
 packaging/debian/changelog             |  3 ++-
 packaging/debian/monkeysphere.postinst | 34 +++++++++++++++++++---------------
 packaging/debian/monkeysphere.postrm   |  9 +++++++--
 packaging/debian/monkeysphere.preinst  | 25 -------------------------
 packaging/debian/monkeysphere.prerm    | 15 ---------------
 5 files changed, 28 insertions(+), 58 deletions(-)
 delete mode 100755 packaging/debian/monkeysphere.preinst
 delete mode 100755 packaging/debian/monkeysphere.prerm

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 58a80a3..46f7863 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,9 +1,10 @@
 monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
 
+  * update/cleanup mainterscripts
   * New upstream release:
     - Fixed how version information is stored/retrieved.
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Sun, 22 Feb 2009 12:02:06 -0500
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Sat, 28 Feb 2009 13:02:57 -0500
 
 monkeysphere (0.23.1-1) unstable; urgency=low
 
diff --git a/packaging/debian/monkeysphere.postinst b/packaging/debian/monkeysphere.postinst
index 3d0d66f..bbb02cf 100755
--- a/packaging/debian/monkeysphere.postinst
+++ b/packaging/debian/monkeysphere.postinst
@@ -7,21 +7,25 @@
 
 VARLIB="/var/lib/monkeysphere"
 
-# add a monkeysphere user if one does not already exist
-if ! getent passwd monkeysphere >/dev/null ; then
-    echo "adding monkeysphere user..."
-    adduser --quiet --system --no-create-home --group \
-	--home "$VARLIB" \
-	--shell '/bin/bash' \
-	--gecos 'monkeysphere authentication user,,,' \
-	monkeysphere
-fi
-
-# try to transition from to 0.23:
-/usr/share/monkeysphere/transitions/0.23
-
-# setup monkeysphere authentication
-monkeysphere-authentication setup
+case $1 in
+    configure)
+	# add a monkeysphere user if one does not already exist
+	if ! getent passwd monkeysphere >/dev/null ; then
+	    echo "adding monkeysphere user..."
+	    adduser --quiet --system --no-create-home --group \
+		--home "$VARLIB" \
+		--shell '/bin/bash' \
+		--gecos 'monkeysphere authentication user,,,' \
+		monkeysphere
+	fi
+
+	# try to transition from to 0.23:
+	/usr/share/monkeysphere/transitions/0.23
+
+	# setup monkeysphere authentication
+	monkeysphere-authentication setup
+	;;
+esac
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/packaging/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm
index 79f7245..e70a1b1 100755
--- a/packaging/debian/monkeysphere.postrm
+++ b/packaging/debian/monkeysphere.postrm
@@ -7,8 +7,13 @@
 
 case $1 in
     purge)
-        echo "removing monkeysphere user..."
-        userdel monkeysphere > /dev/null || true
+	# delete monkeysphere user
+	# http://wiki.debian.org/AccountHandlingInMaintainerScripts
+	if type deluser >/dev/null 2>&1; then
+	    deluser --quiet --system monkeysphere > /dev/null || true
+	else
+	    echo >&2 "not removing monkeysphere system account because deluser command was not found"
+	fi
         ;;
 esac
 
diff --git a/packaging/debian/monkeysphere.preinst b/packaging/debian/monkeysphere.preinst
deleted file mode 100755
index fd22f6f..0000000
--- a/packaging/debian/monkeysphere.preinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-# preinst script for monkeysphere
-
-# Author: Jameson Rollins <jrollins@finestructure.net>
-# Copyright 2008-2009
-
-ETC="/etc/monkeysphere"
-
-# move the old server conf file to be the authentication conf file
-if [ -f "$ETC"/monkeysphere-server.conf -a \
-    ! -f "$ETC"/monkeysphere-authentication.conf ] ; then
-    mv "$ETC"/monkeysphere-server.conf "$ETC"/monkeysphere-authentication.conf
-fi
-
-# remove the old gpg-*.conf files
-rm -f "$ETC"/gpg-host.conf
-rm -f "$ETC"/gpg-authentication.conf
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm
deleted file mode 100755
index 5835f53..0000000
--- a/packaging/debian/monkeysphere.prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-# prerm script for monkeysphere
-
-# Author: Jameson Rollins <jrollins@finestructure.net>
-# Copyright 2008-2009
-
-true
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-- 
cgit v1.2.3


From 26527731b6b1bbeaa9e2e8a0507c52ca164803ed Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Mar 2009 13:20:32 -0500
Subject: debian packaging overhaul.

---
 packaging/debian/changelog | 12 ++++++++++--
 packaging/debian/control   |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 46f7863..17e98e7 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,10 +1,18 @@
 monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
 
-  * update/cleanup mainterscripts
   * New upstream release:
     - Fixed how version information is stored/retrieved.
+    - Now uses perl-based keytrans for both pem2openpgp and openpgp2ssh
+    - no longer needs base64 in PATH
+    - added "test" make target
+    - improved transitions/0.23 script
+  * update/cleanup mainterscripts
+  * remove GnuTLS dependency.
+  * remove versioned coreutils | base64 dependency.
+  * added Build-Deps for dh_autotest.
+  * switch to Architecture: all
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Sat, 28 Feb 2009 13:02:57 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 01 Mar 2009 11:47:41 -0500
 
 monkeysphere (0.23.1-1) unstable; urgency=low
 
diff --git a/packaging/debian/control b/packaging/debian/control
index c20b978..fa2c78a 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,15 +3,15 @@ Section: net
 Priority: extra
 Maintainer: Jameson Graef Rollins <jrollins@finestructure.net>
 Uploaders: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.4.0)
+Build-Depends: debhelper (>= 7.0), socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail
 Standards-Version: 3.8.0.1
 Homepage: http://web.monkeysphere.info/
 Vcs-Git: git://git.monkeysphere.info/monkeysphere
 Dm-Upload-Allowed: yes
 
 Package: monkeysphere
-Architecture: any
-Depends: openssh-client, gnupg, coreutils (>= 6) | base64, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail, adduser, ${shlibs:Depends}
+Architecture: all
+Depends: openssh-client, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail, adduser, ${shlibs:Depends}
 Recommends: netcat | socat, ssh-askpass
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections
-- 
cgit v1.2.3


From 750314da835f95fa4db35e5715508c6a551dfac9 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Mar 2009 16:28:29 -0500
Subject: touching up changelog; switch ${shlibs:Depends} to ${misc:Depends} to
 mollify lintian.

---
 packaging/debian/changelog | 3 ++-
 packaging/debian/control   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 17e98e7..bef3c03 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -6,7 +6,8 @@ monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
     - no longer needs base64 in PATH
     - added "test" make target
     - improved transitions/0.23 script
-  * update/cleanup mainterscripts
+    - RSA only: no longer handles DSA keys
+  * update/cleanup maintainer scripts
   * remove GnuTLS dependency.
   * remove versioned coreutils | base64 dependency.
   * added Build-Deps for dh_autotest.
diff --git a/packaging/debian/control b/packaging/debian/control
index fa2c78a..6706cb9 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -11,7 +11,7 @@ Dm-Upload-Allowed: yes
 
 Package: monkeysphere
 Architecture: all
-Depends: openssh-client, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail, adduser, ${shlibs:Depends}
+Depends: openssh-client, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail, adduser, ${misc:Depends}
 Recommends: netcat | socat, ssh-askpass
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections
-- 
cgit v1.2.3


From 01cc7607ee14feb1b8ebc91c9a9e5bed92f7a413 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 1 Mar 2009 20:33:16 -0500
Subject: include bug number for fixing transition script issues.

---
 packaging/debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index bef3c03..8b3b922 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -5,7 +5,8 @@ monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
     - Now uses perl-based keytrans for both pem2openpgp and openpgp2ssh
     - no longer needs base64 in PATH
     - added "test" make target
-    - improved transitions/0.23 script
+    - improved transitions/0.23 script so it no longer fails in common
+      circumstances (Closes: #517779)
     - RSA only: no longer handles DSA keys
   * update/cleanup maintainer scripts
   * remove GnuTLS dependency.
-- 
cgit v1.2.3


From 6fb913f396e513148dd270c1ecca8eda537e50c6 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 2 Mar 2009 15:35:06 -0500
Subject: added ability to specify subkeys to add to agent with
 MONKEYSPHERE_SUBKEYS_FOR_AGENT variable.

---
 packaging/debian/changelog      |  4 ++-
 src/share/m/subkey_to_ssh_agent | 55 +++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 20 deletions(-)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 8b3b922..786d410 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -8,13 +8,15 @@ monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
     - improved transitions/0.23 script so it no longer fails in common
       circumstances (Closes: #517779)
     - RSA only: no longer handles DSA keys
+    - added ability to specify subkeys to add to ssh agent with
+      new MONKEYSPHERE_SUBKEYS_FOR_AGENT environment variable
   * update/cleanup maintainer scripts
   * remove GnuTLS dependency.
   * remove versioned coreutils | base64 dependency.
   * added Build-Deps for dh_autotest.
   * switch to Architecture: all
 
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Sun, 01 Mar 2009 11:47:41 -0500
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Mon, 02 Mar 2009 15:33:44 -0500
 
 monkeysphere (0.23.1-1) unstable; urgency=low
 
diff --git a/src/share/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent
index ec596bd..aa647a6 100644
--- a/src/share/m/subkey_to_ssh_agent
+++ b/src/share/m/subkey_to_ssh_agent
@@ -37,26 +37,34 @@ subkey_to_ssh_agent() {
     if [ "$sshaddresponse" = "2" ]; then
 	failure "Could not connect to ssh-agent"
     fi
-    
-    # get list of secret keys (to work around bug
-    # https://bugs.g10code.com/gnupg/issue945):
-    secretkeys=$(gpg_user --list-secret-keys --with-colons --fixed-list-mode \
-	--fingerprint | \
-	grep '^fpr:' | cut -f10 -d: | awk '{ print "0x" $1 "!" }')
-
-    if [ -z "$secretkeys" ]; then
-	failure "You have no secret keys in your keyring!
+
+    # if the MONKEYSPHERE_SUBKEYS_FOR_AGENT variable is set, use the
+    # keys specified there
+    if [ "$MONKEYSPHERE_SUBKEYS_FOR_AGENT" ] ; then
+	authsubkeys="$MONKEYSPHERE_SUBKEYS_FOR_AGENT"
+
+    # otherwise find all authentication-capable subkeys and use those
+    else
+	# get list of secret keys
+	# (to work around bug https://bugs.g10code.com/gnupg/issue945):
+	secretkeys=$(gpg_user --list-secret-keys --with-colons --fixed-list-mode \
+	    --fingerprint | \
+	    grep '^fpr:' | cut -f10 -d: | awk '{ print "0x" $1 "!" }')
+
+	if [ -z "$secretkeys" ]; then
+	    failure "You have no secret keys in your keyring!
 You might want to run 'gpg --gen-key'."
-    fi
+	fi
     
-    authsubkeys=$(gpg_user --list-secret-keys --with-colons --fixed-list-mode \
-	--fingerprint --fingerprint $secretkeys | \
-	cut -f1,5,10,12 -d: | grep -A1 '^ssb:[^:]*::[^:]*a[^:]*$' | \
-	grep '^fpr::' | cut -f3 -d: | sort -u)
-
-    if [ -z "$authsubkeys" ]; then
-	failure "no authentication-capable subkeys available.
-You might want to 'monkeysphere gen-subkey'"
+	authsubkeys=$(gpg_user --list-secret-keys --with-colons --fixed-list-mode \
+	    --fingerprint --fingerprint $secretkeys | \
+	    cut -f1,5,10,12 -d: | grep -A1 '^ssb:[^:]*::[^:]*a[^:]*$' | \
+	    grep '^fpr::' | cut -f3 -d: | sort -u)
+
+	if [ -z "$authsubkeys" ]; then
+	    failure "no authentication-capable subkeys available.
+You might want to run 'monkeysphere gen-subkey'."
+	fi
     fi
 
     workingdir=$(msmktempdir)
@@ -68,7 +76,16 @@ You might want to 'monkeysphere gen-subkey'"
     # through to ssh-add.  should we limit it to known ones?  For
     # example: -d or -c and/or -t <lifetime> 
 
-    for subkey in $authsubkeys; do 
+    for subkey in $authsubkeys; do
+	# test that the subkey has proper capability
+	capability=$(gpg_user --list-secret-keys --with-colons --fixed-list-mode \
+	    --fingerprint --fingerprint "0x${subkey}!" \
+	    | egrep -B 1 "^fpr:::::::::${subkey}:$" | grep "^ssb:" | cut -d: -f12)
+	if ! check_capability "$capability" 'a' ; then
+	    log error "Did not find authentication-capable subkey with key ID '$subkey'."
+	    continue
+	fi
+
 	# choose a label by which this key will be known in the agent:
 	# we are labelling the key by User ID instead of by
 	# fingerprint, but filtering out all / characters to make sure
-- 
cgit v1.2.3


From 75c24f110ed8509519a8377eefdcc2be8a61b04a Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 3 Mar 2009 19:40:35 -0500
Subject: add cron to Recommends

---
 packaging/debian/changelog | 13 +++++++------
 packaging/debian/control   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 786d410..245be1b 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,8 +1,8 @@
 monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
 
   * New upstream release:
-    - Fixed how version information is stored/retrieved.
-    - Now uses perl-based keytrans for both pem2openpgp and openpgp2ssh
+    - fixed how version information is stored/retrieved
+    - now uses perl-based keytrans for both pem2openpgp and openpgp2ssh
     - no longer needs base64 in PATH
     - added "test" make target
     - improved transitions/0.23 script so it no longer fails in common
@@ -11,12 +11,13 @@ monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
     - added ability to specify subkeys to add to ssh agent with
       new MONKEYSPHERE_SUBKEYS_FOR_AGENT environment variable
   * update/cleanup maintainer scripts
-  * remove GnuTLS dependency.
-  * remove versioned coreutils | base64 dependency.
-  * added Build-Deps for dh_autotest.
+  * remove GnuTLS dependency
+  * remove versioned coreutils | base64 dependency
+  * added Build-Deps for dh_autotest
   * switch to Architecture: all
+  * added cron to Recommends
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Mon, 02 Mar 2009 15:33:44 -0500
+ -- Jameson Graef Rollins <jrollins@finestructure.net>  Tue, 03 Mar 2009 19:38:33 -0500
 
 monkeysphere (0.23.1-1) unstable; urgency=low
 
diff --git a/packaging/debian/control b/packaging/debian/control
index 6706cb9..616a95a 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -12,7 +12,7 @@ Dm-Upload-Allowed: yes
 Package: monkeysphere
 Architecture: all
 Depends: openssh-client, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha1-perl, lockfile-progs | procmail, adduser, ${misc:Depends}
-Recommends: netcat | socat, ssh-askpass
+Recommends: netcat | socat, ssh-askpass, cron
 Enhances: openssh-client, openssh-server
 Description: use the OpenPGP web of trust to verify ssh connections
  SSH key-based authentication is tried-and-true, but it lacks a true
-- 
cgit v1.2.3


From e41e47bde4fe94e1503a9210dd3fef0c68bd491f Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 3 Mar 2009 21:56:17 -0500
Subject: prepare for 0.24 release

---
 packaging/debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packaging/debian/changelog')

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 245be1b..873b058 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,4 +1,4 @@
-monkeysphere (0.24~pre-1) UNRELEASED; urgency=low
+monkeysphere (0.24-1) unstable; urgency=low
 
   * New upstream release:
     - fixed how version information is stored/retrieved
-- 
cgit v1.2.3