From patchwork Tue Apr 14 19:44:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 21256 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 07BA627BBE1; Tue, 14 Apr 2020 20:45:13 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, UNPARSEABLE_RELAY,URIBL_BLOCKED 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 ESMTP id 79AE827BBE4 for ; Tue, 14 Apr 2020 20:45:12 +0100 (BST) Received: from localhost ([::1]:38104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORUe-0007qz-0y for patchwork@mira.cbaines.net; Tue, 14 Apr 2020 15:45:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42172) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORUW-0007nC-26 for guix-patches@gnu.org; Tue, 14 Apr 2020 15:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jORUU-0006Hc-No for guix-patches@gnu.org; Tue, 14 Apr 2020 15:45:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jORUU-0006HU-KN for guix-patches@gnu.org; Tue, 14 Apr 2020 15:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jORUU-0003ne-Jp for guix-patches@gnu.org; Tue, 14 Apr 2020 15:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40631] [PATCH 2/4] gnu: Add libcacard. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Apr 2020 19:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40631@debbugs.gnu.org Received: via spool by 40631-submit@debbugs.gnu.org id=B40631.158689346614522 (code B ref 40631); Tue, 14 Apr 2020 19:45:02 +0000 Received: (at 40631) by debbugs.gnu.org; 14 Apr 2020 19:44:26 +0000 Received: from localhost ([127.0.0.1]:34857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jORTt-0003m3-KN for submit@debbugs.gnu.org; Tue, 14 Apr 2020 15:44:25 -0400 Received: from mira.cbaines.net ([212.71.252.8]:53606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jORTr-0003la-Hv for 40631@debbugs.gnu.org; Tue, 14 Apr 2020 15:44:24 -0400 Received: from localhost (unknown [46.237.163.111]) by mira.cbaines.net (Postfix) with ESMTPSA id A615227BBE4 for <40631@debbugs.gnu.org>; Tue, 14 Apr 2020 20:44:22 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id a3fb40db for <40631@debbugs.gnu.org>; Tue, 14 Apr 2020 19:44:20 +0000 (UTC) From: Christopher Baines Date: Tue, 14 Apr 2020 20:44:18 +0100 Message-Id: <20200414194420.15589-2-mail@cbaines.net> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200414194420.15589-1-mail@cbaines.net> References: <877dyh7tcn.fsf@cbaines.net> <20200414194420.15589-1-mail@cbaines.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Required for smartcard support in QEMU. * gnu/packages/spice.scm (libcacard): New variable. --- gnu/packages/spice.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 3445c64924..7d3525def6 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -21,6 +21,7 @@ (define-module (gnu packages spice) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages gl) @@ -31,9 +32,11 @@ #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages nss) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages security-token) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -287,6 +290,51 @@ resolution scaling on graphical console window resize.") (home-page "https://www.spice-space.org") (license license:gpl3+))) +(define-public libcacard + (package + (name "libcacard") + (version "2.7.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.freedesktop.org/spice/libcacard/uploads/" + "56cb2499198e78e560a1d4c716cd8ab1" + "/libcacard-" version ".tar.xz")) + (sha256 + (base32 + "0vyvkk4b6xjwq1ccggql13c1x7g4y90clpkqw28257azgn2a1c8n")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; TODO Tests require gnutls built with + ; p11-kit + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/setup-softhsm2.sh" + (("\\/usr\\/lib64\\/pkcs11\\/libsofthsm2\\.so") + (string-append (assoc-ref inputs "softhsm") + "/lib/softhsm/libsofthsm2.so"))) + #t))))) + (propagated-inputs + `(("glib" ,glib) ; Requires: in the pkg-config file + ("nss" ,nss))) ; Requires.private: in the pkg-config + ; file + (native-inputs + `(("openssl" ,openssl) + ("nss" ,nss "bin") + ("opensc" ,opensc) + ("softhsm" ,softhsm) + ("gnutls" ,gnutls) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (synopsis "Emulate and share smart cards with virtual machines") + (description + "The @acronym{CAC,Common Access Card} library can be used to emulate and +share smart cards from client system to local or remote virtual machines.") + (home-page "https://gitlab.freedesktop.org/spice/libcacard") + (license license:lgpl2.1+))) + (define-public virt-viewer (package (name "virt-viewer")