From fab8a9f9c33e889e70a3fb2358d986c72e17efc3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 9 Aug 2018 19:19:03 +0530 Subject: 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 7fdcaaf1e..68cda5017 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,11 +76,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 -- cgit v1.3 From 5799e5ae07a09d7d83ab64edb3a19e92243c9547 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Aug 2018 14:45:45 +0200 Subject: gnu: opensc: Update to 0.18.0. * gnu/packages/security-token.scm (opensc): Update to 0.18.0. [arguments]: Add phase to disable test which fails in this release. --- gnu/packages/security-token.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 68cda5017..4369a8342 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -219,7 +219,7 @@ website for more information about Yubico and the YubiKey.") (define-public opensc (package (name "opensc") - (version "0.17.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (string-append @@ -227,7 +227,7 @@ website for more information about Yubico and the YubiKey.") version "/opensc-" version ".tar.gz")) (sha256 (base32 - "0043jh5g7q2lyd5vnb0akwb5y349isx7vbm9wqhlgav7d20wcwxy")))) + "0mrpik6ifzh27ws7h0viv8nwgcdj3fp5whaldmj0zhfi1l1zzh4v")))) (build-system gnu-build-system) (arguments `(#:phases @@ -244,7 +244,13 @@ website for more information about Yubico and the YubiKey.") (("DEFAULT_PCSC_PROVIDER=\"libpcsclite\\.so\\.1\"") (string-append "DEFAULT_PCSC_PROVIDER=\"" libpcsclite "\""))) - #t)))))) + #t))) + (add-before 'check 'disable-broken-test + (lambda _ + ;; XXX: This test is fixed in git, remove this phase for >= 0.19. + (substitute* "doc/tools/Makefile" + (("TESTS = test-manpage.sh") "TESTS = ")) + #t))))) (inputs `(("readline" ,readline) ("openssl" ,openssl) -- cgit v1.3 From aa3ad4b11981013ed6a73481f5829f20561d84e6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Aug 2018 14:52:58 +0200 Subject: gnu: yubico-piv-tool: Update to 1.6.0 [fixes CVE-2018-14779, CVE-2018-14780]. * gnu/packages/security-token.scm (yubico-piv-tool): Update to 1.6.0. [inputs]: Add GENGETOPT. [native-inputs]: Add HELP2MAN. --- gnu/packages/security-token.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/security-token.scm') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 4369a8342..d4e0437a5 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages man) #:use-module (gnu packages networking) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages popt) #:use-module (gnu packages readline) #:use-module (gnu packages tls) #:use-module (gnu packages tex) @@ -273,7 +274,7 @@ authentication, encryption and digital signatures. OpenSC implements the PKCS (define-public yubico-piv-tool (package (name "yubico-piv-tool") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append @@ -281,15 +282,17 @@ authentication, encryption and digital signatures. OpenSC implements the PKCS name "-" version ".tar.gz")) (sha256 (base32 - "1axa0lnky5gsc8yack6mpfbjh49z0czr1cv52gbgjnx2kcbpb0y1")))) + "1p0df35qfm2xch64hc1x6k4gpgfl4hiqph5ai30bq8w7yxa3lvfc")))) (build-system gnu-build-system) (inputs - `(("perl" ,perl) + `(("gengetopt" ,gengetopt) + ("perl" ,perl) ("pcsc-lite" ,pcsc-lite) ("openssl" ,openssl))) (native-inputs `(("doxygen" ,doxygen) ("graphviz" ,graphviz) + ("help2man" ,help2man) ("check" ,check) ("texlive-bin" ,texlive-bin) ("pkg-config" ,pkg-config))) -- cgit v1.3