From 67dd5807e8e6bd31b2c0dd774f810abd30a69902 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 15 Feb 2024 13:55:02 +0000
Subject: [PATCH] core/pam to 1.6.0-4

---
 core/pam/.SRCINFO |  8 ++++++--
 core/pam/PKGBUILD | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/core/pam/.SRCINFO b/core/pam/.SRCINFO
index bf90c6f89..3d1953279 100644
--- a/core/pam/.SRCINFO
+++ b/core/pam/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = pam
 	pkgdesc = PAM (Pluggable Authentication Modules) library
 	pkgver = 1.6.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://linux-pam.org
 	arch = x86_64
-	license = GPL2
+	license = GPL-2.0-only
 	makedepends = flex
 	makedepends = w3m
 	makedepends = docbook-xml>=4.4
@@ -34,6 +34,8 @@ pkgbase = pam
 	source = https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0.tar.xz.asc
 	source = https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0-docs.tar.xz
 	source = https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0-docs.tar.xz.asc
+	source = https://github.com/linux-pam/linux-pam/commit/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch
+	source = https://github.com/linux-pam/linux-pam/commit/b7b96362087414e52524d3d9d9b3faa21e1db620.patch
 	source = pam.tmpfiles
 	validpgpkeys = 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB
 	validpgpkeys = 296D6F29A020808E8717A8842DB5BD89A340AEB7
@@ -41,6 +43,8 @@ pkgbase = pam
 	sha256sums = SKIP
 	sha256sums = 3e82730d3350795c42f3708f6609a92c1df841d518aa17c28fd702fe5ec23a32
 	sha256sums = SKIP
+	sha256sums = ee7333ad2c8b2a710c73d8a2d202027d0c79d3628fefe58073f2d78ecefa121e
+	sha256sums = 450760e1989f036acee157f91a3028264f8ce7fb0cbdd65eccf8a0fc0084497c
 	sha256sums = 5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac
 
 pkgname = pam
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index d6b6040fc..34cb18290 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -7,10 +7,10 @@
 
 pkgname=pam
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('x86_64')
-license=('GPL2')
+license=('GPL-2.0-only')
 url="http://linux-pam.org"
 depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so')
 makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
@@ -18,6 +18,8 @@ provides=('libpam.so' 'libpamc.so' 'libpam_misc.so')
 backup=(etc/security/{access.conf,faillock.conf,group.conf,limits.conf,namespace.conf,namespace.init,pwhistory.conf,pam_env.conf,time.conf} etc/environment)
 source=(https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver{,-docs}.tar.xz{,.asc}
         https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13.patch
+        https://github.com/linux-pam/linux-pam/commit/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch
+        https://github.com/linux-pam/linux-pam/commit/b7b96362087414e52524d3d9d9b3faa21e1db620.patch
         $pkgname.tmpfiles)
 validpgpkeys=(
         '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk
@@ -29,13 +31,23 @@ sha256sums=('fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad'
             '3e82730d3350795c42f3708f6609a92c1df841d518aa17c28fd702fe5ec23a32'
             'SKIP'
             '6a0dbd7cb38680143e327d87a9c52f8ac9e8910d30208fd56c0560927c5b9ab7'
+            'ee7333ad2c8b2a710c73d8a2d202027d0c79d3628fefe58073f2d78ecefa121e'
+            '450760e1989f036acee157f91a3028264f8ce7fb0cbdd65eccf8a0fc0084497c'
             '5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac')
 
 options=('!emptydirs')
 
 prepare() {
   cd Linux-PAM-$pkgver
-  patch -p1 -i ../cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13.patch
+  # apply patch from the source array (should be a pacman feature)
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    echo "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
 }
 
 build() {