[Pgp-tools-commit] r149 - in trunk: caff debian
Thijs Kinkhorst
kink-guest at costa.debian.org
Wed Jul 27 10:14:31 UTC 2005
Author: kink-guest
Date: 2005-07-27 10:14:30 +0000 (Wed, 27 Jul 2005)
New Revision: 149
Modified:
trunk/caff/caff
trunk/debian/changelog
Log:
+ let caff import keys from file, thanks Jon Aslund (Closes: #318744).
Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff 2005-07-27 10:11:20 UTC (rev 148)
+++ trunk/caff/caff 2005-07-27 10:14:30 UTC (rev 149)
@@ -85,6 +85,10 @@
Select the key that is used for signing, in case you have more than one key.
+=item B<--key-file> I<file>
+
+Import keys from file. Can be supplied more than once.
+
=back
=head1 FILES
@@ -169,6 +173,10 @@
If true, then skip the step of fetching keys from the keyserver.
Default: B<0>.
+=item B<key-files> [list of files]
+
+A list of files containing keys to be imported.
+
=head2 Signing settings
=item B<no-sign> [boolean]
@@ -282,6 +290,7 @@
$CONFIG{'secret-keyring'} = $ENV{'HOME'}.'/.gnupg/secring.gpg' unless defined $CONFIG{'secret-keyring'};
$CONFIG{'no-download'} = 0 unless defined $CONFIG{'no-download'};
$CONFIG{'no-sign'} = 0 unless defined $CONFIG{'no-sign'};
+ $CONFIG{'key-files'} = () unless defined $CONFIG{'key-files'};
$CONFIG{'mail-template'} = <<'EOM' unless defined $CONFIG{'mail-template'};
Hi,
@@ -717,6 +726,7 @@
'--no-download' => \$params->{'no-download'},
'-S' => \$params->{'no-sign'},
'--no-sign' => \$params->{'no-sign'},
+ '--key-file=s@' => \$params->{'key-files'},
)) {
usage(\*STDERR, 1);
};
@@ -758,6 +768,7 @@
$CONFIG{'no-mail'} = $params->{'no-mail'} if defined $params->{'no-mail'};
$CONFIG{'mail'} = $params->{'mail'} if defined $params->{'mail'};
$CONFIG{'no-sign'} = $params->{'no-sign'} if defined $params->{'no-sign'};
+push @{$CONFIG{'key-files'}}, @{$params->{'key-files'}} if defined $params->{'key-files'};
#################
@@ -793,6 +804,24 @@
}
}
+########################
+# import keys from files
+########################
+foreach my $keyfile (@{$CONFIG{'key-files'}}) {
+ my $gpg = GnuPG::Interface->new();
+ $gpg->call( $CONFIG{'gpg'} );
+ $gpg->options->hash_init('homedir' => $GNUPGHOME);
+ $gpg->options->meta_interactive( 0 );
+ my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
+ my $pid = $gpg->import_keys(handles => $handles, command_args => $keyfile);
+ my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
+ info ("Importing keys from $keyfile");
+ waitpid $pid, 0;
+ if ($status !~ /^\[GNUPG:\] IMPORT_OK/m) {
+ warn $stderr;
+ }
+}
+
#############################
# receive keys from keyserver
#############################
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-27 10:11:20 UTC (rev 148)
+++ trunk/debian/changelog 2005-07-27 10:14:30 UTC (rev 149)
@@ -12,9 +12,10 @@
+ allows to BCC the signer, thanks Joost van Baal (Closes: #316176).
+ new option to pause before continuing to the signing step,
thanks Christof Douma (Closes: #316129).
- + Create unique attachment filenames, thanks Robin H. Johnson
+ + create unique attachment filenames, thanks Robin H. Johnson
(Closes: #318469).
- + Improve error when using xargs, thanks Lior Kaplan (Closes: #319519).
+ + improve error when using xargs, thanks Lior Kaplan (Closes: #319519).
+ + let caff import keys from file, thanks Jon Åslund (Closes: #318744).
* Depend on libtext-template-perl as caff needs it.
* Update to Standards-Version 3.6.2, no changes necessary.
More information about the Pgp-tools-commit
mailing list