From patchwork Fri Jun 11 20:35:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 30178 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 E470B27BC81; Fri, 11 Jun 2021 21:36:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3629527BC78 for ; Fri, 11 Jun 2021 21:36:09 +0100 (BST) Received: from localhost ([::1]:44598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrnsu-0003gJ-AK for patchwork@mira.cbaines.net; Fri, 11 Jun 2021 16:36:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrnso-0003gA-5T for guix-patches@gnu.org; Fri, 11 Jun 2021 16:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lrnsn-0002YD-Tg for guix-patches@gnu.org; Fri, 11 Jun 2021 16:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lrnsn-0006ps-P5 for guix-patches@gnu.org; Fri, 11 Jun 2021 16:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48962] [PATCH] gnu: password-store: Update to 1.7.4. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Jun 2021 20:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48962 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48962@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162344374226250 (code B ref -1); Fri, 11 Jun 2021 20:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jun 2021 20:35:42 +0000 Received: from localhost ([127.0.0.1]:39982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrnsO-0006pC-3O for submit@debbugs.gnu.org; Fri, 11 Jun 2021 16:35:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:60304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrnsJ-0006p0-Ut for submit@debbugs.gnu.org; Fri, 11 Jun 2021 16:35:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrnsH-0003VU-W8 for guix-patches@gnu.org; Fri, 11 Jun 2021 16:35:30 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:36716 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrnsE-0002CG-RC for guix-patches@gnu.org; Fri, 11 Jun 2021 16:35:29 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1623443717; bh=8fKzqELpj70KUBKzXJcHz5AmKDC+Zp3e/2H68TfMDFI=; h=From:To:Subject:Date; b=qW2iyGauASpTZvcrzGBlScLgmkBpsVSSRChg3eArEuYaVIqJHixZaEzA1M1G9q/BM Xq68ltcDN/frdbJ7MhU8BJ0hNpeIrfVd4Q+Md2wwRu4ZCAnr43LAniB/8+WbL+QZAk +xPDPDTMSaYmLMT5McPuat4I7S2kfNNLP/3PKiCs= Message-Id: <5fca8e36733d89e119502d5b2c061a654211d6a5.1623443670.git.public@yoctocell.xyz> Date: Fri, 11 Jun 2021 22:35:16 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 46 X-Spam_score: 4.6 X-Spam_bar: ++++ X-Spam_report: (4.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.596, PDS_OTHER_BAD_TLD=1.997, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL=1.623 autolearn=no autolearn_force=no X-Spam_action: no action 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 * gnu/packages/password-utils.scm (password-store): Update to 1.7.4. --- gnu/packages/password-utils.scm | 174 ++++++++++++++++---------------- 1 file changed, 85 insertions(+), 89 deletions(-) base-commit: fa0e50e51a6e1106d523dd8271e74d16f36ec698 diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index ef091fd126..7d2b507f39 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -484,100 +485,95 @@ any X11 window.") (license license:gpl3+))) (define-public password-store - ;; The 1.7.3 release does not include support for wl-clipboard, which was - ;; added in b0b784b1a57c0b06936e6f5d6560712b4b810cd3. Instead, use the - ;; latest commit on master at the time of writing. - (let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4") - (revision "1")) - (package - (name "password-store") - (version (git-version "1.7.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.zx2c4.com/password-store") - (commit commit))) - (sha256 - (base32 - "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")) - (file-name (git-file-name name version)) )) - (build-system gnu-build-system) - (arguments - '(#:phases - (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")))) - #t)) - (add-before 'install 'patch-passmenu-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "contrib/dmenu/passmenu" - (("dmenu") (string-append (assoc-ref inputs "dmenu") - "/bin/dmenu")) - (("xdotool") (string-append (assoc-ref inputs "xdotool") - "/bin/xdotool"))) - #t)) - (add-after 'install 'install-passmenu - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "contrib/dmenu/passmenu" bin) - #t))) - (add-after 'install 'wrap-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (path (map (lambda (pkg) - (string-append (assoc-ref inputs pkg) "/bin")) - '("coreutils" "getopt" "git" "gnupg" "qrencode" - "sed" "tree" "which" "wl-clipboard" "xclip")))) - (wrap-program (string-append out "/bin/pass") - `("PATH" ":" prefix (,(string-join path ":")))) - #t)))) - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) - "WITH_ALLCOMP=yes" - (string-append "BASHCOMPDIR=" - %output "/etc/bash_completion.d")) - ;; Parallel tests may cause a race condition leading to a - ;; timeout in some circumstances. - #:parallel-tests? #f - #:test-target "test")) - (native-search-paths - (list (search-path-specification - (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") - (separator #f) ;single entry - (files '("lib/password-store/extensions"))))) - (inputs - `(("dmenu" ,dmenu) - ("getopt" ,util-linux) - ("git" ,git) - ("gnupg" ,gnupg) - ("qrencode" ,qrencode) - ("sed" ,sed) - ("tree" ,tree) - ("which" ,which) - ("wl-clipboard" ,wl-clipboard) - ("xclip" ,xclip) - ("xdotool" ,xdotool))) - (home-page "https://www.passwordstore.org/") - (synopsis "Encrypted password manager") - (description "Password-store is a password manager which uses GnuPG to + (package + (name "password-store") + (version "1.7.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.zx2c4.com/password-store") + (commit version))) + (sha256 + (base32 + "17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:phases + (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")))) + #t)) + (add-before 'install 'patch-passmenu-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "contrib/dmenu/passmenu" + (("dmenu") (string-append (assoc-ref inputs "dmenu") + "/bin/dmenu")) + (("xdotool") (string-append (assoc-ref inputs "xdotool") + "/bin/xdotool"))) + #t)) + (add-after 'install 'install-passmenu + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "contrib/dmenu/passmenu" bin) + #t))) + (add-after 'install 'wrap-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (path (map (lambda (pkg) + (string-append (assoc-ref inputs pkg) "/bin")) + '("coreutils" "getopt" "git" "gnupg" "qrencode" + "sed" "tree" "which" "wl-clipboard" "xclip")))) + (wrap-program (string-append out "/bin/pass") + `("PATH" ":" prefix (,(string-join path ":")))) + #t)))) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) + "WITH_ALLCOMP=yes" + (string-append "BASHCOMPDIR=" + %output "/etc/bash_completion.d")) + ;; Parallel tests may cause a race condition leading to a + ;; timeout in some circumstances. + #:parallel-tests? #f + #:test-target "test")) + (native-search-paths + (list (search-path-specification + (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") + (separator #f) ;single entry + (files '("lib/password-store/extensions"))))) + (inputs + `(("dmenu" ,dmenu) + ("getopt" ,util-linux) + ("git" ,git) + ("gnupg" ,gnupg) + ("qrencode" ,qrencode) + ("sed" ,sed) + ("tree" ,tree) + ("which" ,which) + ("wl-clipboard" ,wl-clipboard) + ("xclip" ,xclip) + ("xdotool" ,xdotool))) + (home-page "https://www.passwordstore.org/") + (synopsis "Encrypted password manager") + (description "Password-store is a password manager which uses GnuPG to store and retrieve passwords. The tool stores each password in its own GnuPG-encrypted file, allowing the program to be simple yet secure. Synchronization is possible using the integrated git support, which commits changes to your password database to a git repository that can be managed through the pass command.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public pass-otp (package