From: David Bremner Date: Mon, 9 Mar 2015 20:51:23 +0000 (+0100) Subject: [Patch v2 2/2] CLI: make gpg binary used by libgmime configurable. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3a254aef0b5f582bf617c8d41b39aadc16debe3;p=notmuch-archives.git [Patch v2 2/2] CLI: make gpg binary used by libgmime configurable. --- diff --git a/93/9056dc738a514a2860d847cbfb539e98cbac2e b/93/9056dc738a514a2860d847cbfb539e98cbac2e new file mode 100644 index 000000000..ac9e00459 --- /dev/null +++ b/93/9056dc738a514a2860d847cbfb539e98cbac2e @@ -0,0 +1,223 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 8F466431FDB + for ; Mon, 9 Mar 2015 13:53:57 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id QdS02rtIEFXh for ; + Mon, 9 Mar 2015 13:53:55 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D004D431FBC + for ; Mon, 9 Mar 2015 13:53:51 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YV4eY-00063o-So; Mon, 09 Mar 2015 20:51:54 +0000 +Received: (nullmailer pid 22322 invoked by uid 1000); Mon, 09 Mar 2015 + 20:51:32 -0000 +From: David Bremner +To: Jani Nikula , David Bremner , + notmuch@notmuchmail.org +Subject: [Patch v2 2/2] CLI: make gpg binary used by libgmime configurable. +Date: Mon, 9 Mar 2015 21:51:23 +0100 +Message-Id: <1425934283-22269-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1425934283-22269-1-git-send-email-david@tethera.net> +References: <87fv9givdr.fsf@nikula.org> + <1425934283-22269-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 09 Mar 2015 20:53:58 -0000 + +Previously we set up a way for the top level notmuch command to choose +which gpg binary was invoked by libgmime. In this commit we add the +(mostly boilerplate) code to allow the notmuch-config command to read +and write this path, and use it in the appropriate struct. +--- + doc/man1/notmuch-config.rst | 8 ++++++++ + notmuch-client.h | 7 +++++++ + notmuch-config.c | 35 ++++++++++++++++++++++++++++++++++- + notmuch-reply.c | 2 ++ + notmuch-show.c | 2 ++ + 5 files changed, 53 insertions(+), 1 deletion(-) + +diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst +index 2676a86..40c1272 100644 +--- a/doc/man1/notmuch-config.rst ++++ b/doc/man1/notmuch-config.rst +@@ -125,6 +125,14 @@ The available configuration items are described below. + + Default: ``true``. + ++ **crypto.gpg_path** ++ ++ Name (or full path) of gpg binary to use in verification and ++ decryption of PGP/MIME messages. ++ ++ Default: ``gpg``. ++ ++ + ENVIRONMENT + =========== + +diff --git a/notmuch-client.h b/notmuch-client.h +index c25c4ea..fb3021c 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -279,6 +279,13 @@ notmuch_config_set_database_path (notmuch_config_t *config, + const char *database_path); + + const char * ++notmuch_config_get_crypto_gpg_path (notmuch_config_t *config); ++ ++void ++notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, ++ const char *gpg_path); ++ ++const char * + notmuch_config_get_user_name (notmuch_config_t *config); + + void +diff --git a/notmuch-config.c b/notmuch-config.c +index a564bca..2d5c297 100644 +--- a/notmuch-config.c ++++ b/notmuch-config.c +@@ -101,12 +101,21 @@ static const char search_config_comment[] = + "\t\tsearch results by default. Using an excluded tag in a\n" + "\t\tquery will override that exclusion.\n"; + ++static const char crypto_config_comment[] = ++ " Cryptography related configuration\n" ++ "\n" ++ " The following option is supported here:\n" ++ "\n" ++ "\tgpg_path\n" ++ "\t\tbinary name or full path to invoke gpg.\n"; ++ + struct _notmuch_config { + char *filename; + GKeyFile *key_file; + notmuch_bool_t is_new; + + char *database_path; ++ char *crypto_gpg_path; + char *user_name; + char *user_primary_email; + const char **user_other_email; +@@ -244,6 +253,7 @@ notmuch_config_open (void *ctx, + int file_had_user_group; + int file_had_maildir_group; + int file_had_search_group; ++ int file_had_crypto_group; + + notmuch_config_t *config = talloc (ctx, notmuch_config_t); + if (config == NULL) { +@@ -277,6 +287,7 @@ notmuch_config_open (void *ctx, + config->maildir_synchronize_flags = TRUE; + config->search_exclude_tags = NULL; + config->search_exclude_tags_length = 0; ++ config->crypto_gpg_path = NULL; + + if (! g_key_file_load_from_file (config->key_file, + config->filename, +@@ -326,7 +337,7 @@ notmuch_config_open (void *ctx, + file_had_user_group = g_key_file_has_group (config->key_file, "user"); + file_had_maildir_group = g_key_file_has_group (config->key_file, "maildir"); + file_had_search_group = g_key_file_has_group (config->key_file, "search"); +- ++ file_had_crypto_group = g_key_file_has_group (config->key_file, "crypto"); + + if (notmuch_config_get_database_path (config) == NULL) { + char *path = getenv ("MAILDIR"); +@@ -406,6 +417,10 @@ notmuch_config_open (void *ctx, + g_error_free (error); + } + ++ if (notmuch_config_get_crypto_gpg_path (config) == NULL) { ++ notmuch_config_set_crypto_gpg_path (config, "gpg"); ++ } ++ + /* Whenever we know of configuration sections that don't appear in + * the configuration file, we add some comments to help the user + * understand what can be done. */ +@@ -433,6 +448,10 @@ notmuch_config_open (void *ctx, + g_key_file_set_comment (config->key_file, "search", NULL, + search_config_comment, NULL); + ++ if (! file_had_crypto_group) ++ g_key_file_set_comment (config->key_file, "crypto", NULL, ++ crypto_config_comment, NULL); ++ + return config; + } + +@@ -690,6 +709,20 @@ notmuch_config_set_search_exclude_tags (notmuch_config_t *config, + &(config->search_exclude_tags)); + } + ++const char * ++notmuch_config_get_crypto_gpg_path (notmuch_config_t *config) ++{ ++ return _config_get (config, &config->crypto_gpg_path, "crypto", "gpg_path"); ++} ++ ++void ++notmuch_config_set_crypto_gpg_path (notmuch_config_t *config, ++ const char *gpg_path) ++{ ++ _config_set (config, &config->crypto_gpg_path, "crypto", "gpg_path", gpg_path); ++} ++ ++ + /* Given a configuration item of the form . return the + * component group and key. If any error occurs, print a message on + * stderr and return 1. Otherwise, return 0. +diff --git a/notmuch-reply.c b/notmuch-reply.c +index e18370f..d51fdfc 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -822,6 +822,8 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + ++ params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config); ++ + if (notmuch_database_open (notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) + return EXIT_FAILURE; +diff --git a/notmuch-show.c b/notmuch-show.c +index d292f29..43bf71c 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1204,6 +1204,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + ++ params.crypto.gpgpath = notmuch_config_get_crypto_gpg_path (config); ++ + if (notmuch_database_open (notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) + return EXIT_FAILURE; +-- +2.1.4 +