[bug#55762] [PATCH] Upgrade linux-pam to 1.5.2

[bug#55762] [PATCH] Upgrade linux-pam to 1.5.2

[Felix Lechner]

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

Control: tags -1 + patch

Hi,

For my work in making PAM configurable in Guile, I rely on the foreign
function interface (FFI). The automatic generation of that interface
requires Pkgconfig files. Those files are not available in Guix.
Linux-PAM started shipping them in the release after the one we have.
The attached patch upgrades linux-pam to version 1.5.2.

The changes are further documented in the commit message.

I am new to Guix and already use the new version of linux-pam locally
(via Guix System) but I was unable to test the patch according to the
requirements and recommendations listed for this submission. [1]

This email was sent to -devel in lieu of -mentors, which does not
exist. Any guidance is much appreciated. Thanks for taking a look!

KInd regards
Felix Lechner

[1] https://guix.gnu.org/en/manual/devel/en/html_node/Submitting-Patches.html

[-- Attachment #2: 0001-Update-linux-pam-to-1.5.2.patch --]
[-- Type: text/x-patch, Size: 2085 bytes --]

From 592d8156014090fefe8b9b1da8cada6aa2fa120a Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Tue, 31 May 2022 11:40:04 -0700
Subject: [PATCH] Update linux-pam to 1.5.2.

This version ships three Pkgconfig files for Linux-PAM that make it
possible to generate automatic FFI bindings via 'nyacc compile-ffi'.

The current PAM version in Guix offers no Pkgconfig files at all.
Upstream started shipping them in version 1.5.2.

The extra argument to ./configure is needed to sidestep an issue
upstream. [1]

[1] https://github.com/linux-pam/linux-pam/issues/466
---
 gnu/packages/linux.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2af32fc88f..8a08a56bb4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1579,7 +1579,7 @@ (define-public xpadneo
 (define-public linux-pam
   (package
     (name "linux-pam")
-    (version "1.5.1")
+    (version "1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -1588,7 +1588,7 @@ (define-public linux-pam
              version "/Linux-PAM-" version ".tar.xz"))
        (sha256
         (base32
-         "1z4jayf69qyyxln1gl6ch4qxfd66ib1g42garnrv2d8i1drl0790"))
+         "0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74"))
        (patches (search-patches "linux-pam-no-setfsuid.patch"))))
 
     (build-system gnu-build-system)
@@ -1604,6 +1604,9 @@ (define-public linux-pam
        #:configure-flags (list (string-append "--includedir="
                                               (assoc-ref %outputs "out")
                                               "/include/security")
+                               (string-append "--libdir="
+                                              (assoc-ref %outputs "out")
+                                              "/lib")
 
                                ;; XXX: <rpc/rpc.h> is missing from glibc when
                                ;; cross-compiling, so we have to disable NIS

base-commit: 20432b839b6bc9e30c156d412597b734a726940d
-- 
2.36.1

[bug#55762] [PATCH] Upgrade linux-pam to 1.5.2

[Tobias Geerinckx-Rice via Guix-patches via]

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

Felix,

Felix Lechner 写道：
> For my work in making PAM configurable in Guile, I rely on the 
> foreign
> function interface (FFI). The automatic generation of that 
> interface
> requires Pkgconfig files. Those files are not available in Guix.
> Linux-PAM started shipping them in the release after the one we 
> have.
> The attached patch upgrades linux-pam to version 1.5.2.

Thanks for working on both!

> The changes are further documented in the commit message.

And thanks for writing a clear commit message.  A few thoughts:

- The ‘gnu: foo: Update to x.y.z’ messages you see in the Guix 
  commit history are standardised.  The format's documented in the 
  GNU ‘(standards)Change Logs’ info page, but just take a stroll 
  through the history to get a feel for the majority of cases.

- Don't feel obligated to explain why you're upgrading a package, 
  although you're free to do so if you like (it was interesting 
  and I learnt something).

  Assuming no regressions, we always prefer to ship newer versions 
  of things.

- And finally, a personal windmill of mine:

> The extra argument to ./configure is needed to sidestep an issue
> upstream.[1]

  belongs in the code, where your fellow hackers can see it, not 
  buried in the commit log where $nobody will:

  ;; Work around 
  <https://github.com/linux-pam/linux-pam/issues/466>.

As you might now, this update rebuilds a good part of the world 
and will have to pass through the core-updates branch…

  $ guix refresh -l linux-pam | cut -d: -f1

> I am new to Guix and already use the new version of linux-pam 
> locally
> (via Guix System) but I was unable to test the patch according 
> to the
> requirements and recommendations listed for this submission. [1]

…so it's impressive if you rebuilt most of your entire system 
based on the new nyacc/linux-pam packages.

What still needs to be done, and which problems did you encounter?

Kind regards,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#55762] [PATCH] Upgrade linux-pam to 1.5.2

[Felix Lechner]

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

Hi,

On Thu, Jun 2, 2022 at 11:42 AM Tobias Geerinckx-Rice <me@tobias.gr> wrote:
>
> - The ‘gnu: foo: Update to x.y.z’ messages you see in the Guix
>   commit history are standardised.

The commit message was adjusted to the community standards.

> - Don't feel obligated to explain why you're upgrading a package,

I removed the explanation.

> > The extra argument to ./configure is needed to sidestep an issue
> > upstream.[1]
>
>   belongs in the code, where your fellow hackers can see it, not
>   buried in the commit log where $nobody will:
>
>   ;; Work around
>   <https://github.com/linux-pam/linux-pam/issues/466>.

Good idea! The comment was dropped from the commit message. Instead, I
added your note to the code.

> As you might now, this update rebuilds a good part of the world
> and will have to pass through the core-updates branch…
>
> …so it's impressive if you rebuilt most of your entire system
> based on the new nyacc/linux-pam packages.

Actually, my installation did not rebuild much at all, perhaps because
my local desktop runs few servers that would use PAM for
authentication.

Looking through the long list of consuming packages, my sense is that
one of the build systems may pull it in, perhaps via fakeroot or sudo.
I am not sure why cl-css or cl-uglify-js would otherwise need PAM.

> What still needs to be done, and which problems did you encounter?

I encountered no problems locally, but cannot speculate how Guix's
numerous build systems might react to the presence of the three new
Pkgconfig files. It was a reason why I mentioned the files in my
original commit message. My thought was that someone triangulating a
build issue elsewhere could perhaps find the information helpful.

An updated patch, which was also rebased, was attached. Thank you!

Kind regards,
Felix Lechner

[-- Attachment #2: 0001-gnu-linux-pam-Update-to-1.5.2.patch --]
[-- Type: text/x-patch, Size: 1895 bytes --]

From d3f62c0b14c170f94bc49fd1b557dddd26ea5033 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Tue, 31 May 2022 11:40:04 -0700
Subject: [PATCH] gnu: linux-pam: Update to 1.5.2.

* gnu/packages/linux.scm (linux-pam): Update to 1.5.2.
---
 gnu/packages/linux.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4fc0ac16af..6bb819cbdc 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1579,7 +1579,7 @@ (define-public xpadneo
 (define-public linux-pam
   (package
     (name "linux-pam")
-    (version "1.5.1")
+    (version "1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -1588,7 +1588,7 @@ (define-public linux-pam
              version "/Linux-PAM-" version ".tar.xz"))
        (sha256
         (base32
-         "1z4jayf69qyyxln1gl6ch4qxfd66ib1g42garnrv2d8i1drl0790"))
+         "0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74"))
        (patches (search-patches "linux-pam-no-setfsuid.patch"))))
 
     (build-system gnu-build-system)
