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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73374 in the body.
You can then email your comments to 73374 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: nathan <nathan_mail <at> nborghese.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: pam-mount: fix libcryptsetup detection
Date: Fri, 20 Sep 2024 02:43:04 +0000

[Message part 1 (text/plain, inline)]

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

[0001-gnu-pam-mount-fix-libcryptsetup-detection.patch (text/x-patch, attachment)]

Message #8 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v2 0/3] Fix and update pam-mount
Date: Thu, 31 Oct 2024 12:21:03 +0600

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

Message #11 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] gnu: pam-mount: Fix libcryptsetup detection.
Date: Fri, 20 Sep 2024 02:43:04 +0000

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

Message #14 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] gnu: pam-mount: Remove lvm2 from inputs.
Date: Thu, 31 Oct 2024 11:59:03 +0600

* 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

Message #17 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] gnu: pam-mount: Update to 2.20.
Date: Thu, 31 Oct 2024 11:47:33 +0600

* 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

Message #20 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v3 1/2] gnu: pam-mount: Fix libcryptsetup detection.
Date: Fri, 20 Sep 2024 02:43:04 +0000

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

Message #23 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v3 0/2] 
Date: Thu, 31 Oct 2024 21:17:13 +0600

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

Message #26 received at 73374 <at> debbugs.gnu.org (full text, mbox):

From: Nikita Domnitskii <nikita <at> domnitskii.me>
To: 73374 <at> debbugs.gnu.org
Subject: [PATCH v3 2/2] gnu: pam-mount: Update to 2.20.
Date: Thu, 31 Oct 2024 11:47:33 +0600

* 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

Message #31 received at 73374-done <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Nikita Domnitskii <nikita <at> domnitskii.me>
Cc: 73374-done <at> debbugs.gnu.org
Subject: Re: [bug#73374] [PATCH v3 0/2]
Date: Fri, 01 Nov 2024 19:05:42 +0300

[Message part 1 (text/plain, inline)]

Hi Nikita,

Apologize for the delay in response.

Thank you for updating the patch!

Nikita Domnitskii <nikita <at> domnitskii.me> writes:

> 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

Pushed as cd9ac7d96b3634a7e1ec8da988dd3ac2dd186018 to master.


Regards,
Oleg.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.