[Pgp-tools-commit] r73 - in trunk: debian gpg-key2ps gpg-mailkeys
Thijs Kinkhorst
kink-guest at costa.debian.org
Sat Jun 25 14:35:10 UTC 2005
Author: kink-guest
Date: 2005-06-25 14:35:09 +0000 (Sat, 25 Jun 2005)
New Revision: 73
Modified:
trunk/debian/changelog
trunk/gpg-key2ps/gpg-key2ps
trunk/gpg-mailkeys/gpg-mailkeys
Log:
* gpg-key2ps now works with revoked subkeys, thanks Christof Douma
(Closes: #311990).
* Every tool now uses $Rev$ as the version.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-20 16:51:24 UTC (rev 72)
+++ trunk/debian/changelog 2005-06-25 14:35:09 UTC (rev 73)
@@ -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 at 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
Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps 2005-06-20 16:51:24 UTC (rev 72)
+++ trunk/gpg-key2ps/gpg-key2ps 2005-06-25 14:35:09 UTC (rev 73)
@@ -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 @@
/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 @@
/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 @@
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 @@
-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
Modified: trunk/gpg-mailkeys/gpg-mailkeys
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys 2005-06-20 16:51:24 UTC (rev 72)
+++ trunk/gpg-mailkeys/gpg-mailkeys 2005-06-25 14:35:09 UTC (rev 73)
@@ -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."
More information about the Pgp-tools-commit
mailing list