Re: [PATCH] gnu: pius: Update to 2.2.2-0.891687c.
Leo Famulari skribis: > On Sun, Dec 25, 2016 at 01:53:19PM -0500, Troy Sankey wrote: >> Attached is a patch to upgrade pius to a version that works with >> gpg-agent 2.1, in my experience. I have tested this version with >> gnupg@2.1.17 as the gpg input and gpg-agent version, and using a new >> style keybox (pubring.kbx) file as the keyring. >> >> This also effectively reverts commit 31fbf4b6: >> >> "gnu: pius: Depend on GnuPG 2.0 rather than 2.1." >> >> Another thread in guix-devel [0] suggests that pius could not deal with >> gpg-agent 2.1 which is why it may have been configured to use gnupg-2.0. >> The attached patch brings support for 2.1, so I think I am also allowed >> to revert 31fbf4b6. >> >> Note, however, the code comment describes a different concern: >> >> > - ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to >> > gpg-agent 2.0 >> >> I have yet to test gpg/gpgme 2.1 with gpg-agent 2.0, mostly due to the >> fact that gnupg 2.0 and 2.1 keep/expect agent sockets in completely >> different directories. I tried a couple of things and lost my patience. >> I do not understand how gpg 2.1 can talk to gpg-agent 2.0 without weird >> hackery. >> >> This version installs from git because it has been 20 days since my >> request to bump the version [1], and I got impatient. >> >> Troy >> >> [0] https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01885.html >> [1] https://github.com/jaymzh/pius/issues/46 > >> From 581ff5477ad7dd0d58550ffcfa68116873a1a1bf Mon Sep 17 00:00:00 2001 >> From: Troy Sankey >> Date: Sat, 24 Dec 2016 22:53:07 -0500 >> Subject: [PATCH] gnu: pius: Update to 2.2.2-0.891687c. >> >> * gnu/packages/gnupg.scm (pius): Update to 2.2.2-0.891687c. >> [inputs]: Change GNUPG-2.0 to GNUPG (2.1). > > Thanks, this change LGTM. +1, applied. > I think we should start trying to move away from any dependencies on > GnuPG 2.0, since it will be retired in ~12 months: Agreed. Thank you! Ludo’.
Re: [PATCH] gnu: pius: Update to 2.2.2-0.891687c.
On Sun, Dec 25, 2016 at 01:53:19PM -0500, Troy Sankey wrote: > Attached is a patch to upgrade pius to a version that works with > gpg-agent 2.1, in my experience. I have tested this version with > gnupg@2.1.17 as the gpg input and gpg-agent version, and using a new > style keybox (pubring.kbx) file as the keyring. > > This also effectively reverts commit 31fbf4b6: > > "gnu: pius: Depend on GnuPG 2.0 rather than 2.1." > > Another thread in guix-devel [0] suggests that pius could not deal with > gpg-agent 2.1 which is why it may have been configured to use gnupg-2.0. > The attached patch brings support for 2.1, so I think I am also allowed > to revert 31fbf4b6. > > Note, however, the code comment describes a different concern: > > > - ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent > > 2.0 > > I have yet to test gpg/gpgme 2.1 with gpg-agent 2.0, mostly due to the > fact that gnupg 2.0 and 2.1 keep/expect agent sockets in completely > different directories. I tried a couple of things and lost my patience. > I do not understand how gpg 2.1 can talk to gpg-agent 2.0 without weird > hackery. > > This version installs from git because it has been 20 days since my > request to bump the version [1], and I got impatient. > > Troy > > [0] https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01885.html > [1] https://github.com/jaymzh/pius/issues/46 > From 581ff5477ad7dd0d58550ffcfa68116873a1a1bf Mon Sep 17 00:00:00 2001 > From: Troy Sankey > Date: Sat, 24 Dec 2016 22:53:07 -0500 > Subject: [PATCH] gnu: pius: Update to 2.2.2-0.891687c. > > * gnu/packages/gnupg.scm (pius): Update to 2.2.2-0.891687c. > [inputs]: Change GNUPG-2.0 to GNUPG (2.1). Thanks, this change LGTM. I think we should start trying to move away from any dependencies on GnuPG 2.0, since it will be retired in ~12 months: "There are two major flavours of GnuPG: 2.1.17 is the modern version with support for ECC and many other new features, 2.0.30 is the stable version from an often used branch. This branch will reach end-of-life on 2017-12-31." source: https://www.gnupg.org/index.html I'll look more closely in the next couple days and push if there is no more feedback. signature.asc Description: PGP signature
[PATCH] gnu: pius: Update to 2.2.2-0.891687c.
Attached is a patch to upgrade pius to a version that works with gpg-agent 2.1, in my experience. I have tested this version with gnupg@2.1.17 as the gpg input and gpg-agent version, and using a new style keybox (pubring.kbx) file as the keyring. This also effectively reverts commit 31fbf4b6: "gnu: pius: Depend on GnuPG 2.0 rather than 2.1." Another thread in guix-devel [0] suggests that pius could not deal with gpg-agent 2.1 which is why it may have been configured to use gnupg-2.0. The attached patch brings support for 2.1, so I think I am also allowed to revert 31fbf4b6. Note, however, the code comment describes a different concern: > - ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent > 2.0 I have yet to test gpg/gpgme 2.1 with gpg-agent 2.0, mostly due to the fact that gnupg 2.0 and 2.1 keep/expect agent sockets in completely different directories. I tried a couple of things and lost my patience. I do not understand how gpg 2.1 can talk to gpg-agent 2.0 without weird hackery. This version installs from git because it has been 20 days since my request to bump the version [1], and I got impatient. Troy [0] https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01885.html [1] https://github.com/jaymzh/pius/issues/46 From 581ff5477ad7dd0d58550ffcfa68116873a1a1bf Mon Sep 17 00:00:00 2001 From: Troy Sankey Date: Sat, 24 Dec 2016 22:53:07 -0500 Subject: [PATCH] gnu: pius: Update to 2.2.2-0.891687c. * gnu/packages/gnupg.scm (pius): Update to 2.2.2-0.891687c. [inputs]: Change GNUPG-2.0 to GNUPG (2.1). --- gnu/packages/gnupg.scm | 72 -- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5d5a6cdff..167d9ace8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz +;;; Copyright © 2016 Troy Sankey ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,7 @@ #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -460,35 +462,43 @@ and signature functionality from Python programs.") (package-with-python2 python-gnupg)) (define-public pius - (package - (name "pius") - (version "2.2.2") - (source (origin -(method url-fetch) -(uri (string-append - "https://github.com/jaymzh/pius/releases/download/v"; - version "/pius-" version ".tar.bz2")) -(sha256 - (base32 - "0k94mlr7l12mplph7pdgjbampqha47d8mfjq69n4xm80qwbn1rq1" - (build-system python-build-system) - (inputs `(("perl" ,perl);for 'pius-party-worksheet' - ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0 - (arguments -`(#:tests? #f - #:python ,python-2 ;uses the Python 2 'print' syntax - #:phases - (modify-phases %standard-phases -(add-before - 'build 'set-gpg-file-name - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((gpg (string-append (assoc-ref inputs "gpg") - "/bin/gpg"))) - (substitute* "libpius/constants.py" - (("/usr/bin/gpg2") gpg - (synopsis "Programs to simplify GnuPG key signing") - (description -"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning + ;; pius 2.2.2 does not work with gpg-agent 2.1, so we take a newer + ;; commit. When a new pius (> 2.2.2) is released, update this package + ;; and delete this message. + ;; More info: https://github.com/jaymzh/pius/issues/46 + (let ((commit "891687ccb3d232a1fc0e7da7d22572c0318644cb") +(base-version "2.2.2")) ; i.e. there were no releases +; between BASE-VERSION and COMMIT +(package + (name "pius") + (version (string-append base-version "-0." + (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference +(url "https://github.com/jaymzh/pius.git";) +(commit commit))) + (sha256 + (base32 +"0m2na4bnf1rv0zpf404l9ga6pwyf7ijldp4lw5irgh7gkmpllxr3" + (build-system python-build-system) + (inputs `(("perl" ,perl);for 'pius-party-worksheet' + ("gpg" ,gnupg))) + (argum