From patchwork Sat Apr 20 01:07:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 9599 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 1DCD716ECD; Sat, 20 Apr 2019 02:09:16 +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,FREEMAIL_FROM, 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 3A2BA16ECC for ; Sat, 20 Apr 2019 02:09:15 +0100 (BST) Received: from localhost ([127.0.0.1]:35159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeVG-0001FL-Ln for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 21:09:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeV6-00017n-HR for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHeV5-0003bi-6K for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59804) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHeV5-0003b0-2S for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHeV4-0006aq-Sy for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35333] [PATCH 1/6] gnu: Add python-pyfakefs and python2-pyfakefs. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 01:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35333@debbugs.gnu.org Received: via spool by 35333-submit@debbugs.gnu.org id=B35333.155572252125256 (code B ref 35333); Sat, 20 Apr 2019 01:09:02 +0000 Received: (at 35333) by debbugs.gnu.org; 20 Apr 2019 01:08:41 +0000 Received: from localhost ([127.0.0.1]:45098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUe-0006Yr-2k for submit@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:41 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:35046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUc-0006YZ-NR for 35333@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:35 -0400 Received: by mail-pg1-f195.google.com with SMTP id g8so3316835pgf.2 for <35333@debbugs.gnu.org>; Fri, 19 Apr 2019 18:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fjk+iLnHPpxNB4dvOQ6wA2stzt1yxRL0JNwTFEkZd94=; b=vEsqmn0G9nRzaR0/YQtYW/CpsNmR+w/pI3vK35xLSl/DUngWd8Vftc5KftVTPOuB5O F3ht+oZYnDzuE6jp78iyG05BCRM4adHE4gY3XekFHccCRVSCyc6XL7QeRYyTmdDgwD3g JA8wmiABR/KjY34xKIJgY4HHnFdhZ52jT5Pkm1ueXI9MnZDjtF7OtmXDsswl8T9XkZ1C WnAUymONA+q6Nbt7pi2B+HkkpXe33EF1PiauVUplXeNK0vEwYdKT/IlNioQewy+dHAql 0x+yt/DOmIZzeFW68ZYP0vFJxM5mGU4veljycwF/GSHAXOtk06FHC66u4iICxIAKBeQu xSUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fjk+iLnHPpxNB4dvOQ6wA2stzt1yxRL0JNwTFEkZd94=; b=r1oFaWGA18Ufaxq6Q/Q+e9YeMYV8CZclp9al9gMO/o39s+5wDUyqHYmf3tAfk0owMQ qfkcMLPbd/n5yDzvTDPAgJkQpZeUArqJoTF19G0CXFaH7j3kDyQz7innvQC2eJJFLyZ6 3Yn2/4iW2SdSmlJeNJmSxvPURh0fQVam60d8UdPc2fQ3QFErMmEqw3zJbqlJQrBVrrmJ 8mU3OIBKlp2h4irrWTp5yX4TGTVCFqjienuShn6t8tTa9a4aPWnwtGNpDFB9vpoWMr5C KfqaqvDgkBNokBb7YEQ/ODuMEzhqLKnh8lG7dGOcPdxIBpL2cgA/JvYh57WPMf87nl5j 4xZg== X-Gm-Message-State: APjAAAWzi6AOm6pxBN/GCoN5CpIyAGLu169dlct7H+iWpt0Yy14gqPCZ cmmQFOwUjpbXQPz+fr0smvHrFmlW X-Google-Smtp-Source: APXvYqxxT+NI+T1dZGnLRz/2mJ6jEvkrtIC3z1OtJjnecSjBTo18xElZrCejT08SMinPVijXLkmxpg== X-Received: by 2002:a63:4c:: with SMTP id 73mr6809904pga.210.1555722508445; Fri, 19 Apr 2019 18:08:28 -0700 (PDT) Received: from garuda.lan ([2601:601:9d80:25b2::fa8]) by smtp.gmail.com with ESMTPSA id h16sm8876885pgj.85.2019.04.19.18.08.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:08:27 -0700 (PDT) From: Chris Marusich Date: Fri, 19 Apr 2019 18:07:55 -0700 Message-Id: <20190420010800.5741-2-cmmarusich@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190420010800.5741-1-cmmarusich@gmail.com> References: <20190420003814.5120-1-cmmarusich@gmail.com> <20190420010800.5741-1-cmmarusich@gmail.com> MIME-Version: 1.0 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/python-pyfakefs-remove-bad-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add the patch. * gnu/packages/check.scm (python-pyfakefs, python2-pyfakefs): New variables. --- gnu/local.mk | 1 + gnu/packages/check.scm | 49 +++++++++++++++++++ .../python-pyfakefs-remove-bad-test.patch | 23 +++++++++ 3 files changed, 73 insertions(+) create mode 100644 gnu/packages/patches/python-pyfakefs-remove-bad-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 41924a7de5..3953e5b789 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1201,6 +1201,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ + %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index a38abf0b5b..df07525daa 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2017, 2018 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -2262,3 +2263,51 @@ record the properties and behaviour of particular devices, and to run a program or test suite under a test bed with the previously recorded devices loaded.") (license license:lgpl2.1+))) + +(define-public python-pyfakefs + (package + (name "python-pyfakefs") + (version "3.5.8") + (source (origin + (method url-fetch) + ;; Guix lint doesn't like that this release is an autogenerated + ;; archive, but it seems those are the only releases available. + (uri (pypi-uri "pyfakefs" version)) + (sha256 + (base32 + "0qb9jp0bqhc0dv0rn805fv99029fvx135f3bvka6scfkcl6jgllc")) + (patches (search-patches + "python-pyfakefs-remove-bad-test.patch")) + (file-name (string-append name "-" version ".tar.gz")))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The default test suite does not run these extra tests. + (add-after 'check 'check-pytest-plugin + (lambda _ + (invoke + "python" "-m" "pytest" + "pyfakefs/pytest_tests/pytest_plugin_test.py") + #t))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (build-system python-build-system) + ;; Guix lint doesn't like that this is a permanent redirect to the GitHub + ;; page, but the pyfakefs documentation asks us to use this specific URL + ;; when linking to the project. Honor their request. + (home-page "http://pyfakefs.org/") + ;; TRANSLATORS: In the synopsis, "Mock" is a verb. + (synopsis "Mock file system interactions in tests") + (description + "This package provides a Python library intended for use in automated +tests. One difficulty when testing software is that the code under test might +need to read or write to files in the local file system. If the file system +is not set up in just the right way, it might cause a spurious error during +the test. The pyfakefs library provides a solution to problems like this by +mocking file system interactions. In other words, it arranges for the code +under test to interact with a fake file system instead of the real file +system. The code under test requires no modification to work with pyfakefs.") + (license license:asl2.0))) + +(define-public python2-pyfakefs + (package-with-python2 python-pyfakefs)) diff --git a/gnu/packages/patches/python-pyfakefs-remove-bad-test.patch b/gnu/packages/patches/python-pyfakefs-remove-bad-test.patch new file mode 100644 index 0000000000..a9488bbe43 --- /dev/null +++ b/gnu/packages/patches/python-pyfakefs-remove-bad-test.patch @@ -0,0 +1,23 @@ +This test incorrectly assumes that the root user is always available. +However, in the build environment, the root user is not available. +Note that because the original file distributed in the release on PyPi +has lines ending in CRLF, those are retained in the diff below. + +--- a/pyfakefs/tests/fake_filesystem_test.py 1969-12-31 16:00:00.000000000 -0800 ++++ b/pyfakefs/tests/fake_filesystem_test.py 1969-12-31 16:00:00.000000000 -0800 +@@ -1021,15 +1021,6 @@ + self.assertEqual(self.path.expanduser('~'), + self.os.environ['HOME'].replace('/', '!')) + +- @unittest.skipIf(TestCase.is_windows or TestCase.is_cygwin, +- 'only tested on unix systems') +- def test_expand_root(self): +- if sys.platform == 'darwin': +- roothome = '!var!root' +- else: +- roothome = '!root' +- self.assertEqual(self.path.expanduser('~root'), roothome) +- + def test_getsize_path_nonexistent(self): + file_path = 'foo!bar!baz' + self.assertRaises(os.error, self.path.getsize, file_path) From patchwork Sat Apr 20 01:07:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 9600 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 0ADBB16ECD; Sat, 20 Apr 2019 02:09:28 +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,FREEMAIL_FROM, 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 CACAC16EA1 for ; Sat, 20 Apr 2019 02:09:26 +0100 (BST) Received: from localhost ([127.0.0.1]:35163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeVS-0001MK-Dr for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 21:09:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeV7-00017s-4S for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHeV5-0003cL-LT for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59805) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHeV5-0003cF-Hx for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHeV5-0006ay-Bs for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35333] [PATCH 2/6] gnu: Add python-pyscard and python2-pyscard. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 01:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35333@debbugs.gnu.org Received: via spool by 35333-submit@debbugs.gnu.org id=B35333.155572252525274 (code B ref 35333); Sat, 20 Apr 2019 01:09:03 +0000 Received: (at 35333) by debbugs.gnu.org; 20 Apr 2019 01:08:45 +0000 Received: from localhost ([127.0.0.1]:45104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUj-0006ZJ-C4 for submit@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:45 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:33667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUd-0006Yc-SN for 35333@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:37 -0400 Received: by mail-pl1-f195.google.com with SMTP id t16so3267069plo.0 for <35333@debbugs.gnu.org>; Fri, 19 Apr 2019 18:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BRm7uUCalrKLA7wEsMDOKKXQhlDUXz/PZ73iNBzcVis=; b=UwY50X+qoMet/UCdVk3Pgf5L71IBfnljCODwABGSGZ5EmrSjSJBd09yz7DMotkEUrK XjkLS8EkLRBVMW9PPhG4HkR5BEtZJ9bprmGRI9VLY/1XV7pJ8JI/woofBEHuPKqklcA5 rw9F6s9ovCZnlMcyCyWL0NN73EsY2e9LFBM4I+RJx7mE3FVDWFFdwyM2pp7UrhJ4V6C+ DwD4uWde5AFp8nihOvBtlwoBq657eS+ApLaeLAr7MrVBmJca5Z5y24yQSwDex/DSOzVG w2Dyb3TJ7kaRWgUScgr+XGMVke3MXJz626MToG7MgixruHolt93WwsvY8B8KWyfbn9C5 sdsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BRm7uUCalrKLA7wEsMDOKKXQhlDUXz/PZ73iNBzcVis=; b=XLye9YbEugO6lEwX52y3HIaUuDhebUfr3zj33wSgQUE/441C/Gb7GUTZOZ0jxroQ3d 9GM0GL8LkatnZlPtbGMUcY//R+IXU7GCxGQCt/mTXwsNFXagPF5IG+yUbCCaqYhFdcnC UVjZRDku4AcodB7gTjBLcIv83jRz2s9z5Wfm2DQzJ1IAmE2yzckkBUtd+OhdDhHKGY+u gW6wHNLIVoIrM6M+tMPvU0hTu4OjcqCdCLFlvPxKqKINXfUdF+3TwMnO9Cq1erbwvVtS wRFpHi4QYaYwnQyP96WGxOeBGQqO/gF4wTw6VbYZ0DFhtWegOV8RPyWfR8QMiiVWVlPF PsjQ== X-Gm-Message-State: APjAAAVO+zACBjlw6/G2Xd2d4ip6U7w5ESUSOiFFQM5gb65OhbE+naKh 2+svIuOgiwk1FrIlvn3EuIQpubnJ X-Google-Smtp-Source: APXvYqx7rHWMNtW93tdmgrJTCS/3Yh0WJszqfRUBZ8E0HEQ5+b7lp4OdibZkQPllsSyW+8iz/o+i6g== X-Received: by 2002:a17:902:2862:: with SMTP id e89mr7058120plb.203.1555722509779; Fri, 19 Apr 2019 18:08:29 -0700 (PDT) Received: from garuda.lan ([2601:601:9d80:25b2::fa8]) by smtp.gmail.com with ESMTPSA id h16sm8876885pgj.85.2019.04.19.18.08.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:08:28 -0700 (PDT) From: Chris Marusich Date: Fri, 19 Apr 2019 18:07:56 -0700 Message-Id: <20190420010800.5741-3-cmmarusich@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190420010800.5741-1-cmmarusich@gmail.com> References: <20190420003814.5120-1-cmmarusich@gmail.com> <20190420010800.5741-1-cmmarusich@gmail.com> MIME-Version: 1.0 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/security-token.scm (python-pyscard, python2-pyscard): New variables. --- gnu/packages/security-token.scm | 59 ++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index c88a1c6b2a..52bd80780c 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2018, 2019 Chris Marusich ;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. @@ -32,6 +32,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system python) #:use-module (gnu packages autotools) #:use-module (gnu packages curl) #:use-module (gnu packages check) @@ -51,6 +52,8 @@ #:use-module (gnu packages tex) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages swig) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -341,3 +344,57 @@ and other operations. It includes a library and a command-line tool.") line tools for personalizing YubiKeys. You can use these to set an AES key, retrieve a YubiKey's serial number, and so forth.") (license license:bsd-2))) + +(define-public python-pyscard + (package + (name "python-pyscard") + (version "1.9.8") + (source (origin + (method url-fetch) + ;; The maintainer publishes releases on various sites, but + ;; SourceForge is apparently the only one with a signed release. + (uri (string-append + "mirror://sourceforge/pyscard/pyscard/pyscard%20" + version "/pyscard-" version ".tar.gz")) + (sha256 + (base32 + "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Tell pyscard where to find the PCSC include directory. + (add-after 'unpack 'patch-platform-include-dirs + (lambda* (#:key inputs #:allow-other-keys) + (let ((pcsc-include-dir (string-append + (assoc-ref inputs "pcsc-lite") + "/include/PCSC"))) + (substitute* "setup.py" + (("platform_include_dirs = \\[.*?\\]") + (string-append + "platform_include_dirs = ['" pcsc-include-dir "']"))) + #t))) + ;; pyscard wants to dlopen libpcsclite, so tell it where it is. + (add-after 'unpack 'patch-dlopen + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "smartcard/scard/winscarddll.c" + (("lib = \"libpcsclite\\.so\\.1\";") + (simple-format #f + "lib = \"~a\";" + (string-append (assoc-ref inputs "pcsc-lite") + "/lib/libpcsclite.so.1")))) + #t))))) + (inputs + `(("pcsc-lite" ,pcsc-lite))) + (native-inputs + `(("swig" ,swig))) + (home-page "https://github.com/LudovicRousseau/pyscard") + (synopsis "Smart card library for Python") + (description + "The pyscard smart card library is a framework for building smart card +aware applications in Python. The smart card module is built on top of the +PCSC API Python wrapper module.") + (license license:lgpl2.1+))) + +(define-public python2-pyscard + (package-with-python2 python-pyscard)) From patchwork Sat Apr 20 01:07:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 9601 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 B73E616ECD; Sat, 20 Apr 2019 02:09:34 +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,FREEMAIL_FROM, 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 415C716EA1 for ; Sat, 20 Apr 2019 02:09:34 +0100 (BST) Received: from localhost ([127.0.0.1]:35165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeVZ-0001Qr-S4 for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 21:09:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeV7-00017t-BQ for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHeV6-0003d3-4U for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHeV6-0003cp-1I for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHeV5-0006b6-Rz for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35333] [PATCH 3/6] gnu: Add libu2f-host. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 01:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35333@debbugs.gnu.org Received: via spool by 35333-submit@debbugs.gnu.org id=B35333.155572252525281 (code B ref 35333); Sat, 20 Apr 2019 01:09:03 +0000 Received: (at 35333) by debbugs.gnu.org; 20 Apr 2019 01:08:45 +0000 Received: from localhost ([127.0.0.1]:45106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUn-0006Zb-6u for submit@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:45 -0400 Received: from mail-pf1-f179.google.com ([209.85.210.179]:40764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUf-0006Ye-C2 for 35333@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:38 -0400 Received: by mail-pf1-f179.google.com with SMTP id c207so3190193pfc.7 for <35333@debbugs.gnu.org>; Fri, 19 Apr 2019 18:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X5jkl8Zboi2HkA7x4iQS8QxcX782k08IDp2k7MK5GBo=; b=NqauP8jk+XAZsRDiI9HRpeLcOmSieTy1B4JeLBfaGQbYh/8L0ObzPLadPo5E9m6t4A eyBs2gHm9P53ox9TWN2YRscvhI/xdv92TdjKhr87kLfMFRhtinLNHrtd7fOukpudcswU jO8GI8/s0usJ/lCTJ48XKh5W9SHHazoy2zHGbfnB5gdi4QqHfXvVrlMoUPp+SxfkVtKD iDJRwww5cYvtMZTIhVwbMQZOk/T/ZEcSkRSIh6PbnbfXt2fCqmiqqcq9caPDbYIPDPZU MEiG4NVA5I/3O0fhFrXwrxtgpVtbkDQvdtiPTn+vi7vWGLjS0zcIHS/0/ZEH2XMSXDCn Vh+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X5jkl8Zboi2HkA7x4iQS8QxcX782k08IDp2k7MK5GBo=; b=KlWgyT6247fBuU4hxN78G/Jlf3BUpUSecC14wOPLwg26+OCSHUoiUSfoK+co8Ekbwh SZV36HVhR93BC+aIz8GTXP0h2vmc6fkN7K7Ajcg3+Kp5wtOJ0eP4RoWmxlj+j0zs3EYG /fdJ8Xrm6RkyA3y2Y9Qp2vWj0Ggr3xRNSlFa0z/yUYL4/AZFMY26Ya/WMbzTtxyr3TbI kWp/hkkF0CfHbK8bzg4JZGGp7YZe6jkU1R3vc2xybhOO7qkRny7Rxvs04t0U6plgJf6A CKIaELiIUl5rZNoBcb6G8Jma6bl0+d7t7kgcReeo8wi/DeWkmM4vhhUvV39WBSWLxdPM qfvA== X-Gm-Message-State: APjAAAULTUy7t+eKRiZ1rxPObcYgaMX4zOdr+giPcMGRwDGGTeKwPZMC kCzF9Yt5akbnpI+vPglYUWJimMt2 X-Google-Smtp-Source: APXvYqyYmvechr+IyWF2X1C+pIDN7hglDL3xMvRccmkPnTfnKilsGdRNPId5r7WqqAW3SQhECl6Yuw== X-Received: by 2002:a63:1a42:: with SMTP id a2mr6685755pgm.358.1555722511043; Fri, 19 Apr 2019 18:08:31 -0700 (PDT) Received: from garuda.lan ([2601:601:9d80:25b2::fa8]) by smtp.gmail.com with ESMTPSA id h16sm8876885pgj.85.2019.04.19.18.08.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:08:30 -0700 (PDT) From: Chris Marusich Date: Fri, 19 Apr 2019 18:07:57 -0700 Message-Id: <20190420010800.5741-4-cmmarusich@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190420010800.5741-1-cmmarusich@gmail.com> References: <20190420003814.5120-1-cmmarusich@gmail.com> <20190420010800.5741-1-cmmarusich@gmail.com> MIME-Version: 1.0 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/security-token.scm (libu2f-host): New variable. --- gnu/packages/security-token.scm | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 52bd80780c..26541b3d09 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -398,3 +398,54 @@ PCSC API Python wrapper module.") (define-public python2-pyscard (package-with-python2 python-pyscard)) + +(define-public libu2f-host + (package + (name "libu2f-host") + (version "1.1.9") + (source (origin + (method url-fetch) + (uri + (string-append + "https://developers.yubico.com" + "/libu2f-host/Releases/libu2f-host-" version ".tar.xz")) + (sha256 + (base32 + "1hnh3f4scx07v9jfkr1nnxasmydk1cmivn0nijcp2p75bc1fznip")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-gtk-doc" + (string-append "--with-udevrulesdir=" + (assoc-ref %outputs "out") + "/lib/udev/rules.d")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + ;; Avoid a network connection attempt during the build. + (substitute* "gtk-doc/u2f-host-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd"))) + #t))))) + (inputs + `(("json-c" ,json-c) + ("hidapi" ,hidapi))) + (native-inputs + `(("help2man" ,help2man) + ("gengetopt" ,gengetopt) + ("pkg-config" ,pkg-config) + ("gtk-doc" ,gtk-doc) + ("docbook-xml" ,docbook-xml-4.3) + ("eudev" ,eudev))) + (home-page "https://developers.yubico.com/libu2f-host/") + ;; TRANSLATORS: The U2F protocol has a "server side" and a "host side". + (synopsis "U2F host-side C library and tool") + (description + "Libu2f-host provides a C library and command-line tool that implements +the host-side of the Universal 2nd Factor (U2F) protocol. There are APIs to +talk to a U2F device and perform the U2F Register and U2F Authenticate +operations.") + ;; Most files are LGPLv2.1+, but some files are GPLv3+. + (license (list license:lgpl2.1+ license:gpl3+)))) From patchwork Sat Apr 20 01:07:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 9597 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 99A0216ECD; Sat, 20 Apr 2019 02:09:11 +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,FREEMAIL_FROM, 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 D8FE316EA1 for ; Sat, 20 Apr 2019 02:09:10 +0100 (BST) Received: from localhost ([127.0.0.1]:35153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeVC-0001BN-CG for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 21:09:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeV7-00017u-Ri for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHeV6-0003dj-LU for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHeV6-0003dU-Gz for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHeV6-0006bD-AS for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35333] [PATCH 4/6] gnu: Add public-suffix-list. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 01:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35333@debbugs.gnu.org Received: via spool by 35333-submit@debbugs.gnu.org id=B35333.155572252625289 (code B ref 35333); Sat, 20 Apr 2019 01:09:04 +0000 Received: (at 35333) by debbugs.gnu.org; 20 Apr 2019 01:08:46 +0000 Received: from localhost ([127.0.0.1]:45108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUn-0006Zj-IO for submit@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:45 -0400 Received: from mail-pl1-f180.google.com ([209.85.214.180]:34798) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUg-0006Yg-Fj for 35333@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:39 -0400 Received: by mail-pl1-f180.google.com with SMTP id y6so3270078plt.1 for <35333@debbugs.gnu.org>; Fri, 19 Apr 2019 18:08:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rBBJvbbrFlQ6jQYGzTQI4PHggql5f5DkJ3jdUHCQ3VY=; b=kOl64CyAK5r19zTjhO7LfSZd2BDja+FcxYY9wcrU8Hob2xBCmoP1Q3CpB4YxObU7f4 URvwD7Zitr3csko+U+NrDOI3+yE1+Tpdv2j05LGY6s37zO5OcsHhFig202Z/aQbu+PRA jh3GcQ2P3wWAHxwXkDjb31X928ULsPv34fY27loZVpAbspdmgkI2b6ujxzWSPoVWDddd HLsPqCyN0u3YH5xI6KacDC4DQEF6z+09CXP4YeS6cgJPhZ7pJpjEnakNL5Fd0tc6GLhk QSrCvCY1ZwdebiW1jd/Wsh7FaFb+/qQjGi2GCFJrbgPPwVBK2lD/0IICkws1C7BwyJ5j /O/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rBBJvbbrFlQ6jQYGzTQI4PHggql5f5DkJ3jdUHCQ3VY=; b=AoIOJ2Bl1TThxHbb0pYrhp9w/Voc/VDlN7qc2wX+u7ASl4sFr9/Txj0bmybPChNizs RXpgm9xeUc8N9LaG+3XA+5Lq8a7YxLJu269Ig3Dh9unSOv7lXTXadVoJQEBAeuYgVqLo 4xMQee01ldFSHnzC3sT1A55rJf32rHsbTjLm0h2HswQaRkbaNtCnFZBXPa5ksTqRK71i ggTQceI/mK8KGdinIvINcR+3BOWuLmkmWXeWAbZF1xR7tVmayFtHx0ZLuJ2AUgN+MSXD wFkBOIflX5pWNaixgZRFKpFdT9yuO2s2BAYJLgEujRoAJiF10P1nJ7DrwdGa6Egjz2nq fU9g== X-Gm-Message-State: APjAAAUB8HHy7wKpZjqva1UE+LcTFbjbZMWwYJag8e6FA/6yucIaMoxG HMErXR6PB7RDdOGmEC6h4IuUYjS9 X-Google-Smtp-Source: APXvYqwkKOZH3d2h5DMKBQWm3P0qJbxrSbRqLCwl6jfEDjRuA/jgb8yfVPQ5JDWqohijMyk7ckaHfA== X-Received: by 2002:a17:902:20c6:: with SMTP id v6mr6608776plg.276.1555722512364; Fri, 19 Apr 2019 18:08:32 -0700 (PDT) Received: from garuda.lan ([2601:601:9d80:25b2::fa8]) by smtp.gmail.com with ESMTPSA id h16sm8876885pgj.85.2019.04.19.18.08.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:08:31 -0700 (PDT) From: Chris Marusich Date: Fri, 19 Apr 2019 18:07:58 -0700 Message-Id: <20190420010800.5741-5-cmmarusich@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190420010800.5741-1-cmmarusich@gmail.com> References: <20190420003814.5120-1-cmmarusich@gmail.com> <20190420010800.5741-1-cmmarusich@gmail.com> MIME-Version: 1.0 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dns.scm (public-suffix-list): New variable. --- gnu/packages/dns.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 9cffe3b822..416c9e4264 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -807,3 +808,53 @@ mDNS resolver as well as an announcer. mDNS (Multicast Domain Name System) is a zero-config service that allows one to resolve host names to IP addresses in local networks.") (license license:lgpl2.1))) + +(define-public public-suffix-list + ;; Mozilla releases the official list here: + ;; + ;; https://publicsuffix.org/list/public_suffix_list.dat + ;; + ;; However, Mozilla syncs that file from the GitHub repository periodically, + ;; so its contents will change over time. If you update this commit, please + ;; make sure that the new commit refers to a list which is identical to the + ;; officially published list available from the URL above. + (let ((commit "9375b697baddb0827a5995c81bd3c75877a0b35d")) + (package + (name "public-suffix-list") + (version (git-version "0" "1" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/publicsuffix/list.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1sm7pni01rnl4ldzi8z8nc4cbgq8nxda9gwc68v0s3ij7jd1jmik")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + ;; Install to /share because that is where "read-only + ;; architecture-independent data files" should go (see: + ;; (standards) Directory Variables). Include the version in + ;; the directory name so that if multiple versions are ever + ;; installed in the same profile, they will not conflict. + (destination (string-append + out "/share/public-suffix-list-" ,version)) + (source (assoc-ref %build-inputs "source"))) + (with-directory-excursion source + (install-file "public_suffix_list.dat" destination) + (install-file "LICENSE" destination)) + #t)))) + (home-page "https://publicsuffix.org/") + (synopsis "Database of current and historical DNS suffixes") + (description "This is the Public Suffix List maintained by Mozilla. A +\"public suffix\" is one under which Internet users can (or historically +could) directly register names in the Domain Name System (DNS). Some examples +of public suffixes are .com, .co.uk and pvt.k12.ma.us. This is a list of all +known public suffixes.") + (license license:mpl2.0)))) From patchwork Sat Apr 20 01:07:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 9596 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 639B716ECD; Sat, 20 Apr 2019 02:09:10 +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,FREEMAIL_FROM, 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 D23B716EA1 for ; Sat, 20 Apr 2019 02:09:09 +0100 (BST) Received: from localhost ([127.0.0.1]:35151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeVB-0001AN-Di for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 21:09:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeV8-000189-Im for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHeV7-0003eX-7r for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHeV6-0003dy-W9 for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHeV6-0006bL-Pl for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35333] [PATCH 5/6] gnu: Add python-fido2 and python2-fido2. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 01:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35333@debbugs.gnu.org Received: via spool by 35333-submit@debbugs.gnu.org id=B35333.155572252625296 (code B ref 35333); Sat, 20 Apr 2019 01:09:04 +0000 Received: (at 35333) by debbugs.gnu.org; 20 Apr 2019 01:08:46 +0000 Received: from localhost ([127.0.0.1]:45110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUo-0006Zq-0d for submit@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:46 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:43072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUh-0006Yi-MT for 35333@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:40 -0400 Received: by mail-pg1-f195.google.com with SMTP id z9so3296514pgu.10 for <35333@debbugs.gnu.org>; Fri, 19 Apr 2019 18:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KgnaG3XGCXkPBCB/oew0HKjo8BYCUOkmXTZPW+KAsxw=; b=ewvTFJPI8xrhNkaHbAD16TtXFysUqZjPpGwQHJCLC2LGPjf7tQT43ydKIhmDmMYzl+ OF4Hi6K3PQRyJYWEwN5e4x88KKpc6rljLzntN8hF+Lxdr1dUWQYOid9pGf0+2NahhMic xh/5L5rXAksmAP4Z2iZhpp7cXtYkpfu/uBnt+eTkxu/oJaU9L38xwHhMnneyWyPeWNoI U3wNlSpJlnEXDnCIDMJD7X0c6NT77OOJpRjJOCrTcfM04H9n2R+PIX7GT/vv2VFNLK4D +0Q31FcuMk31yN7zOOglSLVAQjXm+nxH4IwF6NSc/6nrfn14hNYp7C1KPdbFaPkSHPVS tqDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KgnaG3XGCXkPBCB/oew0HKjo8BYCUOkmXTZPW+KAsxw=; b=l+oSgXrddf+D7IjJ+XiSBcUDp2fHACUXv8GCoTDCk1wzA0NgnW3lYXEJemZPoGKq/A i+NptpaMOzYuzd8vLL5jLdTTywSDz3w/6J3JnXQQuryk4wpYcxkvLJggHibqwZcZOSpT eXX5/1orWgv644PWPPh5XJk1/T/AKlP3vGAM7ivCnr4/A3SNuXmA4GYpdoEPt9RRFweL wVTCSiAw3mjpxzTxwPyhB8Mah5T3QcdrJJitPcOdgOn+YEBSPMW5YCPiww8fJF+c99Tl bmGUgnIxa61K0NysH1n+IlduNxcoQWfqXAuP2uBmUlZb2FOip42H2+GwqwxWWsM47yYt wFjQ== X-Gm-Message-State: APjAAAUl8oBe98FT45idbZmHIT3tYmKt3bo8tvuvVlygas/4jqMNIB4Q eZzZvL0ozdF8J6MOKE/WN2UsvrVV X-Google-Smtp-Source: APXvYqxemxQNQSgkaL1OUw/dfrwtJ6OF/29kar8vL3n8Mmp6ZvVJre3/oOwdvrv8IFC93/GZ+q6trQ== X-Received: by 2002:a62:6c6:: with SMTP id 189mr7092904pfg.36.1555722513687; Fri, 19 Apr 2019 18:08:33 -0700 (PDT) Received: from garuda.lan ([2601:601:9d80:25b2::fa8]) by smtp.gmail.com with ESMTPSA id h16sm8876885pgj.85.2019.04.19.18.08.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:08:32 -0700 (PDT) From: Chris Marusich Date: Fri, 19 Apr 2019 18:07:59 -0700 Message-Id: <20190420010800.5741-6-cmmarusich@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190420010800.5741-1-cmmarusich@gmail.com> References: <20190420003814.5120-1-cmmarusich@gmail.com> <20190420010800.5741-1-cmmarusich@gmail.com> MIME-Version: 1.0 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/security-token.scm (python-fido2, python2-fido2): New variables. --- gnu/packages/security-token.scm | 61 +++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 26541b3d09..29c424d21d 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -29,6 +29,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -38,6 +39,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages dns) #:use-module (gnu packages gettext) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) @@ -53,6 +55,8 @@ #: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-xyz) #:use-module (gnu packages swig) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -449,3 +453,60 @@ talk to a U2F device and perform the U2F Register and U2F Authenticate operations.") ;; Most files are LGPLv2.1+, but some files are GPLv3+. (license (list license:lgpl2.1+ license:gpl3+)))) + +(define-public python-fido2 + (package + (name "python-fido2") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri + (string-append + "https://github.com/Yubico/python-fido2/releases/download/" + version "/fido2-" version ".tar.gz")) + (sha256 + (base32 + "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3")) + (snippet + ;; Remove bundled dependency. + #~(delete-file "fido2/public_suffix_list.dat")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-public-suffix-list + (lambda* (#:key inputs #:allow-other-keys) + (copy-file + (string-append (assoc-ref inputs "public-suffix-list") + "/share/public-suffix-list-" + ,(package-version public-suffix-list) + "/public_suffix_list.dat") + "fido2/public_suffix_list.dat") + #t))))) + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-six" ,python-six))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pyfakefs" ,python-pyfakefs) + ("public-suffix-list" ,public-suffix-list))) + (home-page "https://github.com/Yubico/python-fido2") + (synopsis "Python library for communicating with FIDO devices over USB") + (description + "This Python library provides functionality for communicating with a Fast +IDentity Online (FIDO) device over Universal Serial Bus (USB) as well as +verifying attestation and assertion signatures. It aims to support the FIDO +Universal 2nd Factor (U2F) and FIDO 2.0 protocols for communicating with a USB +authenticator via the Client-to-Authenticator Protocol (CTAP 1 and 2). In +addition to this low-level device access, classes defined in the +@code{fido2.client} and @code{fido2.server} modules implement higher level +operations which are useful when interfacing with an Authenticator, or when +implementing a Relying Party.") + ;; python-fido2 contains some derivative files originally from pyu2f + ;; (https://github.com/google/pyu2f). These files are licensed under the + ;; Apache License, version 2.0. The maintainers have customized these + ;; files for internal use, so they are not really a bundled dependency. + (license (list license:bsd-2 license:asl2.0)))) + +(define-public python2-fido2 + (package-with-python2 python-fido2)) From patchwork Sat Apr 20 01:08:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Marusich X-Patchwork-Id: 9598 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 B06FC16EA1; Sat, 20 Apr 2019 02:09:12 +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,FREEMAIL_FROM, 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 0165A16EA1 for ; Sat, 20 Apr 2019 02:09:12 +0100 (BST) Received: from localhost ([127.0.0.1]:35157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeVD-0001CD-Eb for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 21:09:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHeV8-00018b-SG for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHeV7-0003ey-IH for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHeV7-0003es-Ey for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHeV7-0006bS-8t for guix-patches@gnu.org; Fri, 19 Apr 2019 21:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35333] [PATCH 6/6] gnu: Add python-yubikey-manager and python2-yubikey-manager. Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Apr 2019 01:09:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35333 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35333@debbugs.gnu.org Received: via spool by 35333-submit@debbugs.gnu.org id=B35333.155572252625302 (code B ref 35333); Sat, 20 Apr 2019 01:09:05 +0000 Received: (at 35333) by debbugs.gnu.org; 20 Apr 2019 01:08:46 +0000 Received: from localhost ([127.0.0.1]:45112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUo-0006Zx-DM for submit@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:46 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:34058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHeUj-0006Yq-5R for 35333@debbugs.gnu.org; Fri, 19 Apr 2019 21:08:41 -0400 Received: by mail-pf1-f176.google.com with SMTP id b3so3208211pfd.1 for <35333@debbugs.gnu.org>; Fri, 19 Apr 2019 18:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iVaWN90250acOHJFFsiCsZ93ykCTIrfJH6rxExpyBBU=; b=i4n7RoDmaThNUyd2Cp4cwKEPxm5kDCHJjzfYCCEkRvmZM3AT2ZfQ+GpMfV+YYsT7G7 ormgEKckRsQU6zVn0Nv9SAxoWjHHiO3wTsQdtUjoFudsKbRze+o2PSWbBRS/alf2QgSi sPZ2VD8xyyR9xXQFSaPCRQmtxuooRzUk7csITttKbSkONNjjZ4WI5S6XpIroyt2faP3T o+HkFRmmB2hCM54aXE9oV8isrjj1Xzd5OSaUIcWzy8GYPDGTPR/3CaKci601Zap+biTG KYfCSYRpib2O850/2AVxHykWXQQ1fZBrNNCV2FT7sVewm5sSB2V25mr1h0AeNdc1cXXH Qohg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iVaWN90250acOHJFFsiCsZ93ykCTIrfJH6rxExpyBBU=; b=ng1KDz719s0AZ9CqoVUCa4py7o/Z1g8w2/khAU+MnLMF1+pklIrvXcPDTzoCdVJMsa u3oumJLJZUl0orOffSQegc1WIGReUOsQcngzvgyMxWN5LcgR/mhPSe/fGoVY2uXaTxrJ d4dsxrLYnwXIuX5oYAmWmugNphYuyOgD+WC1wbT9r3Zqty3FSRjV5QTiRldzo6uDKt01 Bm/sZNI9oNUmH0sBnfFGMz48QzKZ8w6b82CwuWMYueWeQfemsS2E8ZLIxvdMOmUSUcs5 v/VYuq71HLyTFSviIuw4F8Gaf6P03kEA7DENYlUWROZtJMt4hSt2Dkp4mOj61SGUfw5C IS+w== X-Gm-Message-State: APjAAAXACKZDLeDkBPGgjGQH+rN2m4a9eJQuWXMtnh9iZKOa+bIYujRj +Z9fALt0KiiBVB8acxOSm6CzvitH X-Google-Smtp-Source: APXvYqzzp0SFVQ8VgWiBWnWxLGk+XAVpM/UGNGhJTp+Le6Vkr1MRvgyjhl3XFXkXwl7sM4QL6FV6wQ== X-Received: by 2002:a62:47d0:: with SMTP id p77mr6980559pfi.95.1555722515066; Fri, 19 Apr 2019 18:08:35 -0700 (PDT) Received: from garuda.lan ([2601:601:9d80:25b2::fa8]) by smtp.gmail.com with ESMTPSA id h16sm8876885pgj.85.2019.04.19.18.08.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 18:08:34 -0700 (PDT) From: Chris Marusich Date: Fri, 19 Apr 2019 18:08:00 -0700 Message-Id: <20190420010800.5741-7-cmmarusich@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190420010800.5741-1-cmmarusich@gmail.com> References: <20190420003814.5120-1-cmmarusich@gmail.com> <20190420010800.5741-1-cmmarusich@gmail.com> MIME-Version: 1.0 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/security-token.scm (python-yubikey-manager) (python2-yubikey-manager): New variables. --- gnu/packages/security-token.scm | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 29c424d21d..95ef7975bd 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -510,3 +510,43 @@ implementing a Relying Party.") (define-public python2-fido2 (package-with-python2 python-fido2)) + +(define-public python-yubikey-manager + (package + (name "python-yubikey-manager") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://developers.yubico.com/yubikey-manager/Releases" + "/yubikey-manager-" version ".tar.gz")) + (sha256 + (base32 + "11rsmcaj60k3y5m5gdhr2nbbz0w5dm3m04klyxz0fh5hnpcmr7fm")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-pyscard" ,python-pyscard) + ("python-pyusb" ,python-pyusb) + ("python-click" ,python-click) + ("python-cryptography" ,python-cryptography) + ("python-pyopenssl" ,python-pyopenssl) + ("python-fido2" ,python-fido2))) + (inputs + `(("yubikey-personalization" ,yubikey-personalization) + ("pcsc-lite" ,pcsc-lite) + ("libusb" ,libusb))) + (native-inputs + `(("swig" ,swig) + ("python-mock" ,python-mock))) + (home-page "https://developers.yubico.com/yubikey-manager/") + (synopsis "Command line tool and library for configuring a YubiKey") + (description + "Python library and command line tool for configuring a YubiKey. Note +that after installing this package, you might still need to add appropriate +udev rules to your system configuration to be able to configure the YubiKey as +an unprivileged user.") + (license license:bsd-2))) + +(define-public python2-yubikey-manager + (package-with-python2 python-yubikey-manager))