From patchwork Sat Feb 18 00:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Leporte X-Patchwork-Id: 47084 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 CD1E116952; Sat, 18 Feb 2023 00:37:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 87D7716586 for ; Sat, 18 Feb 2023 00:37:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pTBDs-0005Q9-Fk; Fri, 17 Feb 2023 19:37:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pTBDr-0005Pz-92 for guix-patches@gnu.org; Fri, 17 Feb 2023 19:37:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pTBDr-0002F9-08 for guix-patches@gnu.org; Fri, 17 Feb 2023 19:37:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pTBDq-0007qR-TD for guix-patches@gnu.org; Fri, 17 Feb 2023 19:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61018] [PATCH v5 2/2] gnu: Add pcsc-tools. Resent-From: Jake Leporte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Feb 2023 00:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61018 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61018@debbugs.gnu.org Cc: Jake Leporte Received: via spool by 61018-submit@debbugs.gnu.org id=B61018.167668058830107 (code B ref 61018); Sat, 18 Feb 2023 00:37:02 +0000 Received: (at 61018) by debbugs.gnu.org; 18 Feb 2023 00:36:28 +0000 Received: from localhost ([127.0.0.1]:41922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTBDH-0007pS-Kh for submit@debbugs.gnu.org; Fri, 17 Feb 2023 19:36:27 -0500 Received: from mail-bn8nam11olkn2010.outbound.protection.outlook.com ([40.92.20.10]:21440 helo=NAM11-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pTBDG-0007p8-7i for 61018@debbugs.gnu.org; Fri, 17 Feb 2023 19:36:26 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WPVAOsiQ5BFRPcv/b0Cl8j3iml68UQsGOjlrL9c89KPz+fixISvzK8lsubjH/4X3Bd8hl+yAvZfjVyRXGBmPHHm9tzC42c/cGwj26M3FTqcy5dKP9o71MF9iSAvl9Dq9CKexpZDGc9U9llY4aT6KwiZ+bmSP/wnV5HjrwwBNet2MIi0fR+qaZGt/FrsMpkIyJ1cqAyEWHOw0O7OcJYzIyLtUj89RJukuvLAnpzkwZ4dPdT8olI9qu0Vhczd+f7hBpwnV8zUc7LxCJI0yEMTxJLFxINzbpZhh2ji8IzlpftFuM9JwwM21J0/yUEsgTFM6ehPEvUWfdHlsufg9AYJ9Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hi5j6vVIqDxI3JKpTxF7prqh3QyMNhImp7Q+ZWcXwLA=; b=W8Z4w2kzqeW4lUtHdGjiXzLFvh2e5rgcPscyTDKWUMDpMCQq1ILoC7xYFUh0QB02F8DxeklFA5qbpYusdxsRKnIdnjb6tsMWg/eiS7T/O+NGizFp70Qh4s9gWJaG0ksMlRd+Zbq1rXqJWxQpUGYpsJ4PKax2iS1ixFKcC97dA3b1CB1bsUXoYNRBZFUzJx/atN41vB/CpE4pGZU5lTUQ2jTHlZ0ewD3Em2dSHG6aVUsXUNGQRaCYum/PYa/kLc2W1nG9GfZyjgeo/npa8LkQ1gFOkLWxV9DlX/fZ6ljr0ygP05mvSf9/GbeKKJEaQPhWDbdl9aEuv8TK+rsawAMKcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hi5j6vVIqDxI3JKpTxF7prqh3QyMNhImp7Q+ZWcXwLA=; b=uT9inYnj0zBHHhZrhscWmEoWujsGB7prygrGB2FuHFj8H8/kMG2g67Bo8IewIdrw8dc2/f9Ow8ms0Cahv0y2yepsP1wi2of+6LRurfA/yooxDxHdx/xMhp9LpHlExKmcT2hF6Ypt0UUzdRgtMDDEXshUs1ekTtiPJT8ca+GC18Sv8y1SMyNV3Kl1Vj3rZQDu9vFb9JTiVLfetNxvO5UnkyhoUFzspr3OcgAYcWeXyawKOamuK5AIaQomYVrsfWXjSaU9p2ONinFNevt4pvbr/A+U+LZW6PZV9LzfBUZj14QQyYYbQUiB1lApii75Ae94yfT79lp5LVtSWnWfEUFW9w== Received: from MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) by SJ2PR20MB6067.namprd20.prod.outlook.com (2603:10b6:a03:504::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.26; Sat, 18 Feb 2023 00:36:20 +0000 Received: from MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::54e4:62df:c788:9c14]) by MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::54e4:62df:c788:9c14%3]) with mapi id 15.20.6111.012; Sat, 18 Feb 2023 00:36:19 +0000 From: Jake Leporte Date: Fri, 17 Feb 2023 18:36:06 -0600 Message-ID: X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230218003606.25201-1-jakeleporte@outlook.com> References: <20230218003606.25201-1-jakeleporte@outlook.com> X-TMN: [fppXofKZZ01zD8mwaY+uQ4dWq6Nb0a4asG3fJD2+CmuU+2pGcd4Oaw==] X-ClientProxiedBy: CH0PR03CA0207.namprd03.prod.outlook.com (2603:10b6:610:e4::32) To MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) X-Microsoft-Original-Message-ID: <20230218003606.25201-2-jakeleporte@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR20MB2605:EE_|SJ2PR20MB6067:EE_ X-MS-Office365-Filtering-Correlation-Id: f7120411-daf8-487e-d897-08db11482729 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3km3SoSfoYXTcqDh9D0lTtYailRGDAShD4Nm4siXqLExNwH/+xdikYKT7ZYgz5gmLRqFFYNV75ogpuFDcHKWIXnSTJz4msGkP9BKB6t0SX/eWVwPTNKlxTVyTXM+x//+kOkZzxeOgMG5RPFM/APjp29o42oveRjaA/DuH1nmEt23y3DmGpSLZk0KJIbzo5NclbnZD2BifOFkoeEP3vdM91xlovYIN0SNSBmqT30QtmijlJX6DP+O1T2amyGspGLE7RDLs2cq/4tW//Todd/SFunJzLl6dNfD2WyxzNTIVjBJQWgeGgC6XxEqu0vpfPaNL8xj9NlCBy3KDVHxghSLSRZoAZp1+qmM2Yr/WbdVp86ElfmYGdu3MjymJXTbThBzO6R26s7G7ZDC3VJXiK8c54P9M0T1YhfwglXWZ2wVcQGVmtnV6nKly233dX14FqWm3DvBh7XmRoGCq7npmNtFPxR2DEHSXzQjuAGjljYsX2mLFJq8pWdOXj1i6MdgaW+ALNXBENXHnjma7heKURKdZEQBIYNVhZU4hkqjcIyDB2Aep/uQ/Kg5M+NK1LuepxDFajC4wWrBPJOmTfCbdctx9bNFSES8m/UMRKj/DWMbi5epdJij4hnU4kLXNYUvwsACXSf26BGJetM6KfmjJJVhOhp8o/es5gqzMCN0a4ZPh9lQBGTrGD827Dij8ymS3qES2on2X6UDN6l/9QdhAjC5ksjQdHa+6ycEp6Strq7dN/NSt+8uyj7SkOtqczmGzjowXwnZMsPF21XRBSnPKxe2CS6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZSPKElfv1Ksraipa63f2oFV7dbQNPOTCRgJYDCQG5chnhZew+3Zi/DESyEteiJo6XMBl36Qlxw+XaAPj3ISt2W5COIRhbllPbJbE6krosqNCHl02YFTFIjQoNBMiHJXAGWAJcIr+U6gwJbRrmOvtNMLQZdMHz0iE+1eIkzqG5FTSinTi/vNUZRAWP68fnSsvvwALsLAC7T1mnVZI5Iq2V+WxLUyhy/F0BvZmTRnIAo8u4kiqT21OKfx0aN9/tmgPy5oA7T7FlBpKAP1ujHo+wuWXwP6oJh6Ap4BIZtLdKQshLZ8PSokWoxScZ+OW4FzibZaf5CntDsfw1SVLaE91KfsdK8AxCGLki01a9KrTfH9z1ofwePJ+/cxW5vDAscMtf/PPjM029cjBarFmoSavUp0SQ85SvGTHZagqEvyDySfKZhqePzbCMp7ZS1XRW4sJgKQiMCuvsaZh9x+W5PKyLA2NXmkp5ad+iAPGZ1/haNP/MNQXMnKnl7A/glt++03WkREfBFa9+7WTDU++o5FgIZP06NJbMKCG1U/NN2nK9Z/Q9bbNncXNj6c6MtIptFk6P8RFhNzJxNEj8FHULsOaiYbvScpnTMsfU7KtFRbaGXhgVlO0sL/ZgbaJVdKWu0dPG2T5ZFzhMVxt/EJ6ZCNNCw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y/MKTKVd7fkzLvtfoAzG+fvyzVJCglYaUWWx04lo37SqRDIl2z9CZrY2xu/CYCwezvi7m1YFa56HTde3zWdz6jy1IIf4KhG0Kw5wTVPqMyUmfNFyiPc8Z3b5X6HuRHkkBxM6YtyLsPKFZoOnM4yRx4VdRbZWMwWIYuRFid4HJpV1Gz8bJW6vJwp8xwL4xlOaOoDzGxsBD3HbnDO7H/JB5L35ul/k0pTJ50DRJCCyf1GUfwZpHXz1zGOEXKMwh8rdB4Z7L9C68JMrTH8AKqCuEJwmN3m8LY+2egyFWufkl4MihU3tDuWBkvhSZsVwR8k/kGwmfz6bvzybMu9tyMM+2AxgS/dPKWqf9NK6hhRFKH3msAaF/O9rA5CWS7tTpqEMXzo7skaRRhcnqdv2z2go2XVAqEF7hy5DNNxv0yxdGjUd+z6hyN+bpnAuo5qcsfEu9CcA8Ly4QU5hmgCfNIyQOaLDPjQZhRhb7AgTZaC1rLtkAlQvsH+zJkqEgwDx43FA6swzXmt6Fm9I56rWtBLRug4xC9HJ202clKuiWts+4Y08ECUbSh5ZOKZR3Bs2niVlPZlF0HVvT713i9W1AEonQCcaxqLTIhU20r5o2Z6dzOpafQQw/wchix73f3oy3edcADDCHPuLARBb4+nrO4OLiIsaZCOOc7Ou53VbYJXKBpGlP0vLvdke6Orj14nDDTOViHfydpUZfKqt6axTaVVQENbUjaOyMTJtakVNuMfBViDuT3xUN4glFxLdp6TNCkqWtembONg0U87t5o4BqbcI0uJEIblRNCFyNwPjSry4WGtR324K+gUTvU5N07Bk+Em8ojKwjrgyUAa80via+67O0tHJeg3ax7YIp6mxDwwWpGKdgW/iIfclunpTSO8eLe2RaBYgvsmKyTpYrKnVzylFux+an+Y587XDdJpAzXoiq1cHvBBF+l2k++9NdCVe3/AygxsH5yR/LzdckCwToI7OV63L+UampUBaeM2Dhz9xrnb91m4Qp1+Dq6E8qLOKgl3S+TH5XM7fPlj/Xlv9wU8+7Tl+Bt504pIu4r/b2NqD9hQWFWRf+W9pCId5WczWaXTvrdAgHdXWgq+ZbkI28M+4ybmoL8m0kIPWsiUTXzB8K2sPH1UYlAt/5J7tLPts+DRorI7Og/2qiv9yo4B87idkGDS1PwN4679TRTxrc0s24Cc89vBfXwvQopPOvx/aBd94HUjvbqv6qL/ylatM2Nkqcy41CeWg7dKNohCaBa/Ib4x6I3MWMt6FRe59d5qlrC23l6FzS4xiIQdKgTLAWtHEGXcy8h8nbGlaPv/RC4TwG2J9RmavUgXOJhouU3dMYb7+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7120411-daf8-487e-d897-08db11482729 X-MS-Exchange-CrossTenant-AuthSource: MN2PR20MB2605.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2023 00:36:19.8709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR20MB6067 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Worked with the upstream developer to use m4 to substitute the correct pcsc_dir value during configure, so the `patch-data-paths' phase will be unneccessary in the next release. --- gnu/packages/security-token.scm | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) -- 2.39.1 diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index a7f5e3a..41cbafd 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -48,6 +48,7 @@ (define-module (gnu packages security-token) #:use-module (guix build-system python) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages curl) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -253,6 +254,67 @@ (define-public pcsc-lite license:isc ; src/strlcat.c src/strlcpy.c license:gpl3+)))) ; src/spy/* +(define-public pcsc-tools + (package + (name "pcsc-tools") + (version "1.6.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/rousseau/pcsc-tools.git/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16kvw8y5289fp6y3z8l5w61gfrk872kd500a27sgr5k5dpr9vfbk")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-data-paths + (lambda _ + (substitute* "ATR_analysis" + (((string-append + "\"/usr/local/pcsc/smartcard_list.txt\", " + "\"/usr/share/pcsc/smartcard_list.txt\", " + "\"/usr/local/share/pcsc/smartcard_list.txt\"")) + (string-append "\"" + #$output + "/share/pcsc/smartcard_list.txt\""))) + (substitute* "ATR_analysis.1p" + (("^([.]IR [.]/) ,\n$" _ cwd) + (string-append cwd "\n")) + (("^[.]I /usr/local/pcsc/\n$") + "") + (("/usr/share/pcsc/\n$") + (string-append #$output "/share/pcsc/\n"))))) + (add-after 'patch-shebangs 'wrap-programs + (lambda _ + (for-each + (lambda (prog) + (wrap-program (string-append #$output + "/bin/" + prog) + `("PERL5LIB" = + (,(getenv "PERL5LIB"))))) + '("ATR_analysis" "gscriptor" "scriptor")) + (wrap-program (string-append #$output + "/bin/gscriptor") + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH"))))))))) + (native-inputs (list autoconf automake libtool gnu-gettext pkg-config)) + (inputs (list bash-minimal ;for wrap-program + perl + perl-pcsc + perl-gtk3 + pcsc-lite)) + (synopsis "Tools for use with smart cards and PC/SC") + (description + "This package provides @code{pcsc_scan}, @code{ATR_analysis}, @code{scriptor}, +and @code{gscriptor}.") + (home-page "https://pcsc-tools.apdu.fr/") + (license license:gpl2+))) + (define-public ykclient (package (name "ykclient")