[bug#73374] [PATCH] gnu: pam-mount: fix libcryptsetup detection

[bug#73374] [PATCH] gnu: pam-mount: fix libcryptsetup detection

[nathan via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 79 bytes --]

easy way to test:
look at the configure log and observe that it's detected now.

[-- Attachment #2: 0001-gnu-pam-mount-fix-libcryptsetup-detection.patch --]
[-- Type: text/x-patch, Size: 2048 bytes --]

From b3d6cc85ddcbfb162f679a6f59086b7825b1a712 Mon Sep 17 00:00:00 2001
Message-ID: <b3d6cc85ddcbfb162f679a6f59086b7825b1a712.1726799784.git.nathan_mail@nborghese.com>
From: nathan <nathan_mail@nborghese.com>
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

[bug#73374] [PATCH v2 0/3] Fix and update pam-mount

[Nikita Domnitskii via Guix-patches via]

I've updated nathan's patch a little bit and updated pam-mount to the
latest version while we're at it

Nikita Domnitskii (2):
  gnu: pam-mount: Remove lvm2 from inputs.
  gnu: pam-mount: Update to 2.20.

nathan via Guix-patches via (1):
  gnu: pam-mount: Fix libcryptsetup detection.

 gnu/packages/admin.scm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)


base-commit: 657919afa46f562d7540495b2a22a0617202cafc


-- 
Best Regards,
Nikita Domnitskii

[bug#73374] [PATCH v2 1/3] gnu: pam-mount: Fix libcryptsetup detection.

[Nikita Domnitskii via Guix-patches via]

* 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 | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 86f35d49ad..74b2054e60 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -68,6 +68,8 @@
 ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
 ;;; Copyright © 2024 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2024 nathan <nathan_mail@nborghese.com>
+;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
 ;;;
 ;;; 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,17 @@ (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
+            lvm2
+            openssl
+            pcre2
+            `(,util-linux "lib")
+            util-linux
+            eudev)))
     (home-page "https://inai.de/projects/pam_mount/")
     (synopsis "PAM module to mount volumes for a user session")
     (description


-- 
Best Regards,
Nikita Domnitskii

[bug#73374] [PATCH v2 3/3] gnu: pam-mount: Update to 2.20.

[Nikita Domnitskii via Guix-patches via]

* gnu/packages/admin.scm (pam-mount): Update to 2.20.

Change-Id: I5dc139525096981bd789fe7845eff4b47198cf5b
---
 gnu/packages/admin.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 7669d65dce..73c151f8ab 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4905,14 +4905,14 @@ (define-public ngrep
 (define-public pam-mount
   (package
     (name "pam-mount")
-    (version "2.18")
+    (version "2.20")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/"
-                           "pam_mount-" version ".tar.xz"))
+       (uri (string-append "https://inai.de/files/pam_mount/pam_mount-"
+                           version ".tar.xz"))
        (sha256
-        (base32 "0832nh2qf9pisgwnbgx6hkylx5d7i416l19y3ly4ifv7k1p7mxqa"))))
+        (base32 "1vbc6fd826qgj5qq5g06hc64x6n372xhb92bfvhzi02n91x209jl"))))
     (build-system gnu-build-system)
     (arguments
      (list


-- 
Best Regards,
Nikita Domnitskii

[bug#73374] [PATCH v2 2/3] gnu: pam-mount: Remove lvm2 from inputs.

[Nikita Domnitskii via Guix-patches via]

* gnu/packages/admin.scm (pam-mount): Remove lvm2 from inputs.
[inputs]: Remove lvm2.

Change-Id: I5730a4e5767a9cd99723155e5ba4d27e92f58786
---
 gnu/packages/admin.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 74b2054e60..7669d65dce 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4953,7 +4953,6 @@ (define-public pam-mount
       (list libhx
             libxml2
             linux-pam
-            lvm2
             openssl
             pcre2
             `(,util-linux "lib")


-- 
Best Regards,
Nikita Domnitskii

[bug#73374] [PATCH v3 0/2]

[Nikita Domnitskii via Guix-patches via]

Unified commits that are deleting and adding inputs. Removed lib output
of `util-linux` because it's already provided by
`libcryptsetup-propagated-inputs`

Nikita Domnitskii (1):
  gnu: pam-mount: Update to 2.20.

nathan via Guix-patches via (1):
  gnu: pam-mount: Fix libcryptsetup detection.

 gnu/packages/admin.scm | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)


base-commit: 657919afa46f562d7540495b2a22a0617202cafc


-- 
Best Regards,
Nikita Domnitskii

[bug#73374] [PATCH v3 1/2] gnu: pam-mount: Fix libcryptsetup detection.

[Nikita Domnitskii via Guix-patches via]

* 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 <gemmaro.dev@gmail.com>
 ;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
 ;;; Copyright © 2024 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2024 nathan <nathan_mail@nborghese.com>
+;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me>
 ;;;
 ;;; 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


-- 
Best Regards,
Nikita Domnitskii

[bug#73374] [PATCH v3 2/2] gnu: pam-mount: Update to 2.20.

[Nikita Domnitskii via Guix-patches via]

* gnu/packages/admin.scm (pam-mount): Update to 2.20.

Change-Id: I5dc139525096981bd789fe7845eff4b47198cf5b
---
 gnu/packages/admin.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 47ccb09462..db9aea31a5 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4905,14 +4905,14 @@ (define-public ngrep
 (define-public pam-mount
   (package
     (name "pam-mount")
-    (version "2.18")
+    (version "2.20")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/"
-                           "pam_mount-" version ".tar.xz"))
+       (uri (string-append "https://inai.de/files/pam_mount/pam_mount-"
+                           version ".tar.xz"))
        (sha256
-        (base32 "0832nh2qf9pisgwnbgx6hkylx5d7i416l19y3ly4ifv7k1p7mxqa"))))
+        (base32 "1vbc6fd826qgj5qq5g06hc64x6n372xhb92bfvhzi02n91x209jl"))))
     (build-system gnu-build-system)
     (arguments
      (list


-- 
Best Regards,
Nikita Domnitskii