From patchwork Mon May 22 09:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Kortkamp X-Patchwork-Id: 50230 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 DCA2B27BBE9; Mon, 22 May 2023 10:47:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1CF6527BBE2 for ; Mon, 22 May 2023 10:47:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q128I-0002TZ-SQ; Mon, 22 May 2023 05:47:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q128B-0002T9-7v for guix-patches@gnu.org; Mon, 22 May 2023 05:47:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q128A-00053g-Vo for guix-patches@gnu.org; Mon, 22 May 2023 05:47:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1285-0008Ak-Sk; Mon, 22 May 2023 05:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60003] [PATCH v2 1/2] gnu: python-pykeepass: Update to 4.0.4. References: In-Reply-To: Resent-From: Tobias Kortkamp Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60003 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60003@debbugs.gnu.org Cc: Tobias Kortkamp , Lars-Dominik Braun , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , jgart Received: via spool by 60003-submit@debbugs.gnu.org id=B60003.168474876431316 (code B ref 60003); Mon, 22 May 2023 09:47:01 +0000 Received: (at 60003) by debbugs.gnu.org; 22 May 2023 09:46:04 +0000 Received: from localhost ([127.0.0.1]:33601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1279-000891-PS for submit@debbugs.gnu.org; Mon, 22 May 2023 05:46:04 -0400 Received: from mail-ej1-f43.google.com ([209.85.218.43]:39393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1278-00088H-7L for 60003@debbugs.gnu.org; Mon, 22 May 2023 05:46:02 -0400 Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-96fc07d7e6bso34129366b.1 for <60003@debbugs.gnu.org>; Mon, 22 May 2023 02:46:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684748756; x=1687340756; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=k2PeLpaGF6rqsQKxeNOsbICkAqmrV3jeHmA3jHgu23c=; b=aajckxbt9LLzYdxYdrDfnD0Vo5GAfoLrziz/PG4Omn9hjpuO/62GkIoRbFv+FAv4YQ zTQc+Zaj1e9+TCI2dhR1/NNdXU/JQD45EWGqWbBlDTpsB4vtu7NqrigyeFtcI6dtk7Lv K0EtSi8WlzHsbAgpbJl+zDmSg+ZSy7kxv5wizLyeI8fAfXizBus1ujEYAMN+B1qhwN29 UmGnq8uFm3SPXhp+Ia01ecmjEa+dcBA2fTXBazBooKME/FeEtZEo8UKWEXGS78EZasEk wDtQkXzVuC+mlbrSZocqi8fj6M34EJ+0fqzEAzfdvJOZefzu05eTdkJnWn6FjOwb2nko KfNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684748756; x=1687340756; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k2PeLpaGF6rqsQKxeNOsbICkAqmrV3jeHmA3jHgu23c=; b=TaqFGjcbQYzhKZDe54ZAliK8x6L2GE+iJaL9NS4qWKycyeifWGJpS/eUpKWd/t0SAA BrNwgCGnqrOEyEeeFV1JQOhtcwen7zELUWfcsrmVIO/AgWjKNOEsKNTQbzXZtT2L1QIV s8QTioseHuNCA2VmuiBx+wazJJKMTHIqp35ljwkVt9BJTEOvW/3REqKqTOI1mSVzmnXW R0YMeWrp4h8oi2zjqznfqm6jBzqLBkjNmjg4U0DTAcwRfr+xdZV7tJHrIO3QluK34nYZ vEmrsrsvxAFDQ5fLlZqB35dtHUWdbTqu1yJzMO+RF8ATQ7bNi9q2sDD6qEQ+lJkYVb2v waSw== X-Gm-Message-State: AC+VfDwMzIXTF4gxqTc2SkcM/VLL32+EMO9AOj080G5Pbf1SgoMOBuqG yguV0QQDRI4P4FH9rpgcNI2GndhSveU= X-Google-Smtp-Source: ACHHUZ76MRnXI+pKgGnmRBun0iJ4F/szm5pqs626tF6AikXcNRbVsgZ7QLSQjISFuM7vn6wUneWIrw== X-Received: by 2002:a17:906:1019:b0:96f:4cd0:56a1 with SMTP id 25-20020a170906101900b0096f4cd056a1mr8627566ejm.5.1684748756111; Mon, 22 May 2023 02:45:56 -0700 (PDT) Received: from anubis.kortkamp.xyz (p200300ff7f008500873e7d05b0b76269.dip0.t-ipconnect.de. [2003:ff:7f00:8500:873e:7d05:b0b7:6269]) by smtp.gmail.com with ESMTPSA id e14-20020a170906844e00b0095fd0462695sm2855262ejy.5.2023.05.22.02.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 02:45:55 -0700 (PDT) From: Tobias Kortkamp Date: Mon, 22 May 2023 11:45:48 +0200 Message-Id: <88ef10732de65df4d429462766c443603960571e.1684748692.git.tobias.kortkamp@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-crypto.scm (python-pykeepass): Update to 4.0.4. --- gnu/packages/python-crypto.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 849286ba66c96534bddc04df1a47d5692cbc977e diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index b1d94e85b8..16cfb440cb 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1025,17 +1025,17 @@ (define-public python-m2crypto (define-public python-pykeepass (package (name "python-pykeepass") - (version "3.2.1") + (version "4.0.4") (source (origin (method git-fetch) ;; Source tarball on PyPI doesn't include tests. (uri (git-reference (url "https://github.com/libkeepass/pykeepass") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1symxf4ahylynihnp9z4z3lh2vy65ipvg8s4hjrnn936hcaaxghk")))) + (base32 "0s5n519vxnx06kj9g6clfpfzgprhg71p1jswskajd7n9zwixlqxk")))) (build-system python-build-system) (arguments `(#:phases From patchwork Mon May 22 09:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Kortkamp X-Patchwork-Id: 50229 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 A9C8827BBE9; Mon, 22 May 2023 10:47:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6072227BBE2 for ; Mon, 22 May 2023 10:47:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q128G-0002TS-ON; Mon, 22 May 2023 05:47:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1286-0002RQ-Pc for guix-patches@gnu.org; Mon, 22 May 2023 05:47:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1286-00051r-Bh for guix-patches@gnu.org; Mon, 22 May 2023 05:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1286-0008Ar-7I for guix-patches@gnu.org; Mon, 22 May 2023 05:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60003] [PATCH v2 2/2] gnu: Add pass-import. Resent-From: Tobias Kortkamp Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60003 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60003@debbugs.gnu.org Cc: Tobias Kortkamp Received: via spool by 60003-submit@debbugs.gnu.org id=B60003.168474876831336 (code B ref 60003); Mon, 22 May 2023 09:47:02 +0000 Received: (at 60003) by debbugs.gnu.org; 22 May 2023 09:46:08 +0000 Received: from localhost ([127.0.0.1]:33604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q127E-00089L-3m for submit@debbugs.gnu.org; Mon, 22 May 2023 05:46:08 -0400 Received: from mail-ed1-f44.google.com ([209.85.208.44]:40256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q127C-00088M-5E for 60003@debbugs.gnu.org; Mon, 22 May 2023 05:46:07 -0400 Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-510f866ce78so555368a12.1 for <60003@debbugs.gnu.org>; Mon, 22 May 2023 02:46:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684748760; x=1687340760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kzFscY4iRg5716P75Aelz6Tl6hxzpCSzK5B19lSo3tM=; b=VHgMPitR8srqu8/VyQyi6Xx8soRzbynBF0N8oMG76FtkLNFOHTeRFnhRVwXQH6XlHj AJHLyoqYkQv2iu1TqOLuVQAoMoZc6fv3a7uFSMB5kERXgT9mi6TI+MqtAer36kHcgwIo ZCYZVthh74459cMynM6nt38GWW28+9tcgv9JoDSE3DA/y5vQWH9c95+obIqvd+dzA6qb VPIT4hW3yo5OeKj8kpxkqZddj498Aohq6aKZW4hAbWX84QS4cNmCQiVIIpm66L2m9FWB 4IXpaaeU93zaapAABg2HaSlyxfJZ7Mb9yIJs0Su63va5ZuiiCHk3lw2x1ne4HITaTKRa l0oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684748760; x=1687340760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kzFscY4iRg5716P75Aelz6Tl6hxzpCSzK5B19lSo3tM=; b=ech3LGDA462pIoKgT2mqy8VfDHt4r3M9XmqMYv2fuWcQi2IANQet5WRd8ZUCghXxTX nDDASGTuitbUmy80w3yZquB7qZmmA1jb+c+/WPOeCyGIJunRHSY/DrCQVW0s7TG8h742 RIx/Jo+Lz/6lSQL/lVESrqdEcIojR8geOHjmUOSf4zQAREg+fHVZmY83ZV8cr3BNM/kU P/Zv/c9cz0IJ9mSjhDL8+tLLXj/N4+CYI/DlYpL7XLlrHtm+i41zfj2vANHug/bjM/OV YVvBFvoCFYXe7vu3eiR57vt01P1nLYM9yarYOgTN4AdiW8S/Q9nGqTJxwinf+FEMlEM8 JgcQ== X-Gm-Message-State: AC+VfDwg0kEYbFluACj+mzktkbo++lE6xZapNSV4n6VAZcNXLyaBdj6T 1spjSnEScIGQRA92nlut6fsd6S9WQoc= X-Google-Smtp-Source: ACHHUZ673CN4FGA5qxMk9SyHBraiSEDDuQzwYG9wdG9S7FgVxoPtwiFuzb33mk/KoUMlEGj0eGOiJg== X-Received: by 2002:a17:906:2097:b0:965:86ed:ca6d with SMTP id 23-20020a170906209700b0096586edca6dmr8899278ejq.0.1684748760074; Mon, 22 May 2023 02:46:00 -0700 (PDT) Received: from anubis.kortkamp.xyz (p200300ff7f008500873e7d05b0b76269.dip0.t-ipconnect.de. [2003:ff:7f00:8500:873e:7d05:b0b7:6269]) by smtp.gmail.com with ESMTPSA id e14-20020a170906844e00b0095fd0462695sm2855262ejy.5.2023.05.22.02.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 02:45:59 -0700 (PDT) From: Tobias Kortkamp Date: Mon, 22 May 2023 11:45:49 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <88ef10732de65df4d429462766c443603960571e.1684748692.git.tobias.kortkamp@gmail.com> References: <88ef10732de65df4d429462766c443603960571e.1684748692.git.tobias.kortkamp@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/password-utils.scm (pass-import): New variable. --- gnu/packages/password-utils.scm | 72 +++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index f5f301308a..7805af6ffe 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2022 Nicolas Graves ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2022 Tobias Kortkamp ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,7 @@ (define-module (gnu packages password-utils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdesktop) @@ -1523,3 +1525,73 @@ (define-public xkcdpass license:lgpl2.0 ;finnish word list license:lgpl2.1 ;portuguese word list license:mpl1.1)))) ;portuguese word list + +(define-public pass-import + (package + (name "pass-import") + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/roddhjav/pass-import" + "/releases/download/v" version "/pass-import-" + version ".tar.gz")) + (sha256 + (base32 "18vh97h3bmspwqhb9xjkapk3p8hy4rxhazrcc06f6pdz8rb6rxxp")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("import.bash") + (("python3") + (search-input-file inputs "/bin/python3"))) + (substitute* '("setup.py") + (("base = '/usr'") + (string-append "base = '" #$output "'")) + (("sys\\.prefix") + (string-append "'" #$output "'"))))) + (add-after 'install 'wrap-extension + (lambda _ + (let ((pylib (string-append #$output "/lib/python" + #$(version-major+minor + (package-version python)) + "/site-packages")) + (extension "/lib/password-store/extensions/import.bash")) + (wrap-program (string-append #$output extension) + (list "GUIX_PYTHONPATH" ":" + 'prefix + (list (getenv "GUIX_PYTHONPATH") + pylib)))))) + (add-before 'check 'disable-lastpass-and-dbus-tests + (lambda _ + (substitute* '("tests/imports/test_parse.py") + ;; requires running D-Bus session + (("test_import_gnome_keyring") "disabled_test_import_gnome_keyring") + ;; requires lastpass + (("test_import_lastpass") "disabled_test_import_lastpass")) + (substitute* '("tests/exports/test_lastpass.py") + (("test_import_lastpass") "disabled_test_import_lastpass") + (("test_lastpass_exist") "disabled_test_lastpass_exist") + (("test_lastpass_insert") "disabled_test_lastpass_insert") + (("test_lastpass_show") "disabled_test_lastpass_show") + (("test_lastpass_list") "disabled_test_lastpass_list") + (("test_lastpass_isvalid") "disabled_test_lastpass_isvalid"))))))) + (inputs (list gnupg + password-store + python-cryptography + python-defusedxml + python-magic + python-pyaml + python-pykeepass + python-requests + python-secretstorage + python-zxcvbn)) + (home-page "https://github.com/roddhjav/pass-import") + (synopsis + "Pass extension for importing data from many password managers") + (description + "This package provides a pass extension for importing data from many password +managers. @command{pimport} can be used to export data to other password managers +like gopass or keepassxc.") + (license license:gpl3+)))