From patchwork Tue Aug 10 20:07:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 32006 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 DA8A827BC82; Tue, 10 Aug 2021 21:09:27 +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=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, 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 7836627BC78 for ; Tue, 10 Aug 2021 21:09:27 +0100 (BST) Received: from localhost ([::1]:52426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDY3y-0000w0-I7 for patchwork@mira.cbaines.net; Tue, 10 Aug 2021 16:09:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDY3b-0000qK-NR for guix-patches@gnu.org; Tue, 10 Aug 2021 16:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDY3b-0007D8-GJ for guix-patches@gnu.org; Tue, 10 Aug 2021 16:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDY3b-0007C5-A3 for guix-patches@gnu.org; Tue, 10 Aug 2021 16:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v2 4/7] gnu: admin: Add greetd-pam-mount Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Aug 2021 20:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49969@debbugs.gnu.org Received: via spool by 49969-submit@debbugs.gnu.org id=B49969.162862611327579 (code B ref 49969); Tue, 10 Aug 2021 20:09:03 +0000 Received: (at 49969) by debbugs.gnu.org; 10 Aug 2021 20:08:33 +0000 Received: from localhost ([127.0.0.1]:60884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDY32-0007AZ-RR for submit@debbugs.gnu.org; Tue, 10 Aug 2021 16:08:33 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:36567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDY2q-00079M-Bh for 49969@debbugs.gnu.org; Tue, 10 Aug 2021 16:08:22 -0400 Received: by mail-ej1-f53.google.com with SMTP id o23so4489450ejc.3 for <49969@debbugs.gnu.org>; Tue, 10 Aug 2021 13:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ji/0u8o52Eleku7bBaveyVCcBuSY/EtVjU0+md9XL9M=; b=bCnXt6VTR4bU/JzOo5shBVRbenRt//2ZsiiHiW5edoBO9LH+vKo3WB4AHqfkiCbuyn d4fisI6f2UfSRX90/27qrOdp5yibJTc0cytiteCqFZ4fa4aDI5SXhQzVu+Lxvo0ml9c3 gIaedP3YO7VVJPJPEXFEZkWgbT2fgaPFGQTE7dk9cApEVc/wlzEsITRO0fkZdEekLVwN ujvvtBAiXLPFpw9LPIwLpVcyoxYO8VEj1zxONuyF3ij2CsRVzgbHoNXY42gNPbYKxBsE peMZ9YWpA5ef0Hh63X2JZi+sIVKOZeDkpl6FTdqERnJgJoSBRDT9FXhJMTsk8jnMUPO2 xwLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ji/0u8o52Eleku7bBaveyVCcBuSY/EtVjU0+md9XL9M=; b=tz3S58nz+tsF6alcKMNJjWmMdSBnrLfRWlra42TMaXokfVRil3fzCHM4eOX0vz2d0L MiqojPqaYmgOjEJJ9k24TY5SLSAU/BJ4IKg+wV7VDD9uzi2DY0czcuYAXrtSh/L/iY9i vIv9waFmDKS2sVaSzEI+lPOLxS/45AgfhsV9GL1l44bSMQCz5OYOwU5HB7vAsQx08hES R1SgDcZmrA2EsXVWmjBk6susei5tHAzIFL7CiqoOpCJFt383ui3mof3JU0jDA/7fcsMD fNZRVkV1Z19ytzgOoGaqxxgYV4qBjvxH02B3oo3V2YZazWGguLbUxS+mKQt88QFsxH71 T5AQ== X-Gm-Message-State: AOAM532M5Y5vII3q7WMGIf1HnLUZhCW5FTiNGXXUXSf2vDB96ix2akiG zNI2XwB2yixZcSRWaEx9nXTz8blSpEGUDw== X-Google-Smtp-Source: ABdhPJyTI+oEpR2zmYGh3dU+7fdN4xJIai2bm9DrYP4Rb5kb62Oo3CD4se/kgbUfilHHSdc9uzCACA== X-Received: by 2002:a17:907:3e05:: with SMTP id hp5mr205123ejc.527.1628626090555; Tue, 10 Aug 2021 13:08:10 -0700 (PDT) Received: from localhost.localdomain ([31.142.54.188]) by smtp.gmail.com with ESMTPSA id qa34sm7247582ejc.120.2021.08.10.13.08.09 for <49969@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 13:08:10 -0700 (PDT) From: muradm Date: Tue, 10 Aug 2021 23:07:53 +0300 Message-Id: <20210810200756.9581-4-mail@muradm.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810193626.9186-1-mail@muradm.net> References: <20210810193626.9186-1-mail@muradm.net> MIME-Version: 1.0 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 This package inherits pam-mount in the way that it is compiled specifically for use with greetd daemon. It uses different configuration location and name space for storing data in PAM. greetd-pam-mount is used in configuration of greetd to provide auto-(mounting/unmounting) of XDG_RUNTIME_DIR in the way that it will not interfere with default pam-mount configuration. * gnu/packages/admin.scm (greetd-pam-mount): Add greetd-pam-mount --- gnu/packages/admin.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index eda269f148..e805b219c5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 WinterHound ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -4247,6 +4248,25 @@ supports. It can also mount encrypted LUKS volumes using the password supplied by the user when logging in.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public greetd-pam-mount + (package + (inherit pam-mount) + (name "greetd-pam-mount") + (arguments + (substitute-keyword-arguments (package-arguments pam-mount) + ((#:configure-flags flags ''()) + `(cons* "--with-rundir=/run/greetd" ,flags)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-config-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/pam_mount.c" + ((".*define CONFIGFILE .*$") + "#define CONFIGFILE \"/etc/security/greetd_pam_mount.conf.xml\"\n") + (("pam_mount_config") "greetd_pam_mount_config") + (("pam_mount_system_authtok") "greetd_pam_mount_system_authtok")))))))) + (synopsis "pam-mount specifically compiled for use with greetd"))) + (define-public jc (package (name "jc")