pam-selinux 1.6.0-4 update

2 files changed, 25 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3edb8654f1b7..badf8ce8fbd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pam-selinux
 	pkgdesc = SELinux aware PAM (Pluggable Authentication Modules) library
 	pkgver = 1.6.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://linux-pam.org
 	arch = x86_64
 	arch = aarch64
@@ -22,8 +22,8 @@ pkgbase = pam-selinux
 	provides = libpam.so
 	provides = libpamc.so
 	provides = libpam_misc.so
-	provides = pam=1.6.0-3
-	provides = selinux-pam=1.6.0-3
+	provides = pam=1.6.0-4
+	provides = selinux-pam=1.6.0-4
 	conflicts = pam
 	conflicts = selinux-pam
 	options = !emptydirs
@@ -41,6 +41,8 @@ pkgbase = pam-selinux
 	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
@@ -48,6 +50,8 @@ pkgbase = pam-selinux
 	sha256sums = SKIP
 	sha256sums = 3e82730d3350795c42f3708f6609a92c1df841d518aa17c28fd702fe5ec23a32
 	sha256sums = SKIP
+	sha256sums = ee7333ad2c8b2a710c73d8a2d202027d0c79d3628fefe58073f2d78ecefa121e
+	sha256sums = 450760e1989f036acee157f91a3028264f8ce7fb0cbdd65eccf8a0fc0084497c
 	sha256sums = 5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac
 
 pkgname = pam-selinux
diff --git a/PKGBUILD b/PKGBUILD
index 1e9e11e0e0b4..3464a0ccb8a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=pam-selinux
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="SELinux aware PAM (Pluggable Authentication Modules) library"
 arch=('x86_64' 'aarch64')
 license=('GPL2')
@@ -24,6 +24,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)
 groups=('selinux')
 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/470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200.patch
+        https://github.com/linux-pam/linux-pam/commit/b7b96362087414e52524d3d9d9b3faa21e1db620.patch
         ${pkgname/-selinux}.tmpfiles)
 validpgpkeys=(
         '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk
@@ -34,10 +36,25 @@ sha256sums=('fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad'
             'SKIP'
             '3e82730d3350795c42f3708f6609a92c1df841d518aa17c28fd702fe5ec23a32'
             'SKIP'
+            'ee7333ad2c8b2a710c73d8a2d202027d0c79d3628fefe58073f2d78ecefa121e'
+            '450760e1989f036acee157f91a3028264f8ce7fb0cbdd65eccf8a0fc0084497c'
             '5631f224e90c4f0459361c2a5b250112e3a91ba849754bb6f67d69d683a2e5ac')
 
 options=('!emptydirs')
 
+prepare() {
+  cd Linux-PAM-$pkgver
+  # 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() {
   cd Linux-PAM-$pkgver
   ./configure \