From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Jens Lechtenboerger Newsgroups: gmane.emacs.devel Subject: Re: GnuPG homedir and package.el? Date: Sat, 18 Mar 2017 12:26:13 +0100 Message-ID: <87lgs2esh6.fsf@informationelle-selbstbestimmung-im-internet.de> References: <87zih1gfjh.fsf@informationelle-selbstbestimmung-im-internet.de> <87k27rejkw.fsf@lifelogs.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1489836395 20910 195.159.176.226 (18 Mar 2017 11:26:35 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 18 Mar 2017 11:26:35 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 18 12:26:30 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpCV8-0004NJ-Cg for ged-emacs-devel@m.gmane.org; Sat, 18 Mar 2017 12:26:26 +0100 Original-Received: from localhost ([::1]:52772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpCVE-0000EM-1x for ged-emacs-devel@m.gmane.org; Sat, 18 Mar 2017 07:26:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpCV7-0000E5-Df for emacs-devel@gnu.org; Sat, 18 Mar 2017 07:26:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpCV2-0002UQ-FO for emacs-devel@gnu.org; Sat, 18 Mar 2017 07:26:25 -0400 Original-Received: from mx2.mailbox.org ([80.241.60.215]:40802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpCV2-0002U6-82 for emacs-devel@gnu.org; Sat, 18 Mar 2017 07:26:20 -0400 Original-Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id A4C4844B21 for ; Sat, 18 Mar 2017 12:26:16 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Original-Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id EVOhjZgEaePH for ; Sat, 18 Mar 2017 12:26:15 +0100 (CET) OpenPGP: id=0xA142FD84; url=https://www.informationelle-selbstbestimmung-im-internet.de/A142FD84.asc Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <87k27rejkw.fsf@lifelogs.com> (Ted Zlatanov's message of "Tue, 14 Mar 2017 15:37:03 -0400") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 80.241.60.215 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:213111 Archived-At: --=-=-= Content-Type: text/plain On 2017-03-14, at 15:37, Ted Zlatanov wrote: > On Sat, 04 Mar 2017 17:41:54 +0100 Jens Lechtenboerger > wrote: > > JL> is there a reason that package.el sets up its own GnuPG homedir (in > JL> package-import-keyring and package--check-signature-content)? > > Isolation? That way package management, where typically the user's > personal setup doesn't matter, doesn't overlap with personal GnuPG usage. Signature verification seems personal to me. > JL> Attached is a patch introducing a new user option to use the > JL> default GnuPG home. > > JL> +(defcustom package-use-separate-gnupghome t > > Maybe this could also be a specific directory the user chooses, so it > could be a choice of nil, t, or 'string. You are right. I changed that to be a directory or nil. Thanks Jens --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Introduce-customizable-variable-package-gnupghome-di.patch >From 4c76844e067ccf029c57189058d161831ca25ac7 Mon Sep 17 00:00:00 2001 From: Jens Lechtenboerger Date: Sat, 18 Mar 2017 12:17:02 +0100 Subject: [PATCH] Introduce customizable variable package-gnupghome-dir * lisp/emacs-lisp/package.el (package-import-keyring, package--check-signature-content, package-check-signature): Use new variable package-gnupghome-dir to control which GnuPG homedir to use. --- lisp/emacs-lisp/package.el | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 8d5fac9..a809e39 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -305,6 +305,16 @@ package-directory-list (declare-function epg-find-configuration "epg-config" (protocol &optional no-cache program-alist)) +(defcustom package-gnupghome-dir (expand-file-name "gnupg" package-user-dir) + "Directory containing GnuPG keyring or nil. +This variable specifies the GnuPG home directory used by package. +That directory is passed via the option \"--homedir\" to GnuPG. +If nil, do not use the option \"--homedir\", but stick with GnuPG's +default directory." + :type 'directory + :risky t + :version "26.0.50.2") + (defcustom package-check-signature (if (and (require 'epg-config) (epg-find-configuration 'OpenPGP)) @@ -1207,9 +1217,9 @@ package--check-signature-content "Check signature CONTENT against STRING. SIG-FILE is the name of the signature file, used when signaling errors." - (let* ((context (epg-make-context 'OpenPGP)) - (homedir (expand-file-name "gnupg" package-user-dir))) - (setf (epg-context-home-directory context) homedir) + (let ((context (epg-make-context 'OpenPGP))) + (when package-gnupghome-dir + (setf (epg-context-home-directory context) package-gnupghome-dir)) (condition-case error (epg-verify-string context content string) (error (package--display-verify-error context sig-file) @@ -1236,7 +1246,7 @@ package--check-signature "Check signature of the current buffer. Download the signature file from LOCATION by appending \".sig\" to FILE. -GnuPG keyring is located under \"gnupg\" in `package-user-dir'. +GnuPG keyring location depends on `package-gnupghome-dir'. STRING is the string to verify, it defaults to `buffer-string'. If ASYNC is non-nil, the download of the signature file is done asynchronously. @@ -1476,11 +1486,11 @@ package-import-keyring "Import keys from FILE." (interactive "fFile: ") (setq file (expand-file-name file)) - (let ((context (epg-make-context 'OpenPGP)) - (homedir (expand-file-name "gnupg" package-user-dir))) - (with-file-modes 448 - (make-directory homedir t)) - (setf (epg-context-home-directory context) homedir) + (let ((context (epg-make-context 'OpenPGP))) + (when package-gnupghome-dir + (with-file-modes 448 + (make-directory package-gnupghome-dir t)) + (setf (epg-context-home-directory context) package-gnupghome-dir)) (message "Importing %s..." (file-name-nondirectory file)) (epg-import-keys-from-file context file) (message "Importing %s...done" (file-name-nondirectory file)))) -- 2.7.4 --=-=-=--