From patchwork Fri Sep 20 02:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nathan X-Patchwork-Id: 68145 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 7E0C527BBEA; Fri, 20 Sep 2024 03:44:08 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A22C327BBE2 for ; Fri, 20 Sep 2024 03:44:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srTcY-00037o-1E; Thu, 19 Sep 2024 22:43:46 -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 1srTcX-00037f-0v for guix-patches@gnu.org; Thu, 19 Sep 2024 22:43:45 -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 ) id 1srTcW-0003SY-Ng for guix-patches@gnu.org; Thu, 19 Sep 2024 22:43:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:Subject; bh=rbHrJQriwXJHCC3KE/zTN5TRkbZP7fO0138fIXz7THc=; b=DuGF8zx/e5uuBEiEwcO/XBuNxrs9HAns5RKr7BpKKRCmzQQcZsJd3L4tDnZOAn2CY4hMyHAYmTd2v7/pN+UpVczwZ6q9ARGu8PMG63JSyKD1fI2YUlbUl/e1X0lesXKtvr1igGNlblNfhJOr20k7hgblOOG6vHhgf+j7nk5UED6y+hVVDZHu6O4K0iLy4hckPW6QqiGi8PvV8Infbxe07nNMjg2d2oZaU1+OHR+95QQxkPIauCzQnCQvR3oogFuG4ZQDcsw+7kArO0dn4ZKq3NSWIOjLM12Mzpa6/hYF2c7FYPZRuAjn/XqAijczNZlwYrnilYWWLYUPEdQEXgCcOA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srTco-0000Bu-L2 for guix-patches@gnu.org; Thu, 19 Sep 2024 22:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73374] [PATCH] gnu: pam-mount: fix libcryptsetup detection Resent-From: nathan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 02:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73374 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73374@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1726800210682 (code B ref -1); Fri, 20 Sep 2024 02:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Sep 2024 02:43:30 +0000 Received: from localhost ([127.0.0.1]:33702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srTcI-0000Av-CE for submit@debbugs.gnu.org; Thu, 19 Sep 2024 22:43:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:45010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srTcF-0000Al-NO for submit@debbugs.gnu.org; Thu, 19 Sep 2024 22:43:29 -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 1srTbx-00036Q-2i for guix-patches@gnu.org; Thu, 19 Sep 2024 22:43:09 -0400 Received: from mail.nborghese.com ([2001:19f0:5:48e0:5400:4ff:fe08:e8a8]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srTbv-0003RU-Ar for guix-patches@gnu.org; Thu, 19 Sep 2024 22:43:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=062122; bh=rbHrJQriwXJHC C3KE/zTN5TRkbZP7fO0138fIXz7THc=; h=subject:from:to:date; d=nborghese.com; b=asgdKEP1QEIUMMebxZUYMZ3LTUaVmxVL2CyKD5pAkTKDZFF4KSZ E8ILYBlQ1DUPha101YVC3bOcLXDYKAcwrl4EpUWAZhCgB/INteVZONWd9lcyOHq3djvEWG V9KJWznIpOQV9n/8ZCNW2Mf3bp+dyv8JStGJG4SQag0FNC3/Ro= Received: by nborghese.com (OpenSMTPD) with ESMTPSA id 4ffd6904 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 20 Sep 2024 02:42:56 +0000 (UTC) Message-ID: <538b17f2-ba69-4f54-9f6d-b431c1a7f137@nborghese.com> Date: Fri, 20 Sep 2024 02:43:04 +0000 MIME-Version: 1.0 User-Agent: Icedove Daily Content-Language: en-US Received-SPF: pass client-ip=2001:19f0:5:48e0:5400:4ff:fe08:e8a8; envelope-from=nathan_mail@nborghese.com; helo=mail.nborghese.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Reply-to: nathan X-ACL-Warn: , nathan via Guix-patches X-Patchwork-Original-From: nathan via Guix-patches via From: nathan 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 easy way to test: look at the configure log and observe that it's detected now. From b3d6cc85ddcbfb162f679a6f59086b7825b1a712 Mon Sep 17 00:00:00 2001 Message-ID: From: nathan Date: Thu, 19 Sep 2024 22:27:53 -0400 Subject: [PATCH] gnu: pam-mount: fix libcryptsetup detection * gnu/packages/admin.scm (pam-mount): Fix libcryptsetup detection [inputs]: Add extra inputs required for libcryptsetup [arguments]<#:configure-flags>: Explicitly enable cryptsetup in order to detect breakage in the future Change-Id: Icf588945279c8785081a8049d401eaf7e6a22e3c --- gnu/packages/admin.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4910327d99..f8552c69ce 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4936,7 +4936,8 @@ (define-public pam-mount (list #:configure-flags #~(list (string-append "--with-slibdir=" #$output "/lib") - (string-append "--with-ssbindir=" #$output "/sbin")) + (string-append "--with-ssbindir=" #$output "/sbin") + "--with-cryptsetup") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-file-names @@ -4965,15 +4966,16 @@ (define-public pam-mount (native-inputs (list perl pkg-config)) (inputs - (list cryptsetup - libhx - libxml2 - linux-pam - lvm2 - openssl - pcre2 - `(,util-linux "lib") - util-linux)) + (append + (cons* cryptsetup eudev (libcryptsetup-propagated-inputs)) + (list libhx + libxml2 + linux-pam + lvm2 + openssl + pcre2 + `(,util-linux "lib") + util-linux))) (home-page "https://inai.de/projects/pam_mount/") (synopsis "PAM module to mount volumes for a user session") (description base-commit: 6ea75bb9bcc52521f0bb3f121799745fdc17f1c9 -- 2.46.0