From patchwork Wed Jul 10 13:05:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Amar M. Singh" X-Patchwork-Id: 14553 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 CE4A3171DD; Wed, 10 Jul 2019 14:07:14 +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=unavailable 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 809F217192 for ; Wed, 10 Jul 2019 14:07:14 +0100 (BST) Received: from localhost ([::1]:32784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlCJV-0001F4-PW for patchwork@mira.cbaines.net; Wed, 10 Jul 2019 09:07:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43530) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlCJP-0001C4-HJ for guix-patches@gnu.org; Wed, 10 Jul 2019 09:07:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlCJK-0006zH-AD for guix-patches@gnu.org; Wed, 10 Jul 2019 09:07:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlCJK-0006zB-5T for guix-patches@gnu.org; Wed, 10 Jul 2019 09:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlCJJ-0002u4-Uz for guix-patches@gnu.org; Wed, 10 Jul 2019 09:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36575] [PATCH] gnu: shroud: Update to 6b79c8c. Resent-From: Amar Singh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2019 13:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36575@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156276397411105 (code B ref -1); Wed, 10 Jul 2019 13:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jul 2019 13:06:14 +0000 Received: from localhost ([127.0.0.1]:35050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlCIX-0002t2-OP for submit@debbugs.gnu.org; Wed, 10 Jul 2019 09:06:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:48416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlCIS-0002sr-JX for submit@debbugs.gnu.org; Wed, 10 Jul 2019 09:06:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43144) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlCIR-00010B-8a for guix-patches@gnu.org; Wed, 10 Jul 2019 09:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlCIP-0006Db-R7 for guix-patches@gnu.org; Wed, 10 Jul 2019 09:06:07 -0400 Received: from knopi.disroot.org ([178.21.23.139]:38542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlCIO-00066k-Uv for guix-patches@gnu.org; Wed, 10 Jul 2019 09:06:05 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7560336677 for ; Wed, 10 Jul 2019 15:05:54 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id stFWuwgUEgUS for ; Wed, 10 Jul 2019 15:05:53 +0200 (CEST) From: Amar Singh DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1562763953; bh=rSQ4D06uZgei50PgPfN+NthTHpi5p8KmJubijwgNfgM=; h=From:To:Subject:Date; b=dkn/5M3z9Kf3y58gTkEFBc01LDGrE7m84BChVnFR5RcScAU2miR2NWwra3SqaRDkO YUhtTqy0TbPj3i/tIHD2XOLeNl3kFZLhB6089BvkXoCEHixa+N4uUzMpvmcvC3zm6D SBLlQa+ma9eDUJAWm4EuMM4LCX5+AHj2Td6/yQMDCTiObW3RZN1snXgMKTNUQUp+ft 1TOzFq8FZ4nzzezUi3Fvhs35CpYb7GjQQddVYm/IMhNtlpaT0R2d93rG2lk2JePxNb z8A7ow5fMhzjUjJNZQiXftRKZqYC0E8MJ9Tq2R1CDV44YunVadae/5UiRLhlWLYfMt 00UQH8jfRdtJQ== Date: Wed, 10 Jul 2019 18:35:46 +0530 Message-ID: <85tvbum445.fsf@disroot.org> Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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 Update shroud password manager. Now builds with guile-2.2. (or possibly even 3.0). From 1e59791b4eb026a85ae3080650b28f759fe891f6 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Fri, 5 Jul 2019 12:46:31 +0530 Subject: [PATCH] gnu: shroud: Update to 6b79c8c. * (shroud): Update to 6b79c8c. Shroud now uses guile-2.2, git-fetch to download source. Add 'wrap-shroud build phase. --- gnu/packages/password-utils.scm | 85 +++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 49024b26c4..93d6b66e73 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages authentication) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -234,41 +235,65 @@ platforms.") (license license:artistic2.0))) (define-public shroud - (package - (name "shroud") - (version "0.1.1") - (source (origin - (method url-fetch) - (uri (string-append "https://files.dthompson.us/shroud/shroud-" - version ".tar.gz")) - (sha256 - (base32 - "1y43yhgy2zbrk5bqj3qyx9rkcz2bma9sinlrg7dip3jqms9gq4lr")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-shroud - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (ccachedir (string-append out "/lib/guile/2.0/ccache")) - (prog (string-append out "/bin/shroud"))) - (wrap-program prog - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) - #t)))))) - (inputs - `(("guile" ,guile-2.0) - ("gnupg" ,gnupg) - ("xclip" ,xclip))) - (synopsis "GnuPG-based secret manager") - (description "Shroud is a simple secret manager with a command line + (let ((commit "6b79c8c097b1d185929185bd57a36963660a1485")) + (package + (name "shroud") + (version (git-version "0.1.1" "3" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.dthompson.us/shroud.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s1pvlfj4c3nw2n3d8khhzhx1q0gfnspbh1d6jg3mij3r6wbkryy")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf-wrapper) + ("automake" ,automake) + ("gettext" ,gettext-minimal))) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-shroud + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (guile (assoc-ref inputs "guile")) + (xclip (assoc-ref inputs "xclip")) + (prog (string-append out "/bin/shroud")) + (deps (list xclip)) + (effective (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (path (map (cut string-append <> "/bin") + (delete #f deps))) + (ccachedir (string-append out + "/lib/guile/" effective "/site-ccache"))) + (wrap-program prog + `("PATH" ":" prefix ,path) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) + #t)))))) + (inputs + `(("guile" ,guile-2.2) + ("gnupg" ,gnupg) + ("xclip" ,xclip))) + (synopsis "GnuPG-based secret manager") + (description "Shroud is a simple secret manager with a command line interface. The password database is stored as a Scheme s-expression and encrypted with a GnuPG key. Secrets consist of an arbitrary number of key/value pairs, making Shroud suitable for more than just password storage. For copying and pasting secrets into web browsers and other graphical applications, there is xclip integration." ) - (home-page "https://dthompson.us/projects/shroud.html") - (license license:gpl3+))) + (home-page "https://dthompson.us/projects/shroud.html") + (license license:gpl3+)))) (define-public yapet (package -- 2.22.0