From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0AatOp2cyWBXVwEAgWs5BA (envelope-from ) for ; Wed, 16 Jun 2021 08:39:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4AYQNp2cyWBZWAAAbx9fmQ (envelope-from ) for ; Wed, 16 Jun 2021 06:39:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 47250169B1 for ; Wed, 16 Jun 2021 08:39:25 +0200 (CEST) Received: from localhost ([::1]:36850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltPCu-00047m-CP for larch@yhetil.org; Wed, 16 Jun 2021 02:39:24 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623825565; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TydpLAlsDN8ABeDf4jHyp1DB6qhMTC0ZgWSLrh9NH3o=; b=AaLIZbTdHxqbbTAl8MinMy902wdXQtKli2Re31cFfiVbYogsmOuWrcdDoZ4xvuiX3dgLKM 6PF0FrLqjHfa0XuWjnc+AUWu26EP9wVpEa9rulK8P3GI3v1JHAEgIgIVzlwtg5nTysDAaB bioNu8MyK7lCjmaeB+QresXeSOcs6pcohkLm++B+4BQhIWUDhf7kpPC52HhsDCzLk8viO9 Inj3rKTQVnPhPsSX1PcZa4PwhrKuSIia2R4gwDwvtZfzA2PaOpkMzP8SWY5/CcHzZtyXjV 2fzNo97k1KZ3i8+T5C2bkQyY8tcKrf10CLctGxHZ0xvTOxOCrDBcPxzHnz68+Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623825565; a=rsa-sha256; cv=none; b=tKXQLVs8SPertTsU+3gJDwx8nqbJ9ZnTKRYsKJhd76VsuQcDG+ImNBx5pXzPz77qQ36gcc 2Pss1qhqWYbG0j0CnRhgOao5YfiS6+RDKE3E2+gE5isRLNJ4Jpgjy56L8rZddMYlM83Ndy 3ZbCtPMgjPGN55nbPefB7s7A7MQ8OmBdZU3nJDE6hv6C8SPw57q5KgPPdG1T/kcGpIBIse RHCFuVqrZbryQ6TLj0LlziYiOvxZ7OUOzM6Wdpfqfkyf8LM0Y2v8nWoSirpAPUPyYRpLGR cWHC/O+3IUfhFNYvYI0m5gziPLED+aG0gdT5F2meNwS5ZKRWu093OJ9Rc7pB2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.58 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 47250169B1 X-Spam-Score: 2.58 X-Migadu-Scanner: scn1.migadu.com X-TUID: 9pzqp/EViGjT "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 -- 2.31.1