From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnlu5-0004er-3r for guix-patches@gnu.org; Thu, 09 Aug 2018 10:27:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnlu2-0002GQ-DP for guix-patches@gnu.org; Thu, 09 Aug 2018 10:27:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41016) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnlu2-0002GB-3j for guix-patches@gnu.org; Thu, 09 Aug 2018 10:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fnlu1-000706-NZ for guix-patches@gnu.org; Thu, 09 Aug 2018 10:27:01 -0400 Subject: [bug#32358] Add pcscd service Resent-Message-ID: From: Arun Isaac In-Reply-To: References: <87a7q2lqc6.fsf@garuda.local.i-did-not-set--mail-host-address--so-tickle-me> Date: Thu, 09 Aug 2018 19:55:59 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Chris Marusich Cc: 32358@debbugs.gnu.org --=-=-= Content-Type: text/plain Please find attached the updated patches. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-services-Add-pcscd-service.patch Content-Transfer-Encoding: quoted-printable >From 87133250c4d485988b2d29ec82d005befe3b5731 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 2 Aug 2018 05:32:56 +0530 Subject: [PATCH 1/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 | 31 +++++++++++++ gnu/local.mk | 1 + gnu/services/security-token.scm | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 gnu/services/security-token.scm diff --git a/doc/guix.texi b/doc/guix.texi index 080b091b3..595cf7bf2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20326,6 +20326,37 @@ An association list specifies kernel parameters an= d their values. @end table @end deftp =20 +@cindex pcscd +@subsubheading PC/SC Smart Card Daemon Service + +The @code{(gnu services security-token)} module provides the following ser= vice +to run @command{pcscd}, the PC/SC Smart Card Daemon. @command{pcscd} is t= he +daemon program for pcsc-lite and the MuscleCard framework. It is a resource +manager that coordinates communications with smart card readers, smart car= ds +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. +@item @code{usb-drivers} (default: @code{(list ccid)}) +List of packages that provide USB drivers to pcscd. Drivers are expected t= o be +under @file{pcsc/drivers} in the store directory of the package. +@end table +@end deftp + @cindex lirc @subsubheading Lirc Service =20 diff --git a/gnu/local.mk b/gnu/local.mk index c54a29720..8f7d56702 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -485,6 +485,7 @@ GNU_SYSTEM_MODULES =3D \ %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..8cda69c83 --- /dev/null +++ b/gnu/services/security-token.scm @@ -0,0 +1,80 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2018 Arun Isaac +;;; +;;; 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 . + +(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) + #:use-module (srfi srfi-26) + #:export (pcscd-configuration + pcscd-configuration? + pcscd-service-type)) + +;;; +;;; PC/SC Smart Card Daemon +;;; + +(define-record-type* + pcscd-configuration make-pcscd-configuration pcscd-configuration? + (pcsc-lite pcscd-configuration-pcsc-lite + (default pcsc-lite)) + (usb-drivers pcscd-configuration-usb-drivers + (default (list ccid)))) + +(define pcscd-shepherd-service + (match-lambda + (($ 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-activation + (match-lambda + (($ pcsc-lite usb-drivers) + #~(begin + (use-modules (guix build utils)) + (mkdir-p "/var/lib") + (symlink #$(directory-union + "pcsc" + (map (cut file-append <> "/pcsc") + usb-drivers)) + "/var/lib/pcsc"))))) + +(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)) + (service-extension activation-service-type + pcscd-activation))) + (default-value (pcscd-configuration)))) --=20 2.18.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-ccid-Move-pcsc-lite-from-inputs-to-native-inputs.patch >From 9e6f8943a9da4e786436c3e568a5628c28fdda48 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 9 Aug 2018 19:19:03 +0530 Subject: [PATCH 2/2] gnu: ccid: Move pcsc-lite from inputs to native-inputs. pcsc-lite only provides the headers to build ccid. So, it is sufficient that it be a native-input. * gnu/packages/security-token.scm (ccid)[inputs]: Move pcsc-lite to ... [native-inputs]: ... here. --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 7fdcaaf1e..ff0383d11 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -75,11 +75,11 @@ (("/bin/echo") (which "echo"))) #t))))) (native-inputs - `(("perl" ,perl) + `(("pcsc-lite" ,pcsc-lite) ; 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 -- 2.18.0 --=-=-=--