From patchwork Sun May 7 21:19:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 49870 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 4787427BBE2; Sun, 7 May 2023 22:20:44 +0100 (BST) 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 757F927BBEA for ; Sun, 7 May 2023 22:20:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvlnY-0000Ia-IF; Sun, 07 May 2023 17:20:04 -0400 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 1pvlnX-0000Hr-0s for guix-patches@gnu.org; Sun, 07 May 2023 17:20:03 -0400 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 1pvlnW-0003md-Mr for guix-patches@gnu.org; Sun, 07 May 2023 17:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvlnW-0004cS-Ij for guix-patches@gnu.org; Sun, 07 May 2023 17:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63354] [PATCH 1/4] gnu: python-pyscard: Update to 2.0.7. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 21:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63354 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63354@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 63354-submit@debbugs.gnu.org id=B63354.168349437917680 (code B ref 63354); Sun, 07 May 2023 21:20:02 +0000 Received: (at 63354) by debbugs.gnu.org; 7 May 2023 21:19:39 +0000 Received: from localhost ([127.0.0.1]:38599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvln8-0004b6-I7 for submit@debbugs.gnu.org; Sun, 07 May 2023 17:19:38 -0400 Received: from mout.gmx.net ([212.227.17.21]:60829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvln7-0004aq-AZ for 63354@debbugs.gnu.org; Sun, 07 May 2023 17:19:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683494371; i=pierre.langlois@gmx.com; bh=nIdNWAmqoCFHT5mlD09wJp2b5GU5nRHux6fVnLBBvds=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=PrdpV6EBV5yfO2p/XUw+FKSPR2Q+rTkCcuMy/sf7uKXCS5tMCHwwu6lNdqvshWsUm ueU9mmRoXkYgK4isG+zrkQfWtRE+woMfSRrj31M/D1dciFhJqUhnreGPcB5W4RJ/7O gDT8tBiuWVGqUPa4+JvBtnFxABo/bCg4YukhNMC11jeEO2G2DVW9NhIRgXOrjK5vuF O/tGVs73nHTcU6JslTWk92TU2BN3XlJexfL63AXALdfBpkCfEnRlEKEyrkJz66V0VB kr01ocNKSbDjyBVqNbx0YpxCXOOmzl8+qheR9v/jGSvrRJ35SNTDNSZLU62CJIq1mW 7Rt4zo09oH+QQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mkpex-1qdfW01Etj-00mIPE; Sun, 07 May 2023 23:19:31 +0200 From: Pierre Langlois Date: Sun, 7 May 2023 22:19:20 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:Gw72X0m4Nl/trdnnLYm8ExEr1e2wlnnkBKvJdHs2S5AQC/DRfND u/Id3Gv09LShUjG0knnUG3ofRYu/PSIaaiI/dB2wqBNj3O4zM5kLrAA+fkVghibCs1CfKbW EwlXPx8ISjQBaJyH7h94iuPgeOcAcs9NCZJb4CuNqvLc3eTohXGJSq/N5maz18Jp0azzVY+ IkEhXolY98fkfeUhGXSLQ== UI-OutboundReport: notjunk:1;M01:P0:w8tjiJjqDFU=;6SxtweSK9QahxKbe95KJpAZsiyR eK6kj4cOXsCR56ci0uu+c2ZV3cf36ZpsrM2tNTizQV9BiigmHDoHnzrfHZxgU5In9osluu63F kYT+Ygyb5/8zVgH4QdP/t+tiG2HdCFhXndkjHmm74bUmqlWCpgvdGRM5L501G4Umevp4IEI5x iMB19/24LKYer1hm/Jn8eFHOK+9eY5e+VZTOL9LRVD+WY/I9O55YJAuuvKor1FclLw71vDocH KAGyNnbYEcOGiBTVHasZARFuiX+uYoSjWBxNVKKnFDbPzXLtZtgWsxViPcYZUYW3qT8sjPls5 AupFlte5CCag4hRQjBEoPUMyYy4wAdkg558zL5OZ3EnAuFpfdq/YPFRgdbj39YbYxylHAaqqK 1Q1o7+dfTROLUYABGcG67fJ7ZvC/foGbHcY5qg7rA2CoCn3ZpJDFk3UtbXMv88k4EsibXM98Q f6hm6xqXVQfHh9eGAIMr8N0hTq2O+8s5JkAw0QmmCLNFnQG2tF+6lV8+7iAEQ3RNhfAoAeJnL Lxbx0S9Ibr5/HL0sIsXSdjSaoFRdTSAf7ewryKMWWdqJwrndhh9lpn502RnKk+wFivMx7iwVu Exk7+Oj1vPRiRa3D7/z7irItkyDZ/82fIVOf+XFqTz+001Oq2GWtVF9TYfILYE4K0yDVTmliZ TUBGHNpTq17mVtmMQZGquKAwgxeQWe9cxRdsZ63USZCw79CQ6dzCDXhdIaUwr5QcmKLwYMBir 6aeypryl9fZ3HagGxNujjKvZk1s9rf877umlt+wjtvFbycdzP5QFAC3KpsoAEt5CBjEfo6M9P oDuuDAaisVwOlJTXPTjwIHowEaDrr51bW+UvFcha8vRshytj0TgzewjAD3NlLQFHVypSEAlm9 +gVuTJfpGBSHutsLoX/sGgHi20/AInjaY8wC4XtiFWIiyS/lJ4I0ibemX3c7mep+KkJXdk6pl yuKRWA== 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 * gnu/packages/security-token.scm (python-pyscard): Update to 2.0.7. [arguments]<#:phases>: Use search-input-direcotry. Do not return #t. --- gnu/packages/security-token.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- 2.39.2 diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index b51d67427a..e702bcd9d3 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Timotej Lazar ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2023 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -462,7 +463,7 @@ (define-public yubikey-personalization (define-public python-pyscard (package (name "python-pyscard") - (version "1.9.9") + (version "2.0.7") (source (origin (method url-fetch) ;; The maintainer publishes releases on various sites, but @@ -472,7 +473,7 @@ (define-public python-pyscard version "/pyscard-" version ".tar.gz")) (sha256 (base32 - "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6")))) + "1gy1hmzrhfa7bqs132v89pchm9q3rpnqf3a6225vwpx7bx959017")))) (build-system python-build-system) (arguments `(#:phases @@ -480,24 +481,21 @@ (define-public python-pyscard ;; Tell pyscard where to find the PCSC include directory. (add-after 'unpack 'patch-platform-include-dirs (lambda* (#:key inputs #:allow-other-keys) - (let ((pcsc-include-dir (string-append - (assoc-ref inputs "pcsc-lite") - "/include/PCSC"))) + (let ((pcsc-include-dir (search-input-directory + inputs "/include/PCSC"))) (substitute* "setup.py" (("platform_include_dirs = \\[.*?\\]") (string-append - "platform_include_dirs = ['" pcsc-include-dir "']"))) - #t))) + "platform_include_dirs = ['" pcsc-include-dir "']")))))) ;; pyscard wants to dlopen libpcsclite, so tell it where it is. (add-after 'unpack 'patch-dlopen (lambda* (#:key inputs #:allow-other-keys) (substitute* "smartcard/scard/winscarddll.c" (("lib = \"libpcsclite\\.so\\.1\";") - (simple-format #f - "lib = \"~a\";" - (search-input-file inputs - "/lib/libpcsclite.so.1")))) - #t))))) + (simple-format + #f + "lib = \"~a\";" + (search-input-file inputs "/lib/libpcsclite.so.1"))))))))) (inputs (list pcsc-lite)) (native-inputs