From patchwork Fri Jan 27 02:26:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jake Leporte X-Patchwork-Id: 46440 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 6F7E827BBED; Fri, 27 Jan 2023 02:28:35 +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=ham 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 DD73727BBE9 for ; Fri, 27 Jan 2023 02:28:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLETE-0000UB-S6; Thu, 26 Jan 2023 21:28: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 1pLETD-0000Tw-4r for guix-patches@gnu.org; Thu, 26 Jan 2023 21:28: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 1pLETC-0000qj-Li for guix-patches@gnu.org; Thu, 26 Jan 2023 21:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLETC-0005fn-A6 for guix-patches@gnu.org; Thu, 26 Jan 2023 21:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61018] [PATCH v2] gnu: Add pcsc-tools. References: In-Reply-To: Resent-From: Jake Leporte Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 02:28: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.167478643721749 (code B ref 61018); Fri, 27 Jan 2023 02:28:02 +0000 Received: (at 61018) by debbugs.gnu.org; 27 Jan 2023 02:27:17 +0000 Received: from localhost ([127.0.0.1]:36518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLESS-0005ej-Tn for submit@debbugs.gnu.org; Thu, 26 Jan 2023 21:27:17 -0500 Received: from mail-bn8nam12olkn2074.outbound.protection.outlook.com ([40.92.21.74]:52833 helo=NAM12-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLESQ-0005eT-R6 for 61018@debbugs.gnu.org; Thu, 26 Jan 2023 21:27:15 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oOAwzru9GIM7DuiT8MrMM30sU8HmiTQfmMLiQwSPKZvxz3hUz7hr1Ia2tcRac24Jcamwu95u72b41Jt0ZmudanrX0mSG1obJuiM2h30VPyBw/keDGUM5wRjlUK10uUslOZ3jr9K2JLzzW7MxpRYgoAsw+Bl2v2h/1KD8h+8o9WQJF9+OyTlNDsa1NGo/jYl85e4t3GTaPnvGKCEA1PLrWLrowunOGdp0/K5DoT6R2IXTS4iX8Hh2v31e3/472KWR5wQvLYrP39v3VRkiFnSUGHuqUCLC1uy8qqtD4jAo/N4yZyyfZZRwDPmPw0i9r3oZqBS0foDL+GUUIuz50AdOOA== 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=03fkU7LwIQ+Z3d0CZMqdEILd8v3OxdpvfUwpNZMYAfw=; b=CkTDsWO1vPX2Hmp3E2KCOQ1l8DTKnWKcHMMo3PS3hlis9oQBf5ilYBnW8trLndzOPYDXdVEgWDAm0WUz/08WUbuqKIKN19H5VWOhpvlJY4mif0bUmjLwbDZcr0LSIcV6Y38SceLntK1HbrqbWZebQeIKkRDHU7Jq6cE54qDAtQbW2AxLTCtizkI9p1P/roSwUTkSoNafW1d8X/e2u3HR7P12OiC4fbN8ZjU/C8KIsOUn4klmmMVdjwxgpjq+nWMoqwsH7eJEX49wff+VIRVYxAJDlflIecI9YRNUmpxgm98XjqP0QDvlw2I64+9eBtirT1kFdwgAhhGR9BjPEHSxkA== 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=03fkU7LwIQ+Z3d0CZMqdEILd8v3OxdpvfUwpNZMYAfw=; b=PkEFSSvog4HO8mtbldGN2PGnubsz2kkPRU8v1kmaxSqsj/lb9byB8RAC8F3l0ESGltW+omKWDYSv8bLc0THvmn0zRW8gPFth8Auw20KdTd9VlX6aexbGt4624jD8pejtfqNFi0YIAvkEfoDH/w5pixN1p8EYg8eVgQMhCdIaAFOQOvbBcoO2QEUMWdqbPH4Y0Z+oEGr6FuaJMPjrBQKZjlIZtxgGW8QgQ77n9liDI0Jj+8wRYOgrRnhReTpxBtvrOwBj526gydk5piD9RiwP0v0R3HS8Lq8tadklsgOsrQiGKFaeCAg7Fo29lpf5a1hi5kOHNFnEadkwU6MZC9IekA== Received: from MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) by MW4PR20MB4504.namprd20.prod.outlook.com (2603:10b6:303:18e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Fri, 27 Jan 2023 02:27:06 +0000 Received: from MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::4a43:b57e:52e4:e87e]) by MN2PR20MB2605.namprd20.prod.outlook.com ([fe80::4a43:b57e:52e4:e87e%4]) with mapi id 15.20.6002.013; Fri, 27 Jan 2023 02:27:06 +0000 From: Jake Leporte Date: Thu, 26 Jan 2023 20:26:54 -0600 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [8mLpxJxsPx5m9apv/Dpm0AgU6/TV1YF0HMZh27/p7JOklqQR4+pOWpEDORg91/PE] X-ClientProxiedBy: SA1P222CA0030.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:22c::6) To MN2PR20MB2605.namprd20.prod.outlook.com (2603:10b6:208:ea::18) X-Microsoft-Original-Message-ID: <20230127022654.1153575-1-jakeleporte@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR20MB2605:EE_|MW4PR20MB4504:EE_ X-MS-Office365-Filtering-Correlation-Id: c879123f-a067-4f57-61a0-08db000dfbb8 X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3obZ8cFst/l00nuxekAJoO/kBJh8NLIVHRbDlIZhqXb3TOjbGIDoIZoLXGFsy5w+230zh+8olz0fAY8g1lMNTgu7yanEtZlBICB3mF4xyBiewLWTttL0QfJ/Rgi3v2Zsgb1Wnew4yeX3ilLQMURYaRZ3ij6oa7o3S7ySSEDbuyqLjagPEGwflutJNzr6nvEZFh7NuGJKc2eINfs3JMho/sIH0Kbd0raamcwm6sjE8wuyHhQvL9sUyqJ1Lfr2iKE3moOBqMAB3LWyE85NVVBsorMKSO903eSRKSIpn5h8U4Uhz07WJar3NecKAil6gp0aTmqOP0i+C0yJmqJE5fUfTTX+ZPsKahKve/LUkyUz2MCRVf0Tq+hKpEGoOZGntyEr/iiawCav8zROSaO6bX9q+WpdVhPT1cLVVcRXjqJKjS5eWLyWm9741jIAtlgUeHMOgpJo0LnXSuO8/VhuFyALYWIzLjCWR/3tGo0K1rodczFOxl9xGauSFXjHaGUmTpsrPC+6IzG6D7kGiLhEWlLFIg5Yzmg2SDBpBwWlrCLYbnEw+49YSAwh2NedgqAs42U3K9Rdb9dICb819dAwGXMGThPVI5jhM6uAO92Qiq6Fv3K9FocPlmXpcUdKJGJxXPQYsx+/f6/WmJTIFtLOfCNE692FjubECbjer9W9/5LubimVnCFPR2lLySV928rPI6aTFQgLOUzXoWW/9h4fPPxUA5MNXoMxFNhm56tdpd77NG7MJoOpV3rRxwHlzpg4hO+2BU+bQWCcCVxyc7Fz6dpx0IFndqYMT8RB1An2jh+p7xJt5p29v2w2Wtt X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mxkwYWpslcocZwZIXpvlJlw1fT+XbvJGMbhkUiBl5aa0dDcbzdU2ALKiEliEDzNzKdI6SRczWSDgc83WtFSRyIo8V4mWqW/MeHQRgTdomM6ZNLQDXhLUthfGjcKpOmAXRF80WgfQAl8X+LN/HUi4fl59l737aHCC0IffS6UYoq+k9xL5WoVUixiMnx1LVgIAXtr8+YiUDhJHP32VJd5yhU9yJynl4m9KyCoMGOGZ5HnZjjlmdBxVVKVjihO6rZHar4MoGbKmOE044INiBXk5QJuyDxjtUHuqNNoy2+u1v3ETDer8ET3jryxS597cjRE6wf7K9mofNCG8400X1rJDKNNbGD7+D+vNLxu1jaNfvGThlFm9Hw2uZ+2+8nKzLHjaDZxGvkfnpxOAhgLntM6UxY+WzsxwS/zBLiaSLyP/AZe14QGOp7mIrQ9lSa8wR4AvSAGgHNpMNPj1Qte8agIA7/9cgV0Cam/2ATiP4vgsD59aE9xvNJo0AYJSHcq4ZjNM2zu4vCUOF1+5t9AWHt7IVWSn44adwwkLOJY8kMgSYdKB1nBPWt8IVJl82QNylq8BIaY8MEultg+f+PVmgPgceTVZRNXpXnLzRLW0EwDz/TSkUyqq0YW7CpYxrvoNZpdcxVfG/Nrx8+/eD3u0pC4iwg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KPbhSFoLeuDr4VAbCnaodtv3PWRGWvp0h/MiX2Of6iO9HKswch+QYEyhgzmL0dLWR4846xZ/Zw0WJ19LmhuhUZcHHInsjpXYABpEaBA7S4H/w2dQ6Ih7iXE1ollDelL47uPosO/WuJb6NMCYuxjBNU6cImtgWsv5jB4CQiOSkAnJGkcejDfqn3XRPqgjeeFF536X0mj1m+97St9nPBFBCj+VImDNScEXJ3GuQmFNCmMe3y6b6ao4xR47wh0E57qO+ROc8dgkNFxZxsWA8I703ZfQSuskWPsXwVmYAy1NfAAoFCPAFx+5rE52XohoUFc+6IIB62+Cq9LCYAwlGpGu8LC8AF8OQqpKLhxLLY5XcS7c0NHgjCtnqEZooJYOPd3EDY8e1oX9ln2hsqiB4ViCXA+OsiHURpMwXVrCpjc5nEkf1ihBesTRNWKCE9tldsVUnrSZ4E/wYxz+ZX7PCgsDPsIaaAO4GR/k1f8HY6qW9oQb7UDiTw4nCGmo9EnkhanrvmMRi6XqG5xwysZzW0rtMOii7BLw3GRbYqxoafz8/6PBJD0BjFDLevtlVAhNiKJc7VR301zv0M0K9yvXZQse/3A9cgK6BE44RTbkf2ip+n9e/+0uW47oe1idCJaJl6CSYxywijXwTNOQZqHwMn4GjWZhcLAZg2l16R8UtjibWWnduBsq0Z6IS4qVjc/ZPgXfzTlCcW2VxWO/aGZaZMlcVh/4FwwV3FEI5EesdlUena2nM0/qGGJEKf71gcsziwg/wGVZk+tNtMDsF8+/Qfd/Rij83V1I8QSrhaF8omY08vjEZzGJypI/H4vFQyxlzGWHX4ESuaF/kj9+BmJVqSpdd3mMyR+e1mw60LRVMlYZoPKDQNF79NQQtvSHEt35FvHDFgskRu5rNDqxD/cCMlzOWYtf7S4NfTsb1/HlOrty+KM58KQ4ivXa6h2JXnliOUIe5vapoQ7stcafI/3VT1+Cjbhm/HjRipfTZZCRo6eh7zobwssqDQx3D0+4wWHROhai1wpWIGlAh/1ltjfnBnmYXfEGL0meg14d3Dt3HrKCnMmJIb4RJCImrTn63b1AdxYEj6yAfxSlFc7K3txDdjtKGcVg9dQg7OBYmqn0Z5ywHxSiin4Ol5PI9bDsFQDCh1z3FpFs/opJmOx2JuL59WSWPi+lcWaCqsAYr0LfDdLO0klTK6/ksvwynhwnimEri44eMQDCC7QZF4X3SYLoJiSuTBdNWQ4vxdhicWx22Sd96eEdkv4WunY5V5GmS38f8Krdy4mpVhww0Z0mxrpTjeQzV/qzXRucdAnFk2BJ9Um6JngyWHSPjvHx1v+wJ1hKFTA1agPSkZYd//MKwO40swldXINJbKQopGwNvLN9gfhdcEw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c879123f-a067-4f57-61a0-08db000dfbb8 X-MS-Exchange-CrossTenant-AuthSource: MN2PR20MB2605.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 02:27:06.6421 (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: MW4PR20MB4504 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 After finally understanding wrap-program, I've corrected the `pcsc-tools' package definition. Everything, including `gscriptor', now works properly. --- gnu/packages/security-token.scm | 67 +++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) base-commit: 2b1e5cb6a82e60298b620ef8d2dbf90cfb925015 prerequisite-patch-id: 55ebfdbee35b36ac06da23b716337ecfef350452 prerequisite-patch-id: 12b9437ce6c6849e83e52cabad56672a5c73e2a7 prerequisite-patch-id: 52c97b6e4d8d4b78217423a3f1323d95a609de8c prerequisite-patch-id: 90b350ab4778843697da28bb10344a84ccacc70c prerequisite-patch-id: 0d5a1f7cfe93822a3f3b11c19f4b2662a79cda17 diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 619be42..e57c919 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -253,6 +253,73 @@ (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-source-shebangs 'patch-env-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("ATR_analysis" "gscriptor" + "scriptor") + (("/usr/bin/env perl") + (search-input-file inputs "/bin/perl"))))) + (add-after 'patch-shebangs 'wrap-programs + (lambda _ + (for-each (lambda (prog) + (wrap-program (string-append #$output + "/bin/" + prog) + `("PERL5LIB" = + (,(getenv "PERL5LIB") , + (string-append #$(this-package-input + "perl-gtk3") + "/lib/perl5/site_perl"))))) + '("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")