[Pgp-tools-commit] r393 - in trunk: debian gpg-key2ps
thijs at alioth.debian.org
thijs at alioth.debian.org
Sat Jul 19 08:04:08 UTC 2008
Author: thijs
Date: 2008-07-19 08:04:08 +0000 (Sat, 19 Jul 2008)
New Revision: 393
Modified:
trunk/debian/changelog
trunk/debian/copyright
trunk/gpg-key2ps/README
trunk/gpg-key2ps/gpg-key2ps
Log:
We don't need subkey info on a fingerprint slip, so don't include it by
default anymore, but can be reenabled with --show-subkeys. Update gpg-key2ps
man page & copyright info.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-07-18 16:16:01 UTC (rev 392)
+++ trunk/debian/changelog 2008-07-19 08:04:08 UTC (rev 393)
@@ -2,7 +2,10 @@
[ Thijs Kinkhorst ]
* Checked for policy 3.8.0, no changes.
- * Fix pod syntax problems in caff (Closes: #485653).
+ * caff: Fix pod syntax problems (Closes: #485653).
+ * gpg-key2ps: no longer waste paper on the subkey information by
+ default. It's not relevant to the keysigning process, but added
+ option to enable if you want it.
[ Christoph Berg ]
* Import keyanalyze into signing-party. Thanks to Matthew Wilcox for the
@@ -16,7 +19,7 @@
* Put examples in .../examples/$prog, not the other way round.
* Use dh_lintian.
- -- Christoph Berg <myon at debian.org> Fri, 18 Jul 2008 15:41:28 +0200
+ -- Thijs Kinkhorst <thijs at debian.org> Sat, 19 Jul 2008 10:01:19 +0200
signing-party (1.0-2) unstable; urgency=low
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2008-07-18 16:16:01 UTC (rev 392)
+++ trunk/debian/copyright 2008-07-19 08:04:08 UTC (rev 393)
@@ -12,8 +12,8 @@
(c) 2004 Uli Martens <uli at youam.net>
(c) 2004-2008 Christoph Berg <cb at df7cb.de>
(c) 2001-2005 Simon Richter <sjr at debian.org>
- (c) 2005, 2006, 2007 Thijs Kinkhorst <thijs at debian.org>
- (c) 2000, 2002 Christian Kurz <shorty at debian.org>
+ (c) 2005-2008 Thijs Kinkhorst <thijs at debian.org>
+ (c) 2000, 2002 Christian Kurz <shorty at debian.org>
sig2dot and springgraph were originally written by:
(c) 2002 Darxus at ChaosReigns.com
Modified: trunk/gpg-key2ps/README
===================================================================
--- trunk/gpg-key2ps/README 2008-07-18 16:16:01 UTC (rev 392)
+++ trunk/gpg-key2ps/README 2008-07-19 08:04:08 UTC (rev 393)
@@ -1,7 +1,7 @@
gpg-key2ps
----------
-Usage: gpg-key2ps [-p papersize] [-r revoked-style] [-1] keyid-or-name
+Usage: gpg-key2ps [-p papersize] [-r revoked-style] [-1] [-s] keyid-or-name
revoked-style is one of:
grey - Print text in grey
@@ -25,7 +25,7 @@
COPYRIGHT & LICENSE
-------------------
-Copyright (C) 2001-2007 Simon Richter and Thijs Kinkhorst
+Copyright (C) 2001-2008 Simon Richter and Thijs Kinkhorst
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/gpg-key2ps/gpg-key2ps
===================================================================
--- trunk/gpg-key2ps/gpg-key2ps 2008-07-18 16:16:01 UTC (rev 392)
+++ trunk/gpg-key2ps/gpg-key2ps 2008-07-19 08:04:08 UTC (rev 393)
@@ -2,7 +2,7 @@
#
# gpg-key2ps: convert a PGP/GnuPG key into paper slips.
# Copyright (C) 2001-2005 Simon Richter
-# Copyright (C) 2005-2007 Thijs Kinkhorst
+# Copyright (C) 2005-2008 Thijs Kinkhorst
# Copyright (C) 2005-2008 Christoph Berg <cb at df7cb.de>
# Licenced under the GNU General Public License,
# version 2 or later.
@@ -14,6 +14,7 @@
my $version = '$Rev$';
$version =~ s/\$Rev:\s*(\d+)\s*\$/$1/;
+my $showsubkeys = 0;
my $revokestyle = "hide";
my $columns = 2;
my $creationdate = scalar(localtime);
@@ -27,9 +28,10 @@
my ($fd, $exitcode) = @_;
version ($fd);
print $fd <<EOF;
-Usage: $0 [-p papersize] [-r revoked-style] [-1] keyid-or-name ...
+Usage: $0 [-p papersize] [-r revoked-style] [-1] [-s] keyid-or-name ...
Options:
-p --paper-size
+ -s --show-subkeys
-r --revoked-style
hide - Don't show revoked uids and subkeys (default)
grey - Print text in grey
@@ -51,6 +53,8 @@
'--help' => \$opts->{help},
'-v' => \$opts->{version},
'--version' => \$opts->{version},
+ '-s' => \$opts->{showsubkeys},
+ '--show-subkeys' => \$opts->{showsubkeys},
'-p=s' => \$opts->{papersize},
'--paper-size=s' => \$opts->{papersize},
'-r=s' => \$opts->{revokestyle},
@@ -69,8 +73,9 @@
exit 0;
}
+if ( $opts->{papersize} ) { $ENV{'PAPERSIZE'} = $opts->{papersize}; }
+if ( $opts->{showsubkeys} ) { $showsubkeys = 1; }
if ( $opts->{revokestyle} ) { $revokestyle = $opts->{revokestyle}; }
-if ( $opts->{papersize} ) { $ENV{'PAPERSIZE'} = $opts->{papersize}; }
if ( $revokestyle !~ /^(grey|hide|note|show|strike)$/ ) {
print STDERR "Unknown revoked-style \"$revokestyle\".\n";
@@ -255,9 +260,11 @@
next if $revokestyle eq "hide";
}
# subkey
- s/^sub:[^r:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/ ($4) ($3) $2 ($1) sbk/;
+ if (s/^sub:[^r:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/ ($4) ($3) $2 ($1) sbk/) {
+ next if ! $showsubkeys;
+ }
if (s/^sub:r[^:]*:([^:]*):([0-9]*):.{8,8}(.{8,8}):([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:.*/ ($4) ($3) $2 ($1) revsbk/) {
- next if $revokestyle eq "hide";
+ next if (!$showsubkeys) || $revokestyle eq "hide";
}
$numlines++;
# print this line
@@ -323,7 +330,7 @@
=head1 SYNOPSIS
-B<gpg-key2ps> [B<-r> I<revoked-style>] [B<-p> I<papersize>] I<keyid-or-name> [ I<...> ]
+B<gpg-key2ps> [B<-r> I<revoked-style>] [B<-p> I<papersize>] [B<-1>] [B<-s>] I<keyid-or-name> [ I<...> ]
=head1 DESCRIPTION
@@ -341,6 +348,11 @@
Select the output paper size. Default is to look into /etc/papersize or A4 if
libpaper isn't installed.
+=item B<-s> B<--show-subkeys>
+
+Enable subkey information to be printed on the slips. Subkey information is
+normally not relevant to the key signing process.
+
=item B<-r> B<--revoked-style> I<revoked-style>
Select how to mark revoked UIDs and subkeys. Five styles are available:
@@ -350,6 +362,11 @@
B<note> add "[revoked]", and
B<strike> strike through.
+=item B<-1>
+
+Print only one column of paper slips instead of the default two. Useful for keys
+with long UIDs that otherwise won't fit.
+
=item I<keyid>
Keyids to print. Multiple can be separated by spaces.
@@ -390,7 +407,7 @@
=item (c) 2001-2005 Simon Richter <sjr at debian.org>
-=item (c) 2005-2007 Thijs Kinkhorst <thijs at kinkhorst.com>
+=item (c) 2005-2008 Thijs Kinkhorst <thijs at kinkhorst.com>
=item (c) 2005-2008 Christoph Berg <cb at df7cb.de>
More information about the Pgp-tools-commit
mailing list