From patchwork Fri Sep 20 02:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nikita Domnitskii X-Patchwork-Id: 69710 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 C65D627BBEA; Thu, 31 Oct 2024 15:30:50 +0000 (GMT) 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_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 6D9FE27BBE2 for ; Thu, 31 Oct 2024 15:30:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6X7o-0001cb-QQ; Thu, 31 Oct 2024 11:30:17 -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 1t6X7b-0001WF-5N for guix-patches@gnu.org; Thu, 31 Oct 2024 11:30: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 ) id 1t6X7a-0003Xg-Rz for guix-patches@gnu.org; Thu, 31 Oct 2024 11:30:02 -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:In-Reply-To:From:To:References:Subject; bh=oP7bjWw0I/mUkY1DrtTTuKcheKAs7J7FnI8RT5WpdoU=; b=nr7N0Ck15p8AFRfJt4vpZY5/dGy+C/pFCxJcf1SCFNhVjBkdebFx7CRZfWcBBuF+WqjRiBmJRL8twnXqJ7Ibu2zSQRmralmRBiiwihus/PHcTc4ZwO/6QzISVBl+WjXR+7BBYOkCxAbonCKQ7woYezfvo4sS7uy/uFpAzvnrozyaJdVrAn8H+k35LmdGwZ4YBWNVt3vDSUS6/a90OWKQ7ieBKKmJXK/T4Npc9ICbwRowzNeln0jc88Vh0plf9Rr77ChK461lvwNJvtNZ/pmuP/VonJ6N9kVUViWm29K8mvSegnNi98dlR/2hvRI4WLDIRRuimSG3kw1F1Jrxy5Ch1Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6X7a-0004k4-IT for guix-patches@gnu.org; Thu, 31 Oct 2024 11:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73374] [PATCH v3 1/2] gnu: pam-mount: Fix libcryptsetup detection. References: <538b17f2-ba69-4f54-9f6d-b431c1a7f137@nborghese.com> Resent-From: Nikita Domnitskii Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Oct 2024 15:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73374 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73374@debbugs.gnu.org Received: via spool by 73374-submit@debbugs.gnu.org id=B73374.173038859418181 (code B ref 73374); Thu, 31 Oct 2024 15:30:02 +0000 Received: (at 73374) by debbugs.gnu.org; 31 Oct 2024 15:29:54 +0000 Received: from localhost ([127.0.0.1]:42632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6X7S-0004jB-Cb for submit@debbugs.gnu.org; Thu, 31 Oct 2024 11:29:54 -0400 Received: from out-175.mta1.migadu.com ([95.215.58.175]:35019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6X7L-0004j3-Bq for 73374@debbugs.gnu.org; Thu, 31 Oct 2024 11:29:53 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=domnitskii.me; s=key1; t=1730388581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to; bh=oP7bjWw0I/mUkY1DrtTTuKcheKAs7J7FnI8RT5WpdoU=; b=dWL4Gd4meu5/RH+LgQpA3Zm6m8IG7hW2nZSrhlsA+0IkKV7ZJgUfD4RD1px/LkUJdiKtL2 Q7lk4MhKQWuoZlVwYwoicG+0ih+6GUq8Tt4hRWWo+xNfTRwiy57bCv+5TxsimIaPnZ1bRX 9EPIrbnxSIUrZ4Uu4Kij2xzdTeoIYdU= In-Reply-To: Date: Fri, 20 Sep 2024 02:43:04 +0000 Message-Id: <8fa08d18a3d2221fb8e324db565673144ce253a0.1730387833.git.nikita@domnitskii.me> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT 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: Nikita Domnitskii X-ACL-Warn: , Nikita Domnitskii via Guix-patches X-Patchwork-Original-From: Nikita Domnitskii via Guix-patches via From: Nikita Domnitskii 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/admin.scm (pam-mount): Fix libcryptsetup detection. [inputs]: Add extra inputs required for libcryptsetup, remove duplicates. [arguments]<#:configure-flags>: Explicitly enable cryptsetup in order to detect breakage in the future. Change-Id: Icf588945279c8785081a8049d401eaf7e6a22e3c --- gnu/packages/admin.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 86f35d49ad..47ccb09462 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -68,6 +68,8 @@ ;;; Copyright © 2024 gemmaro ;;; Copyright © 2024 Richard Sent ;;; Copyright © 2024 Vinicius Monego +;;; Copyright © 2024 nathan +;;; Copyright © 2024 Nikita Domnitskii ;;; ;;; This file is part of GNU Guix. ;;; @@ -4916,7 +4918,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 @@ -4945,15 +4948,15 @@ (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 (libcryptsetup-propagated-inputs)) + (list libhx + libxml2 + linux-pam + openssl + pcre2 + util-linux + eudev))) (home-page "https://inai.de/projects/pam_mount/") (synopsis "PAM module to mount volumes for a user session") (description