From e348439be6e8237d8a22901dc82c3f6ff86c6fb0 Mon Sep 17 00:00:00 2001
From: kink-guest <kink-guest@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Sat, 25 Jun 2005 14:35:09 +0000
Subject: [PATCH] * gpg-key2ps now works with revoked subkeys, thanks Christof
 Douma   (Closes: #311990). * Every tool now uses $Rev$ as the version.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@73 b513b33f-fedd-0310-b452-c3deb5f4c849
---
 debian/changelog          |  7 +++++++
 gpg-key2ps/gpg-key2ps     | 16 ++++++++++------
 gpg-mailkeys/gpg-mailkeys |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a46644..0aaa1c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+signing-party (0.4.1-1) unstable; urgency=low
+
+  * gpg-key2ps now works with revoked subkeys, thanks Christof Douma
+    (Closes: #311990).
+
+ -- Thijs Kinkhorst <kink@squirrelmail.org>  Sat, 25 Jun 2005 16:27:42 +0200
+
 signing-party (0.4.0-1) unstable; urgency=low
 
   * Merging signing-party with pgp-tools, now contains caff
diff --git a/gpg-key2ps/gpg-key2ps b/gpg-key2ps/gpg-key2ps
index fab1936..74e3953 100755
--- a/gpg-key2ps/gpg-key2ps
+++ b/gpg-key2ps/gpg-key2ps
@@ -6,7 +6,7 @@
 
 set -e
 
-VERSION="0.4.0"
+VERSION='$Rev$'
 USAGE="Usage: $0 [-p papersize] [-r revoked-style] keyid-or-name"
 
 
@@ -118,10 +118,15 @@ cat <<EOF
 	/condhline { } def
 } def
 
+/showAlgorithm {
+  << 16 (g) 17 (D) 1 (R) >> exch get
+  show
+} def
+
 /pub {
 	condhline
 	50 y moveto (pub) show
-	70 y moveto show show (/) show show
+	70 y moveto show showAlgorithm (/) show show
 	150 y moveto show
 	200 y moveto show
 	newline
@@ -174,7 +179,7 @@ cat <<EOF
 
 /sbk {
 	50 y moveto (sub) show
-	70 y moveto show show (/) show show
+	70 y moveto show showAlgorithm (/) show show
 	150 y moveto show
 	newline
 } def
@@ -184,8 +189,7 @@ cat <<EOF
 EOF
 sed -e '/^tru:/d' \
     -e '/^uat:/d' \
-    -e 's/^pub:[^:]*:\([^:]*\):1:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:.*/	(\4) (\3) (\2) (R) (\1) pub/' \
-    -e 's/^pub:[^:]*:\([^:]*\):17:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:.*/	(\4) (\3) (\2) (D) (\1) pub/' \
+    -e 's/^pub:[^:]*:\([^:]*\):\([0-9]*\):.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:.*/	(\5) (\4) (\3) \2 (\1) pub/' \
     -e 's/^fpr:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/	(\1) fpr/' \
     -e 's/(\(.\{16,16\}\)\(.\{16,16\}\)) fpr/(@split@\1@  @split@\2@) fpr/' \
     -e 's/@split@\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)\(.\{2,2\}\)@/\1 \2 \3 \4 \5 \6 \7 \8/g' \
@@ -193,7 +197,7 @@ sed -e '/^tru:/d' \
     -e 's/@split@\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)\(.\{4,4\}\)@/\1 \2 \3 \4 \5/g' \
     -e 's/^uid:[^:r]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/	(\1) uid/' \
     -e 's/^uid:r[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\):.*/	(\1) revuid/' \
-    -e 's/^sub:[^:]*:\([^:]*\):16:.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	(\3) (\2) (g) (\1) sbk/' \
+    -e 's/^sub:[^:]*:\([^:]*\):\([0-9]*\):.\{8,8\}\(.\{8,8\}\):\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/	(\4) (\3) \2 (\1) sbk/' \
     <$TMPFILE
 cat <<EOF
 } def
diff --git a/gpg-mailkeys/gpg-mailkeys b/gpg-mailkeys/gpg-mailkeys
index 534eb7e..2eaeac0 100755
--- a/gpg-mailkeys/gpg-mailkeys
+++ b/gpg-mailkeys/gpg-mailkeys
@@ -6,7 +6,7 @@
 
 set -e
 
-VERSION="0.4.0"
+VERSION='$Rev$'
 
 if [ -z "$*" ]; then
 	echo "Send people their newly signed GPG key by mail."
-- 
2.39.5