From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 0/2] New pinentries Date: Thu, 28 Apr 2016 05:49:09 +0300 Message-ID: <20160428024909.GB17619@debian-netbook> References: <1461679399-32659-1-git-send-email-efraim@flashner.co.il> <20160426171309.GA13138@jasmine> <20160426210059.GA15624@debian-netbook> <20160427170549.GB13823@jasmine> <20160428015943.GA17619@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="VywGB/WGlW4DM4P8" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avc0z-000627-5Q for guix-devel@gnu.org; Wed, 27 Apr 2016 22:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avc0v-0008J9-T3 for guix-devel@gnu.org; Wed, 27 Apr 2016 22:49:17 -0400 Received: from flashner.co.il ([178.62.234.194]:55863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avc0v-0008J2-H5 for guix-devel@gnu.org; Wed, 27 Apr 2016 22:49:13 -0400 Content-Disposition: inline In-Reply-To: <20160428015943.GA17619@debian-netbook> 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: Leo Famulari Cc: guix-devel@gnu.org --VywGB/WGlW4DM4P8 Content-Type: multipart/mixed; boundary="dTy3Mrz/UPE2dbVg" Content-Disposition: inline --dTy3Mrz/UPE2dbVg Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Assuming no-one has any objections, this is my current patch set for pinentry. $ ./pre-inst-env guix package -A pinentry pinentry 0.9.7 out gnu/packages/gnupg.scm:623:2 pinentry-gtk2 0.9.7 out gnu/packages/gnupg.scm:600:2 pinentry-qt 0.9.7 out gnu/packages/gnupg.scm:612:2 pinentry-tty 0.9.7 out gnu/packages/gnupg.scm:573:2 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --dTy3Mrz/UPE2dbVg Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-pinentry-Rename-to-pinentry-gtk2.patch" Content-Transfer-Encoding: quoted-printable =46rom 533668b17bcc901c132d93144a78f45c2f8aa918 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Thu, 28 Apr 2016 05:20:45 +0300 Subject: [PATCH 1/3] gnu: pinentry: Rename to pinentry-gtk2. * gnu/packages/gnupg.scm (pinentry): Rename to pinentry-gtk2. Define pinentry as pinentry-gtk2. --- gnu/packages/gnupg.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index d447007..6e16429 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -568,9 +568,9 @@ including tools for signing keys, keyring analysis, and= party preparation. (license license:gpl2) (home-page "http://pgp-tools.alioth.debian.org/"))) =20 -(define-public pinentry +(define-public pinentry-gtk2 (package - (name "pinentry") + (name "pinentry-gtk2") (version "0.9.7") (source (origin (method url-fetch) @@ -595,6 +595,10 @@ including tools for signing keys, keyring analysis, an= d party preparation. enter a passphrase when `gpg' or `gpg2' is run and needs it.") (license license:gpl2+))) =20 +(define-public pinentry + (package (inherit pinentry-gtk2) + (name "pinentry"))) + (define-public paperkey (package (name "paperkey") --=20 2.8.1 --dTy3Mrz/UPE2dbVg Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-pinentry-tty.patch" Content-Transfer-Encoding: quoted-printable =46rom 730e98dd23da1fb408ec8e1942a2cc526b3e988b Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Tue, 26 Apr 2016 16:29:21 +0300 Subject: [PATCH 2/3] gnu: Add pinentry-tty. * gnu/packages/gnupg.scm (pinentry-tty): New variable. [arguments]: Add pinentry-tty flag. (pinentry-gtk2): Inherit from pinentry-tty. [inputs]: Use gtk+-2, glib for pinentry-gtk2 only. [description]: Modify description based on inputs. --- gnu/packages/gnupg.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 6e16429..28ab67c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -568,9 +568,9 @@ including tools for signing keys, keyring analysis, and= party preparation. (license license:gpl2) (home-page "http://pgp-tools.alioth.debian.org/"))) =20 -(define-public pinentry-gtk2 +(define-public pinentry-tty (package - (name "pinentry-gtk2") + (name "pinentry-tty") (version "0.9.7") (source (origin (method url-fetch) @@ -580,21 +580,33 @@ including tools for signing keys, keyring analysis, a= nd party preparation. (base32 "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-pinentry-tty"))) (inputs `(("ncurses" ,ncurses) ("libassuan" ,libassuan) - ("libsecret" ,libsecret "out") - ("gtk+" ,gtk+-2) - ("glib" ,glib))) + ("libsecret" ,libsecret "out"))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://gnupg.org/aegypten2/") (synopsis "GnuPG's interface to passphrase input") (description - "Pinentry provides a console and a GTK+ GUI that allows users to -enter a passphrase when `gpg' or `gpg2' is run and needs it.") + "Pinentry provides a console that allows users to enter a passphrase = when +@code{gpg} or @code{gpg2} is run and needs it.") (license license:gpl2+))) =20 +(define-public pinentry-gtk2 + (package + (inherit pinentry-tty) + (name "pinentry-gtk2") + (inputs + `(("gtk+" ,gtk+-2) + ("glib" ,glib) + ,@(package-inputs pinentry-tty))) + (description + "Pinentry provides a console and a GTK+ GUI that allows users to ente= r a +passphrase when @code{gpg} or @code{gpg2} is run and needs it."))) + (define-public pinentry (package (inherit pinentry-gtk2) (name "pinentry"))) --=20 2.8.1 --dTy3Mrz/UPE2dbVg Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-Add-pinentry-qt.patch" Content-Transfer-Encoding: quoted-printable =46rom 843be013bae7207403b120e70ff1f115b2e1d967 Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Tue, 26 Apr 2016 16:39:31 +0300 Subject: [PATCH 3/3] gnu: Add pinentry-qt. * gnu/packages/gnupg.scm (pinentry-qt): New variable. --- gnu/packages/gnupg.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 28ab67c..b7c6612 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pth) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages compression) #:use-module (gnu packages databases) @@ -607,6 +608,17 @@ including tools for signing keys, keyring analysis, an= d party preparation. "Pinentry provides a console and a GTK+ GUI that allows users to ente= r a passphrase when @code{gpg} or @code{gpg2} is run and needs it."))) =20 +(define-public pinentry-qt + (package + (inherit pinentry-tty) + (name "pinentry-qt") + (inputs + `(("qt" ,qt) + ,@(package-inputs pinentry-tty))) + (description + "Pinentry provides a console and a Qt GUI that allows users to enter a +passphrase when @code{gpg} or @code{gpg2} is run and needs it."))) + (define-public pinentry (package (inherit pinentry-gtk2) (name "pinentry"))) --=20 2.8.1 --dTy3Mrz/UPE2dbVg-- --VywGB/WGlW4DM4P8 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXIXohAAoJEPTB05F+rO6TVP8P/jsdFcUOrWMteMNQsh/xtQXi L8zQjFHuMqFqFVOgOJ+CmRslU1VCJYf6rT2fOJrAL07CTRJeqPQBHAAASkTuM9BE mi3IWv01XZ1gY+/spVaDw8xFnDyKgb9uFcRDy2NlilebFdSsVPTR30irWlBb+X4B c5CPcy673FSf1VINuwd7GKLdwImV/eR6H50rn7DFlD6XQOCT1VUEr5AbB3xzUi8L UUUp1pQunJ6qb2/FhQww6F1jELh9w1oFkKQlU/y4RGZZtrj/WX5madf9cEKgHtLb AsPWJb/Wfo2NPSrGt47+qeA+FM692jH+GqzrC4H6OrKqifesk4A4DlWwPLxerF4V gYOHdFAHRMrzl0WEGCjvBbK8S6Fch9M/kUFw+ZjGhT4XEakh6nlZ7chzzejbg5KL rEkPVaS3HGPRgkG3bAdZbxFWW//TFxFQiA6GXwAH3XdvVMLKZAE5iZ/xkxfdyMBz Ddl8MhJ/1DnjUoiljrAN6gOZL1zzq+6DwVR8+maWq8VIGsEpsDfuKKenO0G38ImX JO3bZOwMwLZaDKOkWC4qVbPpyYTHNdTxH1OpRsZuaM0G/KKD91x758YI56ATXzXC 2k49X/x06ahYHTs39FVNSfeF2PvM2w9URugIePMBs92WtiY6HYLrHnoVXP1kmScm FY9XQWK0R/jPqMKhxAJV =lDSg -----END PGP SIGNATURE----- --VywGB/WGlW4DM4P8--