From mboxrd@z Thu Jan 1 00:00:00 1970 From: Troy Sankey Subject: [PATCH] gnu: pius: Update to 2.2.2-0.891687c. Date: Sun, 25 Dec 2016 13:53:19 -0500 Message-ID: <148269199943.2068.14760851879049354797@what> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="pgp-sha256"; boundary="===============0875033443==" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLDvF-0002ad-Eh for guix-devel@gnu.org; Sun, 25 Dec 2016 13:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cLDvB-0003qS-Me for guix-devel@gnu.org; Sun, 25 Dec 2016 13:53:29 -0500 Received: from mail-pg0-x22f.google.com ([2607:f8b0:400e:c05::22f]:36428) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cLDvB-0003qA-DS for guix-devel@gnu.org; Sun, 25 Dec 2016 13:53:25 -0500 Received: by mail-pg0-x22f.google.com with SMTP id f188so127758114pgc.3 for ; Sun, 25 Dec 2016 10:53:25 -0800 (PST) Received: from localhost (cpe-76-176-71-91.san.res.rr.com. [76.176.71.91]) by smtp.gmail.com with ESMTPSA id k67sm76478790pfk.69.2016.12.25.10.53.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Dec 2016 10:53:22 -0800 (PST) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --===============0875033443== Content-Type: multipart/mixed; boundary="===============0517601431==" MIME-Version: 1.0 --===============0517601431== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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-age= nt 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 --===============0517601431== Content-Type: text/x-diff; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-pius-Update-to-2.2.2-0.891687c.patch" From=20581ff5477ad7dd0d58550ffcfa68116873a1a1bf 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 =C2=A9 2016 ng0 ;;; Copyright =C2=A9 2016 Christopher Baines ;;; Copyright =C2=A9 2016 Mike Gerwitz +;;; Copyright =C2=A9 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' sy= ntax - #: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))) + (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 parties. It is the main utility and makes it possible to quickly and easi= ly sign each UID on a set of PGP keys. It is designed to take the pain out of the sign-all-the-keys part of PGP Keysigning Party while adding security @@ -496,8 +506,8 @@ to the process. = pius-keyring-mgr and pius-party-worksheet help organisers of PGP keysigning parties.") - (license license:gpl2) - (home-page "https://www.phildev.net/pius/index.shtml"))) + (license license:gpl2) + (home-page "https://www.phildev.net/pius/index.shtml")))) = (define-public signing-party (package -- = 2.11.0 --===============0517601431==-- --===============0875033443== MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Description: signature Content-Type: application/pgp-signature; name="signature.asc"; charset="us-ascii" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0zLJ6STd4Cp+CgbIgs677ofYV8IFAlhgFZgACgkQgs677ofY V8JY/g//Ra0p4KmscMgIlAYj8dIQhunjsnRCChRNPnaa01IQuYpK92wrx7KnPGVv pckvttPPlQRWzrS9pRHuViPbAj1X8HfsoE/xUu9Xlsm8ODJQf6b7GxlzOzEhHBTJ MWdZ4eLIjoXke1TBu9DWGCdPdtGtbHWc5Z7tCnzDd/VtvBFxMCRVfKk1KmtsZw9k QXpOjrUP6RmdKsSLVKzN8Q2OTro8ybNkvGQkGMrrlWFDssFS0Y0Sz7cgaDKPlBZD uxZ63tASxZ3Cq6u+Dr19QoPpDqaWMrfF18kPDjuCJ3NpSR7gqAV8tAu0yhYupsn/ wYj9F1TAoFVhsp4cqEEcb9JDE4ihYCrTSR1h9lC00QBQCEOJHAYusmFu22ExcrgY oasz6dNRl+/WhjJG2VYBK84uLNWnPzFyDKMHBNuNQvWaK1+VbpN1zlNtM+TcMfHE gx1zQis3JNrVK35ROXMm2LCgDX0uhpE2LsIMkRH/dTH5QpnWZMy4wpIgrbWy4NN0 EXOGlRTfe+fS0Z7c9LbVlal6LhKsWp8OUMg8mgUTDq/zp13tFVTpiv6JB7+XEaXn einYnwIqjRSPAHfCVuNizCkAw3N/BxD6dAcF8GURSKDYSK0bNDG99Ka6dX94t2GK 4hzhKW/1sMGfcJGsnYpMLpeweyzriua1tlewqjyDDC4UWDUWy4M= =9+Kk -----END PGP SIGNATURE----- --===============0875033443==--