systemd/linux-pam: upgrade to 1.6.1-r1 (MR 5579)

pkgver and pkgrel match aports version

APKBUILD was rebased onto alpine aports version

extra-repos/systemd/linux-pam/APKBUILD

@@ -5,7 +5,7 @@ pkgname=linux-pam
 # MUST be kept in sync to avoid accidentally pulling in the alpine version
 # we hard depend on this exact version in postmarketos-base-systemd. When updating
 # the package here it must also be updated in postmarketos-base-systemd.
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
 url="https://www.kernel.org/pub/linux/libs/pam"
@@ -24,10 +24,9 @@ makedepends="
 "
 options="pmb:strict suid !check"
 provider_priority=100
-subpackages="$pkgname-dev $pkgname-doc $pkgname-systemd"
-source="
-	https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz
-	pam_namespace.patch
+subpackages="$pkgname-dev $pkgname-manual::noarch $pkgname-doc $pkgname-systemd"
+source="https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz
+	https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver-docs.tar.xz
 
 	base-auth.pamd
 	base-account.pamd
@@ -41,6 +40,8 @@ source="
 builddir="$srcdir"/Linux-PAM-$pkgver
 
 # secfixes:
+#   1.6.0-r0:
+#     - CVE-2024-22365
 #   1.5.1-r0:
 #     - CVE-2020-27780
 
@@ -56,7 +57,8 @@ build() {
 		--with-systemdunitdir=/usr/lib/systemd/system \
 		--localstatedir=/var \
 		--disable-nls \
-		--disable-db
+		--disable-db \
+		--disable-examples
 	make
 }
 
@@ -79,9 +81,15 @@ package() {
 		&& chmod g+s "$pkgdir"/sbin/unix_chkpwd
 }
 
+manual() {
+	pkgdesc="$pkgdesc (manual)"
+
+	amove usr/share/doc/Linux-PAM
+}
+
 sha512sums="
-7af07edb71a79275ad7f7f3bd82a4619b12a23a10f5fb2e5d810c6aadb718fd739ed17ca336c3420945d48d326e91874d8e45cfc5a4bf01a0cc5f9663bd2a0ad  Linux-PAM-1.6.0.tar.xz
-e9593ffb9bc29368c8e12fef770562bffd84001053bee5c4b0b859d4b39c675a13c1f9b689c619b78f61eee23a152e5a64ece4cca81d4306049a9108167cc708  pam_namespace.patch
+ddb5a5f296f564b76925324550d29f15d342841a97815336789c7bb922a8663e831edeb54f3dcd1eaf297e3325c9e2e6c14b8740def5c43cf3f160a8a14fa2ea  Linux-PAM-1.6.1.tar.xz
+c6054ec6832f604c0654cf074e4e241c44037fd41cd37cca7da94abe008ff72adc4466d31bd254517eda083c7ec3f6aefd37785b3ee3d0d4553250bd29963855  Linux-PAM-1.6.1-docs.tar.xz
 988e4ba32fe6b7adeb4898c784eb40d6f88f3fca78ead82b61686f0e1597f306abb3ee338aa2e4cf2db0191b8c1a7e319332e7f6d6aed3ab381f71c0a3355de9  base-auth.pamd
 5d3e960ead44dcb2b3f732825482eefab9a9ffa4d4d5fc1d30cbf2fe8c5c896f1114a0ad3a6c606fa9fbf5c43400388f4ee8d7fca8110721eabfc9691004756b  base-account.pamd
 b3a900d6067ba04faa8016d9408da75917e8c0502020a4048bba1de2ca54c705c4d5f8307e759080fd5a9d5f3522f52a708803f1f01627eac56d9d7c6d363d13  base-password.pamd

extra-repos/systemd/linux-pam/pam_namespace.patch

-From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001
-From: Jacob Heider <jacob@pkgx.dev>
-Date: Wed, 17 Jan 2024 11:49:26 -0500
-Subject: [PATCH] pam_namespace: include stdint.h
-
-pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h,
-resulting in the following build failures on 1.6.0:
-
-  pam_namespace.c: In function 'process_line':
-  pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function)
-    649 |         if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
-        |                                         ^~~~~~~~
-  pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
-     40 | #include "argv_parse.h"
-    +++ |+#include <stdint.h>
-     41 |
-  pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in
-    649 |         if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
-        |                                         ^~~~~~~~
-
-Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config")
-Resolves: https://github.com/linux-pam/linux-pam/issues/733
----
- modules/pam_namespace/pam_namespace.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c
-index f72d67189..b16731c22 100644
---- a/modules/pam_namespace/pam_namespace.c
-+++ b/modules/pam_namespace/pam_namespace.c
-@@ -34,6 +34,8 @@
- 
- #define _ATFILE_SOURCE
- 
-+#include "config.h"
-+#include <stdint.h>
- #include "pam_cc_compat.h"
- #include "pam_inline.h"
- #include "pam_namespace.h"