From patchwork Sat Apr 20 17:54:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 11924 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 26A7D16ED2; Sat, 20 Apr 2019 18:56:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DB0C716E94 for ; Sat, 20 Apr 2019 18:56:06 +0100 (BST) Received: from localhost ([127.0.0.1]:43921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHuDe-0007JH-Fi for patchwork@mira.cbaines.net; Sat, 20 Apr 2019 13:56:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHuDb-0007Iz-CU for guix-patches@gnu.org; Sat, 20 Apr 2019 13:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHuDa-0002FH-73 for guix-patches@gnu.org; Sat, 20 Apr 2019 13:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHuDa-0002Ej-2c for guix-patches@gnu.org; Sat, 20 Apr 2019 13:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHuDZ-0006Th-Su for guix-patches@gnu.org; Sat, 20 Apr 2019 13:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35346] [PATCH 1/2] gnu: password-store: Allow external packages to provide extensions. References: <81378750-7d26-44e0-ae44-7d38bc1ccfc6@www.fastmail.com> In-Reply-To: <81378750-7d26-44e0-ae44-7d38bc1ccfc6@www.fastmail.com> Resent-From: "Alex Griffin" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 17:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35346 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35346@debbugs.gnu.org Received: via spool by 35346-submit@debbugs.gnu.org id=B35346.155578292924852 (code B ref 35346); Sat, 20 Apr 2019 17:56:01 +0000 Received: (at 35346) by debbugs.gnu.org; 20 Apr 2019 17:55:29 +0000 Received: from localhost ([127.0.0.1]:46737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHuCv-0006Sd-0h for submit@debbugs.gnu.org; Sat, 20 Apr 2019 13:55:29 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:44659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHuCr-0006SL-Ub for 35346@debbugs.gnu.org; Sat, 20 Apr 2019 13:55:19 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 2A7A1497 for <35346@debbugs.gnu.org>; Sat, 20 Apr 2019 13:55:12 -0400 (EDT) Received: from imap1 ([10.202.2.51]) by compute6.internal (MEProxy); Sat, 20 Apr 2019 13:55:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; h= mime-version:message-id:date:from:to:subject:content-type; s= fm2; bh=xuYRDq+H3s3oLbiCog4i1yWToq2xDq/ZF9TYnODXt5M=; b=YSW1c/p6 WLhgMvGF+4fe5tGq3GTbW0auaG2mdMw4wcZOsekQHgz4fzDgNOhonrrCkFyg4PsG cI5+RYUxtWHTvYDm+L2F7XDLeAT8IYNJsmfcplp8NLBFfpki6sp02J2FiAKWOv9v BR2csLD42wg+7npGacyAGqpi80/ljkQh3H1DcsYWbaZRCIyRuU1fWvXaZI5qI2iD lb6yLboI5fFmz+8/UFYI+9JG4sETTgHCQhUz/XBNGgbOprILc545FvNUthhP1s6b nrQHZ7R0tF9LjosvLbwUEKAlh5neTnFAnPW7s7zxp+Fwd4N8XkKBJvZPjJGAUXKS YPtJ7wzTpbZTnw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=xuYRDq+H3s3oLbiCog4i1yWToq2xD q/ZF9TYnODXt5M=; b=qGjl+3JaYqGpxViY1uxxel+ySK3eHdezxGcmOrSQXHIc7 ednwmCFyXJAZmur0+Db9sCAatR1K78kKTh7Ei3j/RyGoKkGeo7rZhwWsDG3kPnSr KhXX8AhW7ypaXuCi+i5Du+c6i2b+zQGNChiq/p/g2W45ek+qnZgynUtz6MxWnGv6 +Hh3Ey2uKD/ejk7WNSeDrNmu7ST8Os4R4FfciCB7St+jx5H0XpwEPTxuXmEHv524 uQGcurow+ptf27WH6IDM1r3327/upMhuumz0hHQepwvKZAFpxoPrrS7EqpHTmN5M OtnxzHj2TbZMBXSdNtJ346DLukSDxcNB0r4+oos6w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrgedugdegtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkfffhvffutgesmhdtreerre erjeenucfhrhhomhepfdetlhgvgicuifhrihhffhhinhdfuceorgesrghjghhrfhdrtgho mheqnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrsegrjhhgrhhfrdgtohhmnecuvehluh hsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 6C9E5D48E2; Sat, 20 Apr 2019 13:55:11 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-443-g918f9d3-fmstable-20190416v3 Mime-Version: 1.0 X-Me-Personality: 27775493 Message-Id: <53ac7d03-43be-491d-a29e-ad530db4f691@www.fastmail.com> Date: Sat, 20 Apr 2019 13:54:52 -0400 From: "Alex Griffin" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * gnu/packages/password-utils.scm (password-store): Add environment variable PASSWORD_STORE_SYSTEM_EXTENSION_DIR to support pass extensions in external packages. [arguments]: Add patch-system-extension-dir phase. From c927c48cc4bf4dc564bc441d4574dea79c05b472 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 20 Apr 2019 11:56:23 -0500 Subject: [PATCH 1/2] gnu: password-store: Allow external packages to provide extensions. * gnu/packages/password-utils.scm (password-store): Add environment variable PASSWORD_STORE_SYSTEM_EXTENSION_DIR to support pass extensions in external packages. [arguments]: Add patch-system-extension-dir phase. --- gnu/packages/password-utils.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 5c11d8c437..b23dbf1fbb 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Jessica Tallon ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2016, 2019 Alex Griffin ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice @@ -423,6 +423,18 @@ any X11 window.") (modify-phases %standard-phases (delete 'configure) (delete 'build) + (add-before 'install 'patch-system-extension-dir + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (extension-dir (string-append out "/lib/password-store/extensions"))) + (substitute* "src/password-store.sh" + (("^SYSTEM_EXTENSION_DIR=.*$") + ;; lead with whitespace to prevent 'make install' from + ;; overwriting it again + (string-append " SYSTEM_EXTENSION_DIR=\"" + "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" + extension-dir + "}\"\n")))))) (add-before 'install 'patch-passmenu-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "contrib/dmenu/passmenu" -- 2.20.1 From patchwork Sat Apr 20 17:55:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 11925 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 D6C7616E94; Sat, 20 Apr 2019 18:57:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 392ED16E94 for ; Sat, 20 Apr 2019 18:57:06 +0100 (BST) Received: from localhost ([127.0.0.1]:43925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHuEb-0007Qe-SD for patchwork@mira.cbaines.net; Sat, 20 Apr 2019 13:57:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHuEZ-0007QU-Mf for guix-patches@gnu.org; Sat, 20 Apr 2019 13:57:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHuEY-0002ck-HV for guix-patches@gnu.org; Sat, 20 Apr 2019 13:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33198) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHuEY-0002cf-Db for guix-patches@gnu.org; Sat, 20 Apr 2019 13:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHuEY-0006VZ-BA for guix-patches@gnu.org; Sat, 20 Apr 2019 13:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35346] [PATCH 2/2] gnu: Add pass-otp. References: <81378750-7d26-44e0-ae44-7d38bc1ccfc6@www.fastmail.com> In-Reply-To: <81378750-7d26-44e0-ae44-7d38bc1ccfc6@www.fastmail.com> Resent-From: "Alex Griffin" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 17:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35346 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 35346@debbugs.gnu.org Received: via spool by 35346-submit@debbugs.gnu.org id=B35346.155578297124946 (code B ref 35346); Sat, 20 Apr 2019 17:57:02 +0000 Received: (at 35346) by debbugs.gnu.org; 20 Apr 2019 17:56:11 +0000 Received: from localhost ([127.0.0.1]:46742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHuDi-0006UH-LZ for submit@debbugs.gnu.org; Sat, 20 Apr 2019 13:56:11 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:54119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHuDg-0006U0-JS for 35346@debbugs.gnu.org; Sat, 20 Apr 2019 13:56:09 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id E229D859 for <35346@debbugs.gnu.org>; Sat, 20 Apr 2019 13:56:02 -0400 (EDT) Received: from imap1 ([10.202.2.51]) by compute6.internal (MEProxy); Sat, 20 Apr 2019 13:56:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; h= mime-version:message-id:date:from:to:subject:content-type; s= fm2; bh=aMTFKe6Y5TbD5wgRojevBilqnHoJ+hSfsHuM8anETI4=; b=uHVSNZVo Q/lQ0qJulHbmAmCn8XqVJ24QowykZOYcTYzVALjLyP1GHL64G69rzN9DKyrIK70c b9hHIl+LI5SLMBvT2TdeAHZsiw9QOH47AgM/jCGqRzHaUApGzC7gaDiAELp2vpZk /jAIdU1qVXUwYjN4j9xvSBuhfTvjjgXaUpiEjkYFwmHf1xWCB1WRFfVwTEWth4Kh f1TVDXoRKEyqWR4I49oMkG+i9tkWxVWaQUy8OOxHi76S5HMkk3iUGTrW8zEHIgq7 3JQxRIpZnU8CS8SxvQLFHgNLpFTMzflg6XIswuhQfXwE/3ZPu8BCxf4w3uh19Uyy RhjrvQMPNmPC2Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=aMTFKe6Y5TbD5wgRojevBilqnHoJ+ hSfsHuM8anETI4=; b=Q8ryTUkeQx9ufc+v0I5MyaxlLTSJlNmhbbQtLc8d9CAEA WJbM/X49ptqR+8rw75L/ZAMKkOwLVx/IIWe+vLReYkQkoZqwW9MOm9R11JahTxoR xfRoHP9/4bbejm/m0uFz6fKAhAbDFooWnV1+df+s4eEeLYswtia87JjjMMarxqFZ DWJaneteVX8ikKcAN7wrOwcs6kMk7D8e6JAo+ctEWTkgYjoGC/MbZZKCcQ4iLe6j fN/6mDJBY4pNi5zpmRn/stMYPvfZ/L0od4hN1eObiJEQATPWUKNWp/Yvy3il7v/z N5ziUV4W00wqzY5/z6ajZFixk/xHByP1yRD5eX2Rg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrgedugdegudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkfffhvffutgesmhdtreerre ertdenucfhrhhomhepfdetlhgvgicuifhrihhffhhinhdfuceorgesrghjghhrfhdrtgho mheqnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrsegrjhhgrhhfrdgtohhmnecuvehluh hsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 59A4FD48E2; Sat, 20 Apr 2019 13:56:02 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-443-g918f9d3-fmstable-20190416v3 Mime-Version: 1.0 X-Me-Personality: 27775493 Message-Id: <427dea7c-7fd4-4214-9bdc-c344a070e81d@www.fastmail.com> Date: Sat, 20 Apr 2019 13:55:57 -0400 From: "Alex Griffin" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * gnu/packages/password-utils.scm (pass-otp): New variable. From a04e90f450213be4cfc106096f18195e2e2ab931 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 20 Apr 2019 11:59:35 -0500 Subject: [PATCH 2/2] gnu: Add pass-otp. * gnu/packages/password-utils.scm (pass-otp): New variable. --- gnu/packages/password-utils.scm | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index b23dbf1fbb..a3caec22d9 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages aidc) + #:use-module (gnu packages authentication) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -74,6 +75,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages suckless) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) @@ -494,6 +496,57 @@ changes to your password database to a git repository that can be managed through the pass command.") (license license:gpl2+))) +(define-public pass-otp + (package + (name "pass-otp") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/tadfisher/pass-otp/releases/" + "download/v" version "/pass-otp-" version ".tar.gz")) + (sha256 + (base32 + "0rrs3iazq80dn0wbl20xkh270428jd8l99m5gd7hl93s4r4sc82p")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (let* ((out (assoc-ref %outputs "out")) + (bashcomp (string-append out "/etc/bash_completion.d"))) + (list (string-append "PREFIX=" %output) + (string-append "BASHCOMPDIR=" bashcomp))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'build 'patch-oath-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "otp.bash" + (("^OATH=.*$") + (string-append + "OATH=" + (assoc-ref inputs "oath-toolkit") + "/bin/oathtool\n"))) + #t))) + #:test-target "test")) + (native-search-paths + (list (search-path-specification + (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") + (files '("lib/password-store/extensions"))))) + (inputs + `(("password-store" ,password-store) + ("expect" ,expect) + ("oath-toolkit" ,oath-toolkit) + ("git" ,git) + ("gnupg" ,gnupg) + ("which" ,which))) + (home-page "https://github.com/tadfisher/pass-otp") + (synopsis "Pass extension for managing one-time-password (OTP) tokens") + (description " An extension for password-store that allows adding +one-time-password (OTP) secrets, generating OTP codes, and displaying secret +key URIs using the standard otpauth:// scheme.") + (license license:gpl3+))) + (define-public argon2 (package (name "argon2") -- 2.20.1