From patchwork Thu Dec 23 00:00:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35592 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB0F727BBEA; Thu, 23 Dec 2021 00:01:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 905AB27BBE9 for ; Thu, 23 Dec 2021 00:01:15 +0000 (GMT) Received: from localhost ([::1]:35882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0BXm-0002wh-Ny for patchwork@mira.cbaines.net; Wed, 22 Dec 2021 19:01:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0BXd-0002v7-3C for guix-patches@gnu.org; Wed, 22 Dec 2021 19:01:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0BXa-0002bM-R2 for guix-patches@gnu.org; Wed, 22 Dec 2021 19:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0BXa-0000gh-Qx for guix-patches@gnu.org; Wed, 22 Dec 2021 19:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52744] [PATCH 1/2] gnu: Make GnuPG 2.2.32 available for users. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 00:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52744 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52744@debbugs.gnu.org Received: via spool by 52744-submit@debbugs.gnu.org id=B52744.16402176452606 (code B ref 52744); Thu, 23 Dec 2021 00:01:02 +0000 Received: (at 52744) by debbugs.gnu.org; 23 Dec 2021 00:00:45 +0000 Received: from localhost ([127.0.0.1]:60039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0BXJ-0000fs-EN for submit@debbugs.gnu.org; Wed, 22 Dec 2021 19:00:45 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:35529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0BXH-0000fY-Iz for 52744@debbugs.gnu.org; Wed, 22 Dec 2021 19:00:44 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 5185D5C0172; Wed, 22 Dec 2021 19:00:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 22 Dec 2021 19:00:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=auPn5UfvSlIFinv80Wbh4j8 q8NJgxfjSVK4H773iFfM=; b=ERYYkvsNmWdRmRsozmeNR7xTBjQkOC+58C2Zpl5 9W8zMs+LG18taey4Ep2aEc2CjtmLZ7Y6fLToYXm7UlCqXI9oXxa5OwJcOQvPn4tX DQvostGVr+GkiNeQahPGrt5qHoDWUJtfR1Zimf+ues3qeCOt51EcjpYbwUymfe+y 5voI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=auPn5UfvSlIFinv80 Wbh4j8q8NJgxfjSVK4H773iFfM=; b=W1rRNTZVf3P8BnccCX7UMOvd/HA/DAPF3 h40tJ14GqS0VJDnpKR5ZdCWRG8ReBOs/ywbrDrstyXYuqSakUB4uztgIwfrWZn+V GjjV0dCVlAAlvOI3XAlnClupB+FvrijezD0hcbubg4JvFGh2imWUAzrZbrWxwpak MIc0DUe8NSe1QVaYzZl5bP7IcyYZszoXM1GL8tb9MDBy27LiPgUnvYBNNgQcGkjw ueROCyPnC+kFtCgX02sNnnccp3dDe89M2GK/MJpRdzikSWX8m2OpaMyeQQOzLITY xthVHuwJypKCoae5K+acCXY5Ku9w3XyhTT6nbhvt1i5r7PGpDUqGg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtjedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhi rdhnrghmvgeqnecuggftrfgrthhtvghrnhepveffueetleefteehheekgedvieeuvedtgf euudfhveefjeeghedthffggfelueegnecuffhomhgrihhnpehgnhhurdhorhhgpdhgnhhu phhgrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <52744@debbugs.gnu.org>; Wed, 22 Dec 2021 19:00:37 -0500 (EST) From: Leo Famulari Date: Wed, 22 Dec 2021 19:00:33 -0500 Message-Id: <8f2757a28b4a5e72d3ca8c6059c6dbf908b3c5bc.1640217633.git.leo@famulari.name> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes . * gnu/packages/gnupg.scm (gnupg-2.2.32)[properties]: Unhide this package. [source]: Add 'gnupg-default-pinentry.patch'. * gnu/packages/emacs-xyz.scm (emacs-pinentry)[propagated-inputs]: Replace gnupg with gnupg-2.2.32. --- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/gnupg.scm | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c85680eece..5228338458 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21166,7 +21166,7 @@ (define-public emacs-pinentry "1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik")))) (build-system emacs-build-system) (propagated-inputs - (list gnupg)) + (list gnupg-2.2.32)) (home-page "https://elpa.gnu.org/packages/pinentry.html") (synopsis "GnuPG Pinentry server implementation") (description diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 7706688b93..a3f0f85a0d 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -349,21 +349,17 @@ (define-public gnupg (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gnupg"))))) +;; This package fixes , "GnuPG 2.2.30 cannot +;; do symmetric encryption" (define-public gnupg-2.2.32 (package (inherit gnupg) (version "2.2.32") - - ;; Hide this version because packages like 'emacs-pinentry' propagate the - ;; default GnuPG and "guix install gnupg emacs-pinentry" would fail with a - ;; collision error. - (properties `((hidden? . #t) - ,@(package-properties gnupg))) - (source (origin (inherit (package-source gnupg)) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) + (patches (search-patches "gnupg-default-pinentry.patch")) (sha256 (base32 "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj")))))) From patchwork Thu Dec 23 00:00:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 35591 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 89FD027BBEA; Thu, 23 Dec 2021 00:01:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F65D27BBE9 for ; Thu, 23 Dec 2021 00:01:15 +0000 (GMT) Received: from localhost ([::1]:35848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0BXm-0002vH-E9 for patchwork@mira.cbaines.net; Wed, 22 Dec 2021 19:01:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0BXc-0002uv-3c for guix-patches@gnu.org; Wed, 22 Dec 2021 19:01:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0BXa-0002bL-E1 for guix-patches@gnu.org; Wed, 22 Dec 2021 19:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0BXa-0000ga-EP for guix-patches@gnu.org; Wed, 22 Dec 2021 19:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52744] [PATCH 2/2] gnu: Remove emacs-pinentry. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Dec 2021 00:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52744 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52744@debbugs.gnu.org Received: via spool by 52744-submit@debbugs.gnu.org id=B52744.16402176452600 (code B ref 52744); Thu, 23 Dec 2021 00:01:02 +0000 Received: (at 52744) by debbugs.gnu.org; 23 Dec 2021 00:00:45 +0000 Received: from localhost ([127.0.0.1]:60037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0BXJ-0000fq-5y for submit@debbugs.gnu.org; Wed, 22 Dec 2021 19:00:45 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:52169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0BXH-0000fZ-MN for 52744@debbugs.gnu.org; Wed, 22 Dec 2021 19:00:43 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 86F385C0194; Wed, 22 Dec 2021 19:00:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Wed, 22 Dec 2021 19:00:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=fStv1qPEh3 LdI1BOop15QylwnXthQZ0L6XmPEnAyHrw=; b=i4ON+etWoRbR7rcf7hgbIRbEbE myHnK0hZVUPNvKofwXUKMedkxgeJuaiNptiBW5Ps8hpMjuPaXBgozlxxHAcXIU3G YFXof2Be2opNag8O+TclI61KLqQ0Kqw0qPrAuiUIrcGChVSExN1Wrvv/Gm08Ovfe Q6q0E0kB46JxbwUIk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=fStv1qPEh3LdI1BOop15QylwnXthQZ0L6XmPEnAyHrw=; b=ePXSSH9S FvS23v32zWxabc8cK6VdpK5GctdCiN8laXlrXoxqetiQbtjCKB8sKL4oSmXis4oU jLOnC7xxpOgKy4TnuFJuqILXO9OjnRgyggzx27YDFVZluQwiSLwLAGokeMFSAOoF OZXHZb+j55HWc71YiZHkP5f+68hZZr/UrwbtPtnCOzY23Dptu4FLNEDHoadDHg7A fwLrEX1q2waQJJT3uM4fs3OEddW2++LlW1m8u11L0FsmfeEilfVzHS2e2q1i8z6b 0suZkZzIC54L0hHZMiXO/5Y/pfe5DUAvsP0xXR2lRJvfzCc8WL3Lt4y0ppHSsfGq od7mmZDJcWEYQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtjedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhephfdvhefgteeuhefhheefvdfgtdehfe ekueduledtudduueevleeffefhfeevkeehnecuffhomhgrihhnpehgnhhurdhorhhgnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfh grmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <52744@debbugs.gnu.org>; Wed, 22 Dec 2021 19:00:38 -0500 (EST) From: Leo Famulari Date: Wed, 22 Dec 2021 19:00:34 -0500 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <8f2757a28b4a5e72d3ca8c6059c6dbf908b3c5bc.1640217633.git.leo@famulari.name> References: <8f2757a28b4a5e72d3ca8c6059c6dbf908b3c5bc.1640217633.git.leo@famulari.name> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This package is apparently no longer useful and is abandoned upstream: https://issues.guix.gnu.org/52483 * gnu/packages/emacs-xyz.scm (emacs-pinentry): Remove variable. --- gnu/packages/emacs-xyz.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5228338458..4368cda580 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21148,36 +21148,6 @@ (define-public emacs-mu4e-conversation maps the thread tree.") (license license:gpl3+)))) -(define-public emacs-pinentry - (let ((commit "dcc9ba03252ee5d39e03bba31b420e0708c3ba0c") - (revision "1")) - (package - (name "emacs-pinentry") - (version (git-version "0.1" revision commit)) - (source - (origin - (method url-fetch) - (uri (string-append - "http://git.savannah.gnu.org/cgit/emacs/elpa.git/plain" - "/packages/pinentry/pinentry.el?id=" commit)) - (file-name (string-append "pinentry.el")) - (sha256 - (base32 - "1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik")))) - (build-system emacs-build-system) - (propagated-inputs - (list gnupg-2.2.32)) - (home-page "https://elpa.gnu.org/packages/pinentry.html") - (synopsis "GnuPG Pinentry server implementation") - (description - "This package allows GnuPG passphrase to be prompted through the -minibuffer instead of graphical dialog. - -To use, add @code{allow-emacs-pinentry} to @code{~/.gnupg/gpg-agent.conf}, -reload the configuration with @code{gpgconf --reload gpg-agent}, and start the -server with @code{M-x pinentry-start}.") - (license license:gpl3+)))) - (define-public emacs-so-long (package (name "emacs-so-long")