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

[Christoph Berg]

Author: myon-guest
Date: 2005-08-07 20:25:17 +0000 (Sun, 07 Aug 2005)
New Revision: 160

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
create caff configfile on first use

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-08-07 19:36:12 UTC (rev 159)
+++ trunk/caff/caff	2005-08-07 20:25:17 UTC (rev 160)
@@ -266,9 +266,62 @@
 my ($REVISION_NUMER) = $REVISION =~ /(\d+)/;
 my $VERSION = "0.0.0.$REVISION_NUMER";
 
+sub generate_config() {
+	die "Error: \$LOGNAME is not set.\n" unless $ENV{LOGNAME};
+	my $gecos = (getpwnam($ENV{LOGNAME}))[6];
+	$gecos =~ s/,.*//;
+
+	my $gpg = GnuPG::Interface->new();
+	$gpg->call( 'gpg' );
+	$gpg->options->hash_init(
+		'extra_args' => [ qw{ --no-auto-check-trustdb --trust-model=always --with-colons --fixed-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 => [ $gecos ]);
+	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.
+	};
+
+	my @keys;
+	unless (@keys = ($stdout =~ /^pub:[^r:]*:(?:[^:]*:){2,2}([^:]+):/mg)) {
+		die "Error: No keys were found using \"gpg --list-public-keys '$gecos'\".\n";
+	}
+	unless ($stdout =~ /^uid:.*<(.+ at .+)>.*:/m) {
+		die "Error: No email address was found using \"gpg --list-public-keys '$gecos'\".\n";
+	}
+	my $email = $1;
+
+	return <<EOT;
+# .caffrc -- vim:syntax=perl:
+# This file is in perl(1) format - see caff(1) for details.
+
+\$CONFIG{'owner'}       = '$gecos';
+\$CONFIG{'email'}       = '$email';
+
+# you can get your long keyid from
+#   gpg --with-colons --list-key <yourkeyid|name|emailaddress..>
+#
+# if you have a v4 key, it will simply be the last 16 digits of
+# your fingerprint.
+
+\$CONFIG{'keyid'}       = [ qw{@keys} ];
+EOT
+};
+
 sub load_config() {
 	my $config = $ENV{'HOME'} . '/.caffrc';
-	-f $config or die "No file $config present.  See caff(1).\n";
+	unless (-f $config) {
+		print "No configfile $config present, I will use this template:\n";
+		my $template = generate_config();
+		print "$template\nPress enter to continue.";
+		<STDIN>;
+		open F, ">$config" or die "$config: $!";
+		print F $template;
+		close F;
+	}
 	unless (scalar eval `cat $config`) {
 		die "Couldn't parse $config: $EVAL_ERROR\n" if $EVAL_ERROR;
 	};

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-08-07 19:36:12 UTC (rev 159)
+++ trunk/debian/changelog	2005-08-07 20:25:17 UTC (rev 160)
@@ -1,3 +1,10 @@
+signing-party (0.4.1-2) unstable; urgency=low
+
+  * caff:
+     + create configfile on first use (Closes: #316611).
+
+ -- Christoph Berg <cb at df7cb.de>  Sun,  7 Aug 2005 22:23:43 +0200
+
 signing-party (0.4.1-1) unstable; urgency=low
 
   * New upstream release. Lots of fixes and enhancements, including: