[Pkg-privacy-commits] [monkeysphere] 03/03: fix monkeysphere-host revoke-key (Closes: #607596)

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian_0.31
in repository monkeysphere.

commit 7e5d57f1a2cb5a05428ffca6701dc01bf7c7aeaf
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Dec 19 22:06:13 2010 -0500

    fix monkeysphere-host revoke-key (Closes: #607596)
---
 debian/changelog           |  6 ++++++
 debian/patches/607596.diff | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b03dff7..f150c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monkeysphere (0.31-4) unstable; urgency=low
+
+  * fix monkeysphere-host revoke-key (Closes: #607596)
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Sun, 19 Dec 2010 22:04:03 -0500
+
 monkeysphere (0.31-3) unstable; urgency=high
 
   * avoid mis-escaping uids, fixes a security issue. (Closes: #600304)
diff --git a/debian/patches/607596.diff b/debian/patches/607596.diff
new file mode 100644
index 0000000..d2c525c
--- /dev/null
+++ b/debian/patches/607596.diff
@@ -0,0 +1,33 @@
+commit d37829e6c2dfdcac912a9d6e9203e62343f3dd01
+Author: Micah Anderson <micah at riseup.net>
+Date:   Fri Oct 1 10:07:46 2010 -0400
+
+    fix revoke_key typo in creating temporary directory
+    fix variable specifying which key to revoke
+    
+    monkeysphere-host revoke-key <key-id> would produce the following errors, this
+    commit fixes that:
+    
+    Really publish this cert to zimmermann.mayfirst.org ? (Y/n) y
+    /usr/share/monkeysphere/mh/revoke_key: line 96: mkmstempdir: command not found
+    gpg: new configuration file `/root/.gnupg/gpg.conf' created
+    gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run
+    gpg: "0x!" not a key ID: skipping
+
+diff --git a/src/share/mh/revoke_key b/src/share/mh/revoke_key
+index 5a013e0..9077e4c 100644
+--- a/src/share/mh/revoke_key
++++ b/src/share/mh/revoke_key
+@@ -93,10 +93,10 @@ y
+ 	if [ "${really/n/N}" = 'N' ] ; then
+ 	    printf "Not publishing.\n" >&2
+ 	else
+-	    local newhome=$(mkmstempdir)
++	    local newhome=$(msmktempdir)
+ 	    GNUPGHOME="$newhome" gpg --no-tty --quiet --import < "$HOST_KEY_FILE"
+ 	    GNUPGHOME="$newhome" gpg --no-tty --quiet --import <<< "$revcert"
+-	    GNUPGHOME="$newhome" gpg --keyserver "$KEYSERVER" --send "0x${HOST_FINGERPRINT}!"
++	    GNUPGHOME="$newhome" gpg --keyserver "$KEYSERVER" --send "0x${keyID}!"
+ 	    rm -rf "$newhome"
+ 	fi
+     fi
diff --git a/debian/patches/series b/debian/patches/series
index af8e9c7..6a5bbad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 591118.diff
 600304.diff
+607596.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/monkeysphere.git