[bug#78188,v2] gnu: kwallet-pam: Fix socat not in 'libexec/pam_kwallet_init' wrapper path.
Message ID | 1b8f1e2c24fb227d77a4617635842fb16db5d7f0.1746122107.git.sergio.pastorperez@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3F49027BC4B; Thu, 1 May 2025 18:56:34 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 02F5B27BC49 for <patchwork@mira.cbaines.net>; Thu, 1 May 2025 18:56:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1uAY8m-00087a-8b; Thu, 01 May 2025 13:56:08 -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 <Debian-debbugs@debbugs.gnu.org>) id 1uAY8i-000876-Ku for guix-patches@gnu.org; Thu, 01 May 2025 13:56:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1uAY8i-0000fZ-1q for guix-patches@gnu.org; Thu, 01 May 2025 13:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=RqtUflHlkaEHJ5F26QlpD4nqLaRF/4ij6L0ZUUr3NRY=; b=temokl9hbdwF4aZP0Q/BTVkE2CmqQVqucowpz4qZf/70TsMgW0MlILnW8zkzgp6krq2P5wGl1nkf0VRzgmHPH+8NVe02x68hABkD0O1GytR5qmZaljNlmBqPulkRc48UECui2u2mJRGqFv74nRbJqtzYBFmcqlzWRkk16s0kGSRBGP0yuDCX5LHs4i3If5ZLnLRDG5syPzYKXKv/0Ai6d0c/UI3PIUPODRpz2gHi5wSRjKkAXSaUAarcwDuxXKJrNQsNUg8cVCYuM21L0pgxdAKdvnXv897xWiS2CHV5GQjRUpXJODrphHzd/eb/glKSWvVV5t2SA8ijkJd9bRKRkQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1uAY8g-0001ea-91; Thu, 01 May 2025 13:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78188] [PATCH v2] gnu: kwallet-pam: Fix socat not in 'libexec/pam_kwallet_init' wrapper path. References: <cover.1746106890.git.sergio.pastorperez@gmail.com> In-Reply-To: <cover.1746106890.git.sergio.pastorperez@gmail.com> Resent-From: Sergio Pastor =?utf-8?b?UMOpcmV6?= <sergio.pastorperez@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: sughosha@disroot.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Thu, 01 May 2025 17:56:02 +0000 Resent-Message-ID: <handler.78188.B78188.17461221356265@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78188@debbugs.gnu.org Cc: Sergio Pastor =?utf-8?b?UMOpcmV6?= <sergio.pastorperez@gmail.com>, Sughosha <sughosha@disroot.org>, Zheng Junjie <z572@z572.online> X-Debbugs-Original-Xcc: Sughosha <sughosha@disroot.org>, Zheng Junjie <z572@z572.online> Received: via spool by 78188-submit@debbugs.gnu.org id=B78188.17461221356265 (code B ref 78188); Thu, 01 May 2025 17:56:02 +0000 Received: (at 78188) by debbugs.gnu.org; 1 May 2025 17:55:35 +0000 Received: from localhost ([127.0.0.1]:53007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1uAY8E-0001cv-Mg for submit@debbugs.gnu.org; Thu, 01 May 2025 13:55:35 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:47337) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <sergio.pastorperez@gmail.com>) id 1uAY8C-0001cZ-LV for 78188@debbugs.gnu.org; Thu, 01 May 2025 13:55:33 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39149bccb69so820124f8f.2 for <78188@debbugs.gnu.org>; Thu, 01 May 2025 10:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746122126; x=1746726926; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RqtUflHlkaEHJ5F26QlpD4nqLaRF/4ij6L0ZUUr3NRY=; b=kQNPDcxB1qMQhKqoKsm/w5hzRJOlGvrfrnNnU4tKfnB7tvbk3s7FxlPawIOCKTX/R4 aVFIjkcr+boEY7iyrOnopdEI0TACyxrTKX+Mpq4WwZ8yVk31AXjy4eQW1hP5BMiBuX9F sqYpirm5tWS7804F9m+F+tAFMSqHYKyoxRi8eSXLMP15Av2khlWvlFkg4Qq12MK89cVo MnD5EqNuHDD8AyfRgdKBoebmSocyA9xtFzUycmsQfFsW3k6L8HQj9P8pRQUDnNEgZc5c +5aMYq0GjzgZA1/IDHkMNXXkoVHgouYCBqYAgL8eQMjUjv2TvSG5vg8AnhSAkHZdbrK+ +Y8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746122126; x=1746726926; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RqtUflHlkaEHJ5F26QlpD4nqLaRF/4ij6L0ZUUr3NRY=; b=fV+pIDz9bR3BApN6w9zBG+jdgKEVVAd1UrhvHu7aFYHaUK+uQQCzCIBEnRWj7JnES8 EvzU53j+gxD8SmJf4xgZwm8+JYfcOswTB1Rb0ITfm1spmwx+chJIouJTfAluVYaBUUqX W85/hp600OXfTTDripUyjwUULvX/dTYjXlPlDmkcoGSJeCWPUmp5WCmFUEIKSfXl+TAB hNRFatsUe0HqTsVlfD8NvkD0B+3rWQGZpamv2q3yCJh6wdtLXfdShcakU7ZvNBd9dpjI TIypM3jHWnXqwz4vZAV0PDbmpH94Cd7AHBU9UDfBcPfAVPIIZ5gcbPAwx/s+Ssi1WjLS DDEQ== X-Gm-Message-State: AOJu0YxgGZNdVqWSTpwZVq9B5ifaCwT1v+aYIb63rDiwpfpTDtWlIRXM FOfH6z0FvpF4jEHmD3MQDGvaBTT61/kUVH6nY96KdUuab6rCcpzppG5QEqUK X-Gm-Gg: ASbGncuQNByEQasnuyNTYlw+gRpmbg3+lXFfM4vCkMnjMxfoZFB7BYHzwKXefz1//t6 BL8y+AefjwzGjThhbTqzZ32bfbNtoenexKNydSbFgj/vFM2wvH0Yi7u9KxAvN4JqKFcOE/t0PhK zrzpDb1TxWB8Wqq2J3s62S8L7otCSwoZqd743Ta+/EXdn2VHJc+JmeljA6QcDg5VR7W73GUX9Xg vZ7TECxjZnonJRSzYUgoNgrmM2LDf4Kcrlnlrs14VBPIzfosUNpjbdM8tTuxq1T/YDWSE90A/o8 s2g5QELoKYAJtgH6a+F9tNrvngEQKjAa0w2r0KtOCgNYbfjf12vdEcnGn8fKhEAZ X-Google-Smtp-Source: AGHT+IFVlJfE/N2sWtwM50Xqo1xulqflnIvO+7zGIPAVT0axnAPf3SGygBMsIhoSjRuCNvKl9BhoMQ== X-Received: by 2002:a5d:5f4c:0:b0:39f:fcb:3bf6 with SMTP id ffacd0b85a97d-3a08f75265amr6447011f8f.2.1746122126175; Thu, 01 May 2025 10:55:26 -0700 (PDT) Received: from localhost ([2a0c:5a85:d206:4200:cd7d:99ee:cee8:cc4a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a095a3e03fsm1416806f8f.11.2025.05.01.10.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 10:55:25 -0700 (PDT) From: Sergio Pastor =?utf-8?b?UMOpcmV6?= <sergio.pastorperez@gmail.com> Date: Thu, 1 May 2025 19:55:06 +0200 Message-ID: <1b8f1e2c24fb227d77a4617635842fb16db5d7f0.1746122107.git.sergio.pastorperez@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
[bug#78188,v2] gnu: kwallet-pam: Fix socat not in 'libexec/pam_kwallet_init' wrapper path.
|
|
Commit Message
Sergio Pastor Pérez
May 1, 2025, 5:55 p.m. UTC
* gnu/packages/kde-plasma.scm (kwallet-pam)[phase]: Wrapper phase not setting PATH variable to access 'socat' input. Change-Id: I6e7a421af3dbbc844e319b7852246c89d979609c --- gnu/packages/kde-plasma.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) base-commit: 881d46eb386c2de8bc6f1405972ee1e115eeb3a1
Comments
Sergio Pastor Pérez <sergio.pastorperez@gmail.com> writes: > * gnu/packages/kde-plasma.scm (kwallet-pam)[phase]: Wrapper phase not setting > PATH variable to access 'socat' input. > > Change-Id: I6e7a421af3dbbc844e319b7852246c89d979609c > --- > gnu/packages/kde-plasma.scm | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm > index 679a68cef6..400296f5da 100644 > --- a/gnu/packages/kde-plasma.scm > +++ b/gnu/packages/kde-plasma.scm > @@ -1305,7 +1305,15 @@ (define-public kwallet-pam > (arguments > (list > #:qtbase qtbase > - #:tests? #f)) ;no tests > + #:tests? #f ;no tests > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'install 'fix-socat-path > + (lambda* _ > + (substitute* (string-append #$output > + "/libexec/pam_kwallet_init") > + (("socat") > + (string-append #$socat "/bin/socat")))))))) should #~(modify-phases (add-after 'unpack 'fix-socat-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "pam_kwallet_init" (("socat") (search-input-file inputs "bin/socat")))))) > (native-inputs (list extra-cmake-modules pkg-config)) > (inputs (list linux-pam kwallet libgcrypt socat)) > (synopsis "PAM Integration with KWallet") > > base-commit: 881d46eb386c2de8bc6f1405972ee1e115eeb3a1
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 679a68cef6..400296f5da 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -1305,7 +1305,15 @@ (define-public kwallet-pam (arguments (list #:qtbase qtbase - #:tests? #f)) ;no tests + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'fix-socat-path + (lambda* _ + (substitute* (string-append #$output + "/libexec/pam_kwallet_init") + (("socat") + (string-append #$socat "/bin/socat")))))))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list linux-pam kwallet libgcrypt socat)) (synopsis "PAM Integration with KWallet")