[Pgp-tools-commit] r765 - in trunk: debian gpgsigs

[Guilhem Moulin]

Author: guilhem-guest
Date: 2015-01-22 22:48:36 +0000 (Thu, 22 Jan 2015)
New Revision: 765

Modified:
   trunk/debian/changelog
   trunk/debian/copyright
   trunk/gpgsigs/gpgsigs
Log:
gpgsigs: Add a legend with the different signature types.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2015-01-22 22:48:30 UTC (rev 764)
+++ trunk/debian/changelog	2015-01-22 22:48:36 UTC (rev 765)
@@ -13,6 +13,8 @@
       the public part of *all* keys found in the secret keyring.  (When not
       pruning the good keys with -u, gpg(1) croaks with exit status 2 when
       there are secret keys without public part.)
+  * gpgsigs:
+    + Add a legend with the different signature types.
   * caff, pgp-clean, pgp-fixkey, gpg-key2latex, gpg-key2ps, gpg-mailkeys,
     gpgdir, gpgparticipants, gpgsigs, keyart, keylookup:
     + Add the possibility to choose the gpg binary via the "GNUPGBIN"

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2015-01-22 22:48:30 UTC (rev 764)
+++ trunk/debian/copyright	2015-01-22 22:48:36 UTC (rev 765)
@@ -49,7 +49,7 @@
 Copyright: © 2004  Uli Martens <uli at youam.net>
            © 2004-2005  Peter Palfrader <peter at palfrader.org>
            © 2004-2007  Christoph Berg <cb at df7cb.de>
-           © 2014  Guilhem Moulin <guilhem at guilhem.org>
+           © 2014-2015  Guilhem Moulin <guilhem at guilhem.org>
 License: BSD-3-clause
 
 Files: gpgwrap/*

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2015-01-22 22:48:30 UTC (rev 764)
+++ trunk/gpgsigs/gpgsigs	2015-01-22 22:48:36 UTC (rev 765)
@@ -38,7 +38,7 @@
   (c) 2004 Uli Martens <uli\@youam.net>
   (c) 2004, 2005 Peter Palfrader <peter\@palfrader.org>
   (c) 2004, 2005, 2006, 2007 Christoph Berg <cb\@df7cb.de>
-  (c) 2014 Guilhem Moulin <guilhem\@guilhem.org>
+  (c) 2014, 2015 Guilhem Moulin <guilhem\@guilhem.org>
 EOF
 }
 
@@ -255,6 +255,7 @@
 }
 warn "Parsing gpg's output went wrong.\n" if $oldstdout or $oldstatus;
 waitpid $pid, 0;
+die if $?;
 close $_ for ($stdout, $status);
 
 my $photosfd;
@@ -314,11 +315,15 @@
 				if (@sigs) {
 					# we take the one with the best level
 					@sigs = sort { $a->{class} cmp $b->{class} } @sigs;
-					$class = (pop @sigs)->{class};
-					$class =~ s/1([0-3])./$1/;
-					$class ||= 'S';
+					my $s = pop @sigs;
+					if ($s->{expiring}) {
+						$class = 'x';
+					}
+					else {
+						$class = $s->{class} =~ s/1([0-3])./$1/r;
+						$class = 'S' if $class eq '0';
+					}
 				} else {
-					# XXX add an option to mark local sigs as exportable ones
 					$class = 's';
 				}
 			}
@@ -467,6 +472,7 @@
 	}
 	print WRITE;
 }
+close TXT;
 
 if ($latex and $keys > 0) {
 	print WRITE "\\end{samepage}\n";
@@ -475,18 +481,31 @@
 print WRITE "Legend:\n";
 my $num_myuids = 0;
 foreach my $i (0 .. $#mykeys) {
-	print WRITE '(' . ' 'x$i . 'S' . ' 'x(@mykeys-$i-1) . ") signed with $mykeys[$i] $uids{$mykeys[$i]}->{$keys{$mykeys[$i]}->[0]}->{text}\n";
+	print WRITE '  (' . ' 'x$i . 'S' . ' 'x(@mykeys-$i-1) . ") signed with $mykeys[$i] $uids{$mykeys[$i]}->{$keys{$mykeys[$i]}->[0]}->{text}\n";
 	$num_myuids += @{$keys{$mykeys[$i]}};
 }
 my $i = 0;
 foreach my $mykey (@mykeys) {
 	foreach my $myuid (@{$keys{$mykey}}) {
-		print WRITE "[" . ' 'x$i . 'S' . ' 'x($num_myuids-$i-1) . "] has signed $mykey $uids{$mykey}->{$myuid}->{text}\n";
+		print WRITE "  [" . ' 'x$i . 'S' . ' 'x($num_myuids-$i-1) . "] has signed $mykey $uids{$mykey}->{$myuid}->{text}\n";
 		$i++;
 	}
 }
-close TXT;
 
+print WRITE <<'EOF';
+
+Signature types:
+  R  Revoked signature
+  X  Expired signature
+  s  Local (non-exportable) signature
+  x  Exportable signature with an expiration date in the future
+  S  Non-expiring, exportable signature with certification level 0
+  1  Non-expiring, exportable signature with certification level 1
+  2  Non-expiring, exportable signature with certification level 2
+  3  Non-expiring, exportable signature with certification level 3
+EOF
+
+
 if ($latex) {
 	print WRITE <<'EOF';
 \end{alltt}
@@ -586,7 +605,7 @@
 =head1 BUGS
 
 B<GnuPG> is known to change its output format quite often. This version has
-been tested with gpg 1.2.5 and gpg 1.4.1. YMMV.
+been tested with gpg 1.4.18 and gpg 2.0.26. YMMV.
 
 =head1 SEE ALSO
 
@@ -602,7 +621,7 @@
 
 (c) 2004, 2005, 2006, 2007 Christoph Berg <cb at df7cb.de>
 
-(c) 2014 Guilhem Moulin <guilhem at guilhem.org>
+(c) 2014, 2015 Guilhem Moulin <guilhem at guilhem.org>
 
 =head1 LICENSE