Merge branch 'STABLE-BRANCH-2-4' into master

tools/gpg-wks-client.c

@@ -77,6 +77,7 @@ enum cmd_and_opt_values
     oBlacklist,
     oNoAutostart,
     oAddRevocs,
+    oNoAddRevocs,
 
     oDummy
   };
@@ -121,6 +122,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oBlacklist, "blacklist", "@"),
   ARGPARSE_s_s (oDirectory, "directory", "@"),
   ARGPARSE_s_n (oAddRevocs, "add-revocs", "add revocation certificates"),
+  ARGPARSE_s_n (oNoAddRevocs, "no-add-revocs", "do not add revocation certificates"),
 
   ARGPARSE_s_s (oFakeSubmissionAddr, "fake-submission-addr", "@"),
 
@@ -158,7 +160,7 @@ static gpg_error_t proc_userid_from_stdin (gpg_error_t (*func)(const char *),
                                            const char *text);
 static gpg_error_t command_supported (char *userid);
 static gpg_error_t command_check (char *userid);
-static gpg_error_t command_send (const char *fingerprint, const char *userid);
+static gpg_error_t command_create (const char *fingerprint, const char *userid);
 static gpg_error_t encrypt_response (estream_t *r_output, estream_t input,
                                      const char *addrspec,
                                      const char *fingerprint);
@@ -262,6 +264,9 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
         case oAddRevocs:
           opt.add_revocs = 1;
           break;
+        case oNoAddRevocs:
+          opt.add_revocs = 0;
+          break;
 
 	case aSupported:
 	case aCreate:
@@ -304,6 +309,8 @@ main (int argc, char **argv)
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
   setup_libassuan_logging (&opt.debug, NULL);
 
+  opt.add_revocs = 1;  /* Default add revocation certs.  */
+
   /* Parse the command line. */
   pargs.argc  = &argc;
   pargs.argv  = &argv;
@@ -397,7 +404,7 @@ main (int argc, char **argv)
     case aCreate:
       if (argc != 2)
         wrong_args ("--create FINGERPRINT USER-ID");
-      err = command_send (argv[0], argv[1]);
+      err = command_create (argv[0], argv[1]);
       if (err)
         log_error ("creating request failed: %s\n", gpg_strerror (err));
       break;
@@ -1153,7 +1160,7 @@ command_check (char *userid)
 /* Locate the key by fingerprint and userid and send a publication
  * request.  */
 static gpg_error_t
-command_send (const char *fingerprint, const char *userid)
+command_create (const char *fingerprint, const char *userid)
 {
   gpg_error_t err;
   KEYDB_SEARCH_DESC desc;

tools/gpgtar-create.c

@@ -1283,6 +1283,8 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
           ccparray_put (&ccp, "--recipient");
           ccparray_put (&ccp, arg->d);
         }
+      if (opt.no_compress)
+        ccparray_put (&ccp, "-z0");
       for (arg = opt.gpg_arguments; arg; arg = arg->next)
         ccparray_put (&ccp, arg->d);
 

tools/gpgtar.c

@@ -76,6 +76,7 @@ enum cmd_and_opt_values
     oSetFilename,
     oNull,
     oUtf8Strings,
+    oNoCompress,
 
     oBatch,
     oAnswerYes,
@@ -121,6 +122,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oSetFilename, "set-filename", "@"),
   ARGPARSE_s_n (oOpenPGP, "openpgp", "@"),
   ARGPARSE_s_n (oCMS, "cms", "@"),
+  ARGPARSE_s_n (oNoCompress,   "no-compress", "@"),
 
   ARGPARSE_s_n (oBatch, "batch", "@"),
   ARGPARSE_s_n (oAnswerYes, "yes", "@"),
@@ -350,6 +352,7 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
         case oFilesFrom: files_from = pargs->r.ret_str; break;
         case oNull: null_names = 1; break;
         case oUtf8Strings: opt.utf8strings = 1; break;
+        case oNoCompress:  opt.no_compress = 1; break;
 
 	case aList:
         case aDecrypt:

tools/gpgtar.h

@@ -33,6 +33,7 @@ struct
   int quiet;
   int dry_run;
   int utf8strings;
+  int no_compress;
   const char *gpg_program;
   strlist_t gpg_arguments;
   const char *outfile;

tools/wks-util.c

@@ -246,7 +246,7 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
   ccparray_put (&ccp, "--always-trust");
   if (!binary)
     ccparray_put (&ccp, "--armor");
-  ccparray_put (&ccp, "--export-options=export-minimal");
+  ccparray_put (&ccp, "--export-options=export-clean");
   ccparray_put (&ccp, "--export-filter");
   ccparray_put (&ccp, filterexp);
   ccparray_put (&ccp, "--export");