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

[Peter Palfrader]

Author: weasel
Date: 2005-06-29 14:37:05 +0000 (Wed, 29 Jun 2005)
New Revision: 93

Modified:
   trunk/caff/README
   trunk/caff/caff
   trunk/debian/changelog
   trunk/debian/control
Log:
Make the text that caff sends a config option.
Thanks to Elmar Hoffmann

Modified: trunk/caff/README
===================================================================
--- trunk/caff/README	2005-06-29 12:18:56 UTC (rev 92)
+++ trunk/caff/README	2005-06-29 14:37:05 UTC (rev 93)
@@ -33,7 +33,7 @@
 
 
 
-Dependencies: gnupg (>= 1.3.92), perl, libgnupg-interface-perl, libmime-perl, libmailtools-perl (>= 1.62), mailx
+Dependencies: gnupg (>= 1.3.92), perl, libgnupg-interface-perl, libtext-template-perl, libmime-perl, libmailtools-perl (>= 1.62), mailx
 
 
 INSTALLATION NOTES

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-06-29 12:18:56 UTC (rev 92)
+++ trunk/caff/caff	2005-06-29 14:37:05 UTC (rev 93)
@@ -150,8 +150,30 @@
 
 If true, then skip the signing step. Default: B<0>.
 
+=item B<mail-template> [string]
+
+Email template which is used as the body text for the email sent out.
+instead of the default text if specified. The following perl variables
+can be used in the template:
+
+=over
+
+=item B<{owner}> [string]
+
+Your name as specified in the L<B<owner>|/item_owner__5bstring_5d> setting.
+
+=item B<{key}> [string]
+
+The keyid of the key you signed.
+
+=item B<{@uids}> [array]
+
+The UIDs for which signatures are included in the mail.
+
 =back
 
+=back
+
 =head1 AUTHOR
 
 Peter Palfrader <peter at palfrader.org>
@@ -167,6 +189,7 @@
 use English;
 use File::Path;
 use File::Temp qw{tempdir};
+use Text::Template;
 use MIME::Entity;
 use Fcntl;
 use IO::Select;
@@ -202,6 +225,24 @@
 	$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{'mail-template'} = <<'EOM' unless defined $CONFIG{'mail-template'};
+Hi,
+
+please find attached the user id{(scalar @uids >= 2 ? 's' : '')}.
+{foreach $uid (@uids) {
+    $OUT .= "\t".$uid."\n";
+};} of your key {$key} signed by me.
+
+Note that I did not upload your key to any keyservers. If you want this
+new signature to be available to others, please upload it yourself.
+With GnuPG this can be done using
+	gpg --keyserver subkeys.pgp.net --send-key {$key}
+
+If you have any questions, don't hesitate to ask.
+
+Regards,
+{$owner}
+EOM
 };
 
 sub notice($) {
@@ -402,24 +443,18 @@
 sub send_mail($$$@) {
 	my ($address, $can_encrypt, $key_id, @keys) = @_;
 
-	my $message = "Hi,\n\n";
+	my $template = Text::Template->new(TYPE => 'STRING', SOURCE => $CONFIG{'mail-template'})
+	    or die "Error creating template: $Text::Template::ERROR";
 
-	$message .= 'please find attached the user id'.(scalar @keys >= 2 ? 's' : '')."\n";
+	my @uids;
 	for my $key (@keys) {
-		$message .= "\t".$key->{'text'}."\n";
+	    push @uids, $key->{'text'};
 	};
-	$message .= qq{of your key $key_id signed by me.
+	my $message = $template->fill_in(HASH => { key => $key_id,
+						   uids => \@uids,
+						   owner => $CONFIG{'owner'}})
+	    or die "Error filling template in: $Text::Template::ERROR";
 
-Note that I did not upload your key to any keyservers. If you want this
-new signature to be available to others, please upload it yourself.
-With GnuPG this can be done using
-	gpg --keyserver subkeys.pgp.net --send-key $key_id
-
-If you have any questions, don't hesitate to ask.
-
-Regards,
-$CONFIG{'owner'}
-};
 	my $message_entity = MIME::Entity->build(
 		Type        => "text/plain",
 		Charset     => "utf-8",

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-29 12:18:56 UTC (rev 92)
+++ trunk/debian/changelog	2005-06-29 14:37:05 UTC (rev 93)
@@ -1,3 +1,9 @@
+signing-party (0.4.1-XXX) unreleased; urgency=low
+
+  * Depend on libtext-template-perl as caff needs it.
+
+ -- Peter Palfrader <weasel at debian.org>  Wed, 29 Jun 2005 16:36:08 +0200
+
 signing-party (0.4.1-1) unstable; urgency=low
 
   * gpg-key2ps now works with revoked subkeys, thanks Christof Douma

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-06-29 12:18:56 UTC (rev 92)
+++ trunk/debian/control	2005-06-29 14:37:05 UTC (rev 93)
@@ -8,7 +8,7 @@
 
 Package: signing-party
 Architecture: all
-Depends: gnupg (>= 1.3.92), perl, libgnupg-interface-perl, libmime-perl, libmailtools-perl (>= 1.62), mailx, libpaper-utils (>= 1.1.13)
+Depends: gnupg (>= 1.3.92), perl, libgnupg-interface-perl, libtext-template-perl, libmime-perl, libmailtools-perl (>= 1.62), mailx, libpaper-utils (>= 1.1.13)
 Recommends: exim4 | mail-transport-agent, libtext-iconv-perl | libintl-perl | recode
 Description: tools for signing GnuPG keys
  signing-party is a collection for all kinds of PGP/GnuPG related things,