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

[myon at alioth.debian.org]

Author: myon
Date: 2007-09-16 22:12:15 +0000 (Sun, 16 Sep 2007)
New Revision: 351

Modified:
   trunk/debian/changelog
   trunk/gpgsigs/gpgsigs
Log:
  (Closes: #412433, #430607)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-09-16 21:31:41 UTC (rev 350)
+++ trunk/debian/changelog	2007-09-16 22:12:15 UTC (rev 351)
@@ -2,11 +2,11 @@
 
   [ Christoph Berg ]
   * gpgsigs: Implement support for latex output and photo ids.
-    (Closes: #430607)
+    (Closes: #412433, #430607)
   * gpg-key2ps: Mention http://www.debian.org/events/materials/business-cards/
     as an alternative. (Closes: #439510)
 
- -- Christoph Berg <myon at debian.org>  Sun, 16 Sep 2007 23:30:21 +0200
+ -- Christoph Berg <myon at debian.org>  Mon, 17 Sep 2007 00:10:45 +0200
 
 signing-party (0.4.12-1) unstable; urgency=low
 

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2007-09-16 21:31:41 UTC (rev 350)
+++ trunk/gpgsigs/gpgsigs	2007-09-16 22:12:15 UTC (rev 351)
@@ -150,7 +150,7 @@
 open SIGS, "gpg --fixed-list-mode --with-colons --list-sigs @mykeys @keys 2>/dev/null |"
 	or die "can't get gpg listing";
 
-my ($key, $uid, $sigs, $uidstatus);
+my ($key, $uid, $sigs);
 while (<SIGS>) {
 	if ( m/^pub:(?:.*?:){3,3}([0-9A-F]{16,16}):/ ) {
 		$key = $1;
@@ -158,24 +158,26 @@
 		next;
 	}
 	if ( m/^uid:(.):(?:.*?:){7,7}(.*):/s ) {
-		$uidstatus = $1;
+		my $uidstatus = $1;
 		$uid = $2;
 		$uid =~ s/\\x([0-9a-f][0-9a-f])/ chr(hex($1)) /gie;
 		$uid = myrecode($uid, "UTF-8", $charset);
 
 		my ($shortkey) = substr $key, -8;
 		# Remember non-revoked uids
-		if ($uidstatus ne "r") {
-			push @{$uids{$shortkey}}, $uid;
-		}
-
+		next if $uidstatus eq "r";
+		push @{$uids{$shortkey}}, $uid;
 		next;
 	}
-	if ( m/^uat:(.):/ ) { # uat:-::::2006-08-03::27BAEAF742BD253C2F3F03B043DC1536880193C4::1 7993:
-		$uidstatus = $1;
-		next if $uidstatus ne "-";
-		system "gpg --photo-viewer 'convert - %k.eps' --list-options show-photos --list-key $key";
-		$uid = "Photo ID";
+	if ( m/^uat:(.)::::[^:]+::([0-9A-F]+)::\d+ (\d+)/ ) { # uat:-::::2006-08-03::27BAEAF742BD253C2F3F03B043DC1536880193C4::1 7993:
+		my $uidstatus = $1;
+		# $2 is hash of attribute data
+		my $size = $3 - 19; # FIXME: find a nicer way to find out picture size
+		$uid = "[jpeg image of size $size]";
+		next if $uidstatus eq "r";
+		if ($latex) {
+			system "gpg --photo-viewer 'convert - %k.eps' --list-options show-photos --list-key $key > /dev/null";
+		}
 		my ($shortkey) = substr $key, -8;
 		push @{$uids{$shortkey}}, $uid;
 		next;
@@ -329,7 +331,7 @@
 		if ($refresh or $latex) {
 			foreach $uid (@{$uids{$key}}) {
 				print WRITE print_tag($key, $uid) . " $uid\n";
-				if ($latex and ($uid eq "Photo ID")) {
+				if ($latex and ($uid =~ /^\[jpeg image/)) {
 					print WRITE "\\begin{flushright}\n";
 					print WRITE "\\includegraphics[height=3cm]{$key.eps}\n";
 					print WRITE "\\end{flushright}\n";