From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id B82B96DE024F for ; Tue, 18 Feb 2020 14:43:06 -0800 (PST) Authentication-Results: arlo.cworth.org; dkim=permerror (0-bit key) header.d=fifthhorseman.net header.i=@fifthhorseman.net header.b="9fAiY2wY"; dkim=pass (2048-bit key; unprotected) header.d=fifthhorseman.net header.i=@fifthhorseman.net header.b="rP1Kc5E0"; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -1.576 X-Spam-Level: X-Spam-Status: No, score=-1.576 tagged_above=-999 required=5 tests=[AWL=0.925, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bnDSbyWrrrFI for ; Tue, 18 Feb 2020 14:43:06 -0800 (PST) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 686406DE0222 for ; Tue, 18 Feb 2020 14:43:03 -0800 (PST) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1582065780; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=Rh9KP1bPj3/I3hfDifG65OlTIr/Se/9lW9bg83GZPNU=; b=9fAiY2wYMr3nAuOmtfjf+NDsLKeTssyWTn0tagC4RIdJ1kykL2OvSrmbmDGasoCYxa3Dr zZXRGJtn0rQKMhQDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1582065780; h=from : to : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=Rh9KP1bPj3/I3hfDifG65OlTIr/Se/9lW9bg83GZPNU=; b=rP1Kc5E0w7Qm++sfNrVdiCLdYsWdip4sEF4dLtUvtLEIxkL2jXJodYBrFavrU9suRpEJA zw8Kn8XTVqoQQCXGru6BJcbrm1Bt44b9U0EPO1fHjb39Mjg0CWNr2RpnnJl+b5P+Tc0bhvG PFw8yG4vrwumgjmUxfB/3bhzJrnpSb5bmUm9lvoc11gtwOycFhGfZDp4rAF8eSP3ssC8p57 jQhDCQzEvhNJRWu9aHnzOt1U2ONRVr1w4fKH7N0V2bvGon6A30hvZ1qF2ITTKk5zjzSTYs9 QbwiZTcr/TCBzJuIqiXb6gKzFDOwqqfxQ2zuq08iR1SnDGx8coW/mT54b7DQ== Received: from fifthhorseman.net (unknown [38.109.115.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 7D7FDF9A5 for ; Tue, 18 Feb 2020 17:43:00 -0500 (EST) Received: by fifthhorseman.net (Postfix, from userid 1000) id 6260D203A9; Tue, 18 Feb 2020 17:42:57 -0500 (EST) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH] Drop deprecated/unused crypto.gpg_path Date: Tue, 18 Feb 2020 17:42:57 -0500 Message-Id: <20200218224257.2552062-1-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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: Tue, 18 Feb 2020 22:43:06 -0000 crypto.gpg_path was only used when we built against gmime versions before 3.0. Since we now depend on gmime 3.0.3 or later, it is meaningless. The removal of the field from the _notmuch_config struct would be an ABI change if that struct were externally exposed, but it is not, so it's safe to unilaterally remove it. Signed-off-by: Daniel Kahn Gillmor --- bindings/python-cffi/tests/conftest.py | 2 -- doc/man1/notmuch-config.rst | 8 -------- notmuch-config.c | 1 - 3 files changed, 11 deletions(-) diff --git a/bindings/python-cffi/tests/conftest.py b/bindings/python-cffi/tests/conftest.py index e322cc64..de7db8e7 100644 --- a/bindings/python-cffi/tests/conftest.py +++ b/bindings/python-cffi/tests/conftest.py @@ -78,8 +78,6 @@ def maildir(tmppath): exclude_tags=deleted;spam; [maildir] synchronize_flags=true - [crypto] - gpg_path=gpg """.format(tmppath=tmppath))) return MailDir(tmppath) diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst index 7347ad31..323a8b65 100644 --- a/doc/man1/notmuch-config.rst +++ b/doc/man1/notmuch-config.rst @@ -134,14 +134,6 @@ 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. NOTE: This configuration item is - deprecated, and will be ignored if notmuch is built against GMime - 3.0 or later. - - Default: ``gpg``. - **index.decrypt** **[STORED IN DATABASE]** Policy for decrypting encrypted messages during indexing. Must be one of: ``false``, ``auto``, ``nostash``, or ``true``. diff --git a/notmuch-config.c b/notmuch-config.c index 1b079e85..19c2ddb3 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -119,7 +119,6 @@ struct _notmuch_config { bool is_new; char *database_path; - char *crypto_gpg_path; char *user_name; char *user_primary_email; const char **user_other_email; -- 2.25.0