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

[Thijs Kinkhorst]

Author: kink-guest
Date: 2005-07-11 11:49:26 +0000 (Mon, 11 Jul 2005)
New Revision: 126

Modified:
   trunk/caff/caff
   trunk/caff/caffrc.sample
   trunk/debian/changelog
Log:
new option to pause before continuing to the signing step,
thanks Christof Douma (Closes: #316129).


Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2005-07-11 11:41:19 UTC (rev 125)
+++ trunk/caff/caff	2005-07-11 11:49:26 UTC (rev 126)
@@ -175,6 +175,11 @@
 
 If true, then skip the signing step. Default: B<0>.
 
+=item B<ask-sign> [boolean]
+
+If true, then pause before continuing to the signing step.
+This is useful for offline signing. Default: B<0>.
+
 =item B<export-sig-age> [seconds]
 
 Don't export UIDs by default, on which your latest signature is older
@@ -818,6 +823,10 @@
 ###########
 # sign keys
 ###########
+if ($CONFIG{'ask-sign'} && ! $CONFIG{'no-sign'}) {
+	$CONFIG{'no-sign'} = ! ask("Continue with signing?", 1);
+}
+	
 unless ($CONFIG{'no-sign'}) {
 	info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
 	for my $keyid (@keyids_ok) {

Modified: trunk/caff/caffrc.sample
===================================================================
--- trunk/caff/caffrc.sample	2005-07-11 11:41:19 UTC (rev 125)
+++ trunk/caff/caffrc.sample	2005-07-11 11:49:26 UTC (rev 126)
@@ -30,12 +30,15 @@
 # Keyserver to download keys from. Default: subkeys.pgp.net.
 # $CONFIG{'keyserver'}      = 'keyserver.kjsl.com';
 
-# If true, then skip the step of fetching keys from the keyserver, or the signing.
-# Default: 0
+# Boolean options, all default to false (0).
+#
+# Skip fetching the keys from the keyserver.
 # $CONFIG{'no-download'}    = 1;
+# Skip signing the keys.
 # $CONFIG{'no-sign'}        = 1;
+# Ask to continue before starting the signing (for offline signing).
+# $CONFIG{'ask-sign'}       = 1;
 
-
 # $CONFIG{'mail-template'} = <<'EOM'
 # Hi,
 # 
@@ -44,11 +47,15 @@
 #     $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}
+# Note that I did not upload your key to any keyservers.
+# If you have multiple user ids, I sent the signature for each user id
+# separately to that user id's associated email address. You can import
+# the signatures by running each through `gpg --import`.
 # 
+# 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,

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-11 11:41:19 UTC (rev 125)
+++ trunk/debian/changelog	2005-07-11 11:49:26 UTC (rev 126)
@@ -7,6 +7,8 @@
      + now handles attribute UIDs (Closes: #316278).
      + now detects all invalid keyids (Closes: #317754).
      + 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).
   * Depend on libtext-template-perl as caff needs it.
   * Update to Standards-Version 3.6.2, no changes necessary.