@@ -1604,6 +1604,11 @@ (define-public linux-pam
        #:configure-flags (list (string-append "--includedir="
                                               (assoc-ref %outputs "out")
                                               "/include/security")
+                               ;; Work around
+                               ;; <https://github.com/linux-pam/linux-pam/issues/466>
+                               (string-append "--libdir="
+                                              (assoc-ref %outputs "out")
+                                              "/lib")
 
                                ;; XXX: <rpc/rpc.h> is missing from glibc when
                                ;; cross-compiling, so we have to disable NIS

base-commit: 3d69f2dae8c5d451e03d3569c8b153fd573054b8
-- 
2.36.1

[bug#55762] [PATCH core-updates] Upgrade linux-pam to 1.5.2

[Felix Lechner]

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

Hi,

This rebased patch applies cleanly after commit f172118ca43. Thanks!

Kind regards
Felix Lechner

[-- Attachment #2: 0001-gnu-linux-pam-Update-to-1.5.2.patch --]
[-- Type: text/x-patch, Size: 2047 bytes --]

From c6e7f8b9f6dd8c39008f1840af0d3323b6b48fa2 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Thu, 29 Sep 2022 13:34:21 -0700
Subject: [PATCH] gnu: linux-pam: Update to 1.5.2.

* gnu/packages/linux.scm (linux-pam): Update to 1.5.2.
  Add explicit libdir for pkgconfig files.
---
 gnu/packages/linux.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a97b84d657..e1b75bd588 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1566,7 +1566,7 @@ (define-public xpadneo
 (define-public linux-pam
   (package
     (name "linux-pam")
-    (version "1.5.1")
+    (version "1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -1575,7 +1575,7 @@ (define-public linux-pam
              version "/Linux-PAM-" version ".tar.xz"))
        (sha256
         (base32
-         "1z4jayf69qyyxln1gl6ch4qxfd66ib1g42garnrv2d8i1drl0790"))
+         "0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74"))
        (patches (search-patches "linux-pam-unix_chkpwd.patch"
                                 "linux-pam-no-setfsuid.patch"))))
 
@@ -1592,6 +1592,12 @@ (define-public linux-pam
        #:configure-flags (list (string-append "--includedir="
                                               (assoc-ref %outputs "out")
                                               "/include/security")
+                               ;; explicit libdir for pkgconfig files; drop when
+                               ;; https://github.com/linux-pam/linux-pam/issues/466
+                               ;; was resolved
+                               (string-append "--libdir="
+                                              (assoc-ref %outputs "out")
+                                              "/lib")
 
                                ;; XXX: <rpc/rpc.h> is missing from glibc when
                                ;; cross-compiling, so we have to disable NIS

base-commit: 8f870574b62dbd063f687b7b21d54a6dbd125e2d
-- 
2.37.3

[bug#55762] [PATCH core-updates] Upgrade linux-pam to 1.5.2

[Felix Lechner via Guix-patches via]

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

Hi,

Upstream accepted my merge request [1] so I added a code comment with
the version reference. Here is the updated patch. Thanks!

Kind regards
Felix Lechner

[1] https://github.com/linux-pam/linux-pam/pull/493

[-- Attachment #2: 0001-gnu-linux-pam-Update-to-1.5.2.patch --]
[-- Type: text/x-patch, Size: 2052 bytes --]

From 0854ffe7bd25ce883fbe63f4862929239e7a1907 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Thu, 29 Sep 2022 13:34:21 -0700
Subject: [PATCH] gnu: linux-pam: Update to 1.5.2.

* gnu/packages/linux.scm (linux-pam): Update to 1.5.2.
  Add explicit libdir for pkgconfig files.
---
 gnu/packages/linux.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a97b84d657..a81b8c7641 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1566,7 +1566,7 @@ (define-public xpadneo
 (define-public linux-pam
   (package
     (name "linux-pam")
-    (version "1.5.1")
+    (version "1.5.2")
     (source
      (origin
        (method url-fetch)
@@ -1575,7 +1575,7 @@ (define-public linux-pam
              version "/Linux-PAM-" version ".tar.xz"))
        (sha256
         (base32
-         "1z4jayf69qyyxln1gl6ch4qxfd66ib1g42garnrv2d8i1drl0790"))
+         "0kgrsj2scv5mx6w925h9hxf11jnqqs9z8s22aw94b90xm4qp3v74"))
        (patches (search-patches "linux-pam-unix_chkpwd.patch"
                                 "linux-pam-no-setfsuid.patch"))))
 
@@ -1592,6 +1592,12 @@ (define-public linux-pam
        #:configure-flags (list (string-append "--includedir="
                                               (assoc-ref %outputs "out")
                                               "/include/security")
+                               ;; explicit libdir for pkgconfig files
+                               ;; drop with 1.5.3, which fixes
+                               ;; https://github.com/linux-pam/linux-pam/issues/466
+                               (string-append "--libdir="
+                                              (assoc-ref %outputs "out")
+                                              "/lib")
 
                                ;; XXX: <rpc/rpc.h> is missing from glibc when
                                ;; cross-compiling, so we have to disable NIS

base-commit: 511d584906c6304a3dc6ffcf7096bb14c6bee222
-- 
2.37.3

bug#55762: [PATCH core-updates] linux-pam: Update to 1.5.2

[Ludovic Courtès]

Hi,

Felix Lechner <felix.lechner@lease-up.com> skribis:

> From 0854ffe7bd25ce883fbe63f4862929239e7a1907 Mon Sep 17 00:00:00 2001
> From: Felix Lechner <felix.lechner@lease-up.com>
> Date: Thu, 29 Sep 2022 13:34:21 -0700
> Subject: [PATCH] gnu: linux-pam: Update to 1.5.2.
>
> * gnu/packages/linux.scm (linux-pam): Update to 1.5.2.
>   Add explicit libdir for pkgconfig files.

Applied, thanks!  :-)

Ludo’.