From patchwork Wed Jun 16 06:38:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 30316 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 2344B27BC81; Wed, 16 Jun 2021 07:39:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9980827BC78 for ; Wed, 16 Jun 2021 07:39:24 +0100 (BST) Received: from localhost ([::1]:36850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltPCt-00047m-IG for patchwork@mira.cbaines.net; Wed, 16 Jun 2021 02:39:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltPCZ-00047e-2s for guix-patches@gnu.org; Wed, 16 Jun 2021 02:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ltPCY-0001Rb-On for guix-patches@gnu.org; Wed, 16 Jun 2021 02:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ltPCY-0003Kl-Lp for guix-patches@gnu.org; Wed, 16 Jun 2021 02:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49056] [PATCH] services: pcscd: Fix daemon signal handling. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Jun 2021 06:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49056@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162382551012772 (code B ref -1); Wed, 16 Jun 2021 06:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2021 06:38:30 +0000 Received: from localhost ([127.0.0.1]:51303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ltPC2-0003Jw-9Q for submit@debbugs.gnu.org; Wed, 16 Jun 2021 02:38:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:52580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ltPC1-0003Jp-Et for submit@debbugs.gnu.org; Wed, 16 Jun 2021 02:38:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltPC1-00045T-4g for guix-patches@gnu.org; Wed, 16 Jun 2021 02:38:29 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:40201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltPBy-00014K-Vb for guix-patches@gnu.org; Wed, 16 Jun 2021 02:38:28 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id CE5C020003 for ; Wed, 16 Jun 2021 06:38:21 +0000 (UTC) From: Brice Waegeneire Date: Wed, 16 Jun 2021 08:38:18 +0200 Message-Id: <20210616063818.12656-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.200; envelope-from=brice@waegenei.re; helo=relay7-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches "pcscd" wouldn't handle SIGTERM as it inherited ignoring this signal (and others) from its parent shepherd. The constructor make-forkexec, restore signal handling. Fixes . * gnu/services/security-token.scm (pcscd)[start]: Use make-fork-exec-constructor to start "pcscd". --- Depend on patch . gnu/services/security-token.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index 0cbb591e10..822984b70b 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -57,12 +57,15 @@ (provision '(pcscd)) (requirement '(syslogd)) (modules '((gnu build shepherd))) - (start #~(lambda _ + (start #~(lambda args (let ((socket "/run/pcscd/pcscd.comm")) (when (file-exists? socket) (delete-file socket))) - (invoke #$(file-append pcsc-lite "/sbin/pcscd")) - (call-with-input-file "/run/pcscd/pcscd.pid" read))) + (apply (make-forkexec-constructor + (list #$(file-append pcsc-lite "/sbin/pcscd") + "--foreground") + #:log-file "/var/log/pcscd.log") + args))) (stop #~(make-kill-destructor))))))) (define pcscd-activation