[Pgp-tools-commit] r365 - in trunk: caff debian

[thijs at alioth.debian.org]

Author: thijs
Date: 2008-03-05 16:28:31 +0000 (Wed, 05 Mar 2008)
New Revision: 365

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
Proposed solution for #462897: unconditionally sync keys between normal gnupg
home and caff gnupg home on startup, to cope with changed keys.


Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2008-03-05 16:15:28 UTC (rev 364)
+++ trunk/caff/caff	2008-03-05 16:28:31 UTC (rev 365)
@@ -946,22 +946,7 @@
 # import own keys
 #################
 for my $keyid (@{$CONFIG{'keyid'}}) {
-	my $gpg = GnuPG::Interface->new();
-	$gpg->call( $CONFIG{'gpg'} );
-	$gpg->options->hash_init(
-		'homedir' => $GNUPGHOME,
-		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-list-mode --fast-list-mode } ] );
-	$gpg->options->meta_interactive( 0 );
-	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
-	my $pid = $gpg->list_public_keys(handles => $handles, command_args => $keyid);
-	my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
-	waitpid $pid, 0;
-
-	if ($stdout eq '') {
-		warn ("No data from gpg for list-key\n"); # There should be at least 'tru:' everywhere.
-	};
-	unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
-		info("Key $keyid not found in caff's home.  Getting it from your normal GnuPGHome.");
+		info("Importing key $keyid from your normal GnuPGHome.");
 		my $key = export_key(undef, $keyid);
 		if (!defined $key || $key eq '') {
 			warn ("Did not get key $keyid from your normal GnuPGHome\n");
@@ -972,7 +957,6 @@
 			warn ("Could not import $keyid into caff's gnupghome.\n");
 			next;
 		};
-	}
 }
 
 ########################

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-05 16:15:28 UTC (rev 364)
+++ trunk/debian/changelog	2008-03-05 16:28:31 UTC (rev 365)
@@ -12,8 +12,10 @@
   * gpgparticipants: new script to create a participant list useful for
     party organisers using the Zimmermann-Sassaman key-signing protocol.
     Thanks Philippe Teuwen (Closes: #467338).
+  * caff: always update the user's key from their GnuPG home, to adequately
+    cope with changed keys (Closes: #462897).
 
- -- Thijs Kinkhorst <thijs at debian.org>  Wed, 05 Mar 2008 17:08:59 +0100
+ -- Thijs Kinkhorst <thijs at debian.org>  Wed, 05 Mar 2008 17:27:01 +0100
 
 signing-party (0.4.13-1) unstable; urgency=low