Package: guix-patches;
Reported by: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Fri, 3 Aug 2018 10:24:01 UTC
Severity: normal
Done: Arun Isaac <arunisaac <at> systemreboot.net>
Bug is archived. No further changes may be made.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Arun Isaac <arunisaac <at> systemreboot.net> To: guix-patches <at> gnu.org Subject: Add pcscd service Date: Fri, 03 Aug 2018 15:53:02 +0530
[Message part 1 (text/plain, inline)]
This patchset adds pcscd service. It is required for gpg to detect and use security tokens such as the Nitrokey and the Gnuk.
[0001-gnu-pcsc-lite-Link-to-USB-drivers-from-ccid.patch (text/x-patch, inline)]
From 3fe4571e27afcecd5cfb72059ece22969fd6f72a Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Thu, 2 Aug 2018 05:24:37 +0530
Subject: [PATCH 1/2] gnu: pcsc-lite: Link to USB drivers from ccid.
* gnu/packages/security-token.scm (pcsc-lite-bootstrap): New variable.
(ccid)[inputs]: Remove pcsc-lite.
[native-inputs]: Add pcsc-lite-bootstrap.
(pcsc-lite)[inputs]: Add ccid.
[arguments]: Set --enable-usbdropdir configure flag, linking to USB drivers
from ccid.
---
gnu/packages/security-token.scm | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 7fdcaaf1e..424f4626e 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2017 Ricardo Wurmus <rekado <at> elephly.net>
;;; Copyright © 2018 Chris Marusich <cmmarusich <at> gmail.com>
+;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,6 +30,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages autotools)
@@ -75,11 +77,11 @@
(("/bin/echo") (which "echo")))
#t)))))
(native-inputs
- `(("perl" ,perl)
+ `(("pcsc-lite-bootstrap" ,pcsc-lite-bootstrap) ; only required for headers
+ ("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs
- `(("libusb" ,libusb)
- ("pcsc-lite" ,pcsc-lite)))
+ `(("libusb" ,libusb)))
(home-page "https://ccid.apdu.fr/")
(synopsis "PC/SC driver for USB smart card devices")
(description
@@ -169,13 +171,16 @@ the low-level development kit for the Yubico YubiKey authentication device.")
"1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--enable-usbdropdir=/var/lib/pcsc/drivers"
- "--disable-libsystemd")))
+ `(#:configure-flags
+ (list (string-append "--enable-usbdropdir="
+ (assoc-ref %build-inputs "ccid") "/pcsc/drivers")
+ "--disable-libsystemd")))
(native-inputs
`(("perl" ,perl) ; for pod2man
("pkg-config" ,pkg-config)))
(inputs
- `(("libudev" ,eudev)))
+ `(("ccid" ,ccid)
+ ("libudev" ,eudev)))
(home-page "https://pcsclite.apdu.fr/")
(synopsis "Middleware to access a smart card using PC/SC")
(description
@@ -186,6 +191,16 @@ from a client application and provide access to the desired reader.")
license:isc ; src/strlcat.c src/strlcpy.c
license:gpl3+)))) ; src/spy/*
+(define pcsc-lite-bootstrap
+ (package
+ (inherit pcsc-lite)
+ (name "pcsc-lite-bootstrap")
+ (inputs
+ `(("libudev" ,eudev)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments pcsc-lite)
+ ((#:configure-flags _) '(list "--disable-libsystemd"))))))
+
(define-public ykclient
(package
(name "ykclient")
--
2.18.0
[0002-gnu-services-Add-pcscd-service.patch (text/x-patch, inline)]
From d565f247fc34680bf39c2618ea0ff05c229c2b54 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Thu, 2 Aug 2018 05:32:56 +0530
Subject: [PATCH 2/2] gnu: services: Add pcscd service.
* gnu/services/security-token.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (Miscellaneous Services): Document the service.
---
doc/guix.texi | 28 +++++++++++++++
gnu/local.mk | 1 +
gnu/services/security-token.scm | 63 +++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+)
create mode 100644 gnu/services/security-token.scm
diff --git a/doc/guix.texi b/doc/guix.texi
index 080b091b3..7e5212a66 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -20326,6 +20326,34 @@ An association list specifies kernel parameters and their values.
@end table
@end deftp
+@cindex pcscd
+@subsubheading PC/SC Smart Card Daemon Service
+
+The @code{(gnu services security-token)} module provides the following service
+to run @command{pcscd}, the PC/SC Smart Card Daemon. @command{pcscd} is the
+daemon program for pcsc-lite and the MuscleCard framework. It is a resource
+manager that coordinates communications with smart card readers, smart cards
+and cryptographic tokens that are connected to the system.
+
+@defvr {Scheme Variable} pcscd-service-type
+Service type for the @command{pcscd} service. Its value must be a
+@code{pcscd-configuration} object. To run pcscd in the default
+configuration, instantiate it as:
+
+@example
+(service pcscd-service-type)
+@end example
+@end defvr
+
+@deftp {Data Type} pcscd-configuration
+The data type representing the configuration of @command{pcscd}.
+
+@table @asis
+@item @code{pcsc-lite} (default: @code{pcsc-lite})
+The pcsc-lite package that provides pcscd.
+@end table
+@end deftp
+
@cindex lirc
@subsubheading Lirc Service
diff --git a/gnu/local.mk b/gnu/local.mk
index d1f9a193b..c637f0954 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -485,6 +485,7 @@ GNU_SYSTEM_MODULES = \
%D%/services/monitoring.scm \
%D%/services/networking.scm \
%D%/services/nfs.scm \
+ %D%/services/security-token.scm \
%D%/services/shepherd.scm \
%D%/services/sound.scm \
%D%/services/herd.scm \
diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm
new file mode 100644
index 000000000..888c92fb1
--- /dev/null
+++ b/gnu/services/security-token.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu services security-token)
+ #:use-module (gnu services)
+ #:use-module (gnu services shepherd)
+ #:use-module (gnu packages admin)
+ #:use-module (gnu packages security-token)
+ #:use-module (gnu system shadow)
+ #:use-module (guix gexp)
+ #:use-module (guix modules)
+ #:use-module (guix records)
+ #:use-module (ice-9 match)
+ #:export (pcscd-configuration
+ pcscd-configuration?
+ pcscd-service-type))
+
+;;;
+;;; PC/SC Smart Card Daemon
+;;;
+
+(define-record-type* <pcscd-configuration>
+ pcscd-configuration make-pcscd-configuration pcscd-configuration?
+ (pcsc-lite pcscd-configuration-package
+ (default pcsc-lite)))
+
+(define pcscd-shepherd-service
+ (match-lambda
+ (($ <pcscd-configuration> pcsc-lite)
+ (with-imported-modules (source-module-closure
+ '((gnu build shepherd)))
+ (shepherd-service
+ (documentation "PC/SC Smart Card Daemon")
+ (provision '(pcscd))
+ (modules '((gnu build shepherd)))
+ (start #~(make-forkexec-constructor
+ (list #$(file-append pcsc-lite "/sbin/pcscd") "-f")))
+ (stop #~(make-kill-destructor)))))))
+
+(define pcscd-service-type
+ (service-type
+ (name 'pcscd)
+ (description
+ "Run @command{pcscd}, the PC/SC smart card daemon.")
+ (extensions
+ (list (service-extension shepherd-root-service-type
+ (compose list pcscd-shepherd-service))))
+ (default-value (pcscd-configuration))))
--
2.18.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.