new option to pause before continuing to the signing step,

thanks Christof Douma (Closes: #316129).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@126 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 8f728482167ddf8da436b38fc2adb4abc0ec84b3..e4458a326d800074c4bbca55db17d633e98b93fd 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -175,6 +175,11 @@ Default: B<0>.
 
 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 @@ unless (@keyids_ok) {
 ###########
 # 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) {

diff --git a/caff/caffrc.sample b/caff/caffrc.sample
index e88bea0b43f9fd356e5527924d4becce4a30a8b7..cadc44ee032ac7c5a70fc2de3f5674084e694b9f 100644 (file)
--- a/caff/caffrc.sample
+++ b/caff/caffrc.sample
@@ -30,11 +30,14 @@ $CONFIG{'caffhome'}    = $ENV{'HOME'}.'/.caff';
 # 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,10 +47,14 @@ $CONFIG{'caffhome'}    = $ENV{'HOME'}.'/.caff';
 #     $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.
 # 

diff --git a/debian/changelog b/debian/changelog
index a8d5fbdb2cc1a27fbc8c73626352528d21481957..14ea3935168f54441cfa075eacb1bbce8ddab3b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ signing-party (0.4.1-XXX) unreleased; urgency=low
      + 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.