From 7aa9067b4694d42b3b7a63a65ea70b74fed5b363 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 20 Dec 2009 11:52:09 -0500 Subject: [PATCH] fix ms Issue #1536 for gpg edit/addkey UI change gnupg apparently changed their edit-key/addkey function ordering such that the monkeysphere gen-subkey subcommand was creating DSA authentication subkeys instead of RSA subkeys. DSA subkeys are not supported by the ms key translation utilities, so this is a big problem. This patch fixes the problem, but it means that we have require gnupg >=1.4.10 from now on, or at least until gnupg changes their UI again for no good reason. --- packaging/debian/changelog | 11 ++++++----- packaging/debian/control | 4 ++-- src/share/m/gen_subkey | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index dc0c8f4..e61220b 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,12 +1,13 @@ -monkeysphere (0.26-2) UNRELEASED; urgency=low +monkeysphere (0.27-1) UNRELEASED; urgency=low - [ Daniel Kahn Gillmor ] + * New upstream release: + - fixed monkeysphere gen-subkey subcommand that was erroneously + creating DSA subkeys due to unannounced change in gpg edit-key UI. * updated debian/copyright to match the latest revision of DEP5. - - [ Jameson Graef Rollins ] * updated standards version to 3.8.3 + * updated Depends to require >=1.4.10 due to gpg UI change. - -- Jameson Graef Rollins Sat, 19 Dec 2009 20:56:40 -0500 + -- Jameson Graef Rollins Sun, 20 Dec 2009 11:50:06 -0500 monkeysphere (0.26-1) unstable; urgency=low diff --git a/packaging/debian/control b/packaging/debian/control index ef30ffb..5bda6c6 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Maintainer: Jameson Graef Rollins Uploaders: Daniel Kahn Gillmor -Build-Depends: debhelper (>= 7.0), socat, openssh-server, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail +Build-Depends: debhelper (>= 7.0), socat, openssh-server, gnupg (>=1.4.10), libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail Standards-Version: 3.8.3 Homepage: http://web.monkeysphere.info/ Vcs-Git: git://git.monkeysphere.info/monkeysphere @@ -11,7 +11,7 @@ Dm-Upload-Allowed: yes Package: monkeysphere Architecture: all -Depends: openssh-client, gnupg, libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail, adduser, ${misc:Depends} +Depends: openssh-client, gnupg (>=1.4.10), libcrypt-openssl-rsa-perl, libdigest-sha-perl, lockfile-progs | procmail, adduser, ${misc:Depends} Recommends: netcat | socat, ssh-askpass, cron Enhances: openssh-client, openssh-server Description: use the OpenPGP web of trust to verify ssh connections diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey index 05004f6..a90c618 100644 --- a/src/share/m/gen_subkey +++ b/src/share/m/gen_subkey @@ -45,7 +45,7 @@ Type '$PGRM help' for usage." # generate the list of commands that will be passed to edit-key editCommands="addkey -7 +8 S E A -- 2.25.1