Bug#392811: patch to support proxies in caff

[Peter Nuttall]

Package: signing-party
Version: 0.4.8 

Hello, 

Since caff doesn't seem to support proxies, and gpg does, I have
patched caff to have a "keyserver-options" bit in .caffrc and to pass
that to gpg. The patch is against the 0.4.8 tarball. I can patch the
development version as well if you like. 

Thanks

Pete


--- signing-party-0.4.8/caff/caff       2006-10-13 16:52:46.178998088 +0100
+++ caff        2006-10-13 16:53:19.549924936 +0100
@@ -405,6 +405,10 @@
 # Select this/these keys to sign with
 #\$CONFIG{'local-user'} = [ [EMAIL PROTECTED] ];
 
+# If you want to pass keyserver options to gpg, for example if you wish to use 
a proxy, do this:
+# \$CONFIG{'keyserver-options'} =['http-proxy="http://wwwcache:8080/";'];
+
+
 # Additionally encrypt messages for these keyids
 #\$CONFIG{'also-encrypt-to'} = [ [EMAIL PROTECTED] ];
 
@@ -459,6 +463,11 @@
        @{$CONFIG{'keyid'}} = map { uc } @{$CONFIG{'keyid'}};
        $CONFIG{'export-sig-age'}= 24*60*60 unless defined 
$CONFIG{'export-sig-age'};
        $CONFIG{'keyserver'} = 'subkeys.pgp.net' unless defined 
$CONFIG{'keyserver'};
+       if (defined $CONFIG{'keyserver-options'}){
+           $CONFIG{'keyserver-options'} = ['--keyserver-options', 
@{$CONFIG{'keyserver-options'}}];
+       } else {
+           $CONFIG{'keyserver-options'} = [];
+       } ;
        $CONFIG{'gpg'} = 'gpg' unless defined $CONFIG{'gpg'};
        $CONFIG{'gpg-sign'} = $CONFIG{'gpg'} unless defined $CONFIG{'gpg-sign'};
        $CONFIG{'gpg-delsig'} = $CONFIG{'gpg'} unless defined 
$CONFIG{'gpg-delsig'};
@@ -984,7 +993,7 @@
        $gpg->call( $CONFIG{'gpg'} );
        $gpg->options->hash_init(
                'homedir' => $GNUPGHOME,
-               'extra_args' => [ qw{ --no-auto-check-trustdb 
--trust-model=always }, '--keyserver='.$CONFIG{'keyserver'} ] );
+               'extra_args' => [ qw{ --no-auto-check-trustdb 
--trust-model=always }, '--keyserver='.$CONFIG{'keyserver'}, 
@{$CONFIG{'keyserver-options'}} ]);
        $gpg->options->meta_interactive( 0 );
        my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = 
make_gpg_fds();
        my $pid = $gpg->recv_keys(handles => $handles, command_args => [ 
@KEYIDS ]);