From b6f9ca06fd9dad8b79b031d94cca0460cc0c50e1 Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Fri, 6 Dec 2024 10:12:30 +0100
Subject: [PATCH] * update pam to 1.7.0-1

---
 pam/.SRCINFO | 28 +++++++++++-----------
 pam/PKGBUILD | 66 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/pam/.SRCINFO b/pam/.SRCINFO
index dfa8635bcf..9c3e17d754 100644
--- a/pam/.SRCINFO
+++ b/pam/.SRCINFO
@@ -1,30 +1,32 @@
 pkgbase = pam
 	pkgdesc = PAM (Pluggable Authentication Modules) library
-	pkgver = 1.6.1
-	pkgrel = 3.1
+	pkgver = 1.7.0
+	pkgrel = 1
 	url = http://linux-pam.org
 	arch = x86_64
 	arch = powerpc64le
 	arch = powerpc64
 	arch = powerpc
+	arch = espresso
 	arch = riscv64
 	license = GPL-2.0-only
-	makedepends = git
-	makedepends = flex
-	makedepends = w3m
-	makedepends = libxslt
 	makedepends = docbook-xml
-	makedepends = docbook5-xml
 	makedepends = docbook-xsl
+	makedepends = docbook5-xml
+	makedepends = flex
 	makedepends = fop
-	depends = glibc
-	depends = libtirpc
-	depends = pambase
+	makedepends = git
+	makedepends = libxslt
+	makedepends = meson
+	makedepends = w3m
 	depends = audit
+	depends = glibc
 	depends = libaudit.so
-	depends = libxcrypt
 	depends = libcrypt.so
 	depends = libnsl
+	depends = libtirpc
+	depends = libxcrypt
+	depends = pambase
 	depends = systemd-libs
 	provides = libpam.so
 	provides = libpamc.so
@@ -40,11 +42,11 @@ pkgbase = pam
 	backup = etc/security/pam_env.conf
 	backup = etc/security/time.conf
 	backup = etc/environment
-	source = pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v1.6.1
+	source = pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v1.7.0
 	source = pam.tmpfiles
 	validpgpkeys = 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB
 	validpgpkeys = 296D6F29A020808E8717A8842DB5BD89A340AEB7
-	b2sums = 12891f9064ce7f00d22452d8ff39c14af87c24f9fbf3eab65e475a7d2a592d2b1c1d585f3718b2fa72f277a8ad1faa17149fe0a911bfabdaa4a2957c32e29fe3
+	b2sums = 88ecba59692fe86f6f6516007b87fb897018cc5f818c106a037f15df4dda7c31e50fbfcb137493d49cb754e41f2f69a60f24ffea3374ff5e38ce6263bfa7abac
 	b2sums = 36582c80020008c3810b311a2e126d2fb4ffc94e565ea4c0c0ab567fdb92943e269781ffa548550742feb685847c26c340906c7454dcc31df4e1e47d511d8d6f
 
 pkgname = pam
diff --git a/pam/PKGBUILD b/pam/PKGBUILD
index 4a211ec21e..c48c1b1306 100644
--- a/pam/PKGBUILD
+++ b/pam/PKGBUILD
@@ -4,29 +4,57 @@
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
-pkgver=1.6.1
-pkgrel=3.1
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=(x86_64 powerpc64le powerpc64 powerpc espresso riscv64)
 license=('GPL-2.0-only')
 url="http://linux-pam.org"
-depends=('glibc' 'libtirpc' 'pambase' 'audit' 'libaudit.so' 'libxcrypt' 'libcrypt.so' 'libnsl' 'systemd-libs')
-makedepends=('git' 'flex' 'w3m' 'libxslt' 'docbook-xml' 'docbook5-xml' 'docbook-xsl' 'fop')
-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)
+depends=(
+  audit
+  glibc
+  libaudit.so
+  libcrypt.so
+  libnsl
+  libtirpc
+  libxcrypt
+  pambase
+  systemd-libs
+)
+makedepends=(
+  docbook-xml
+  docbook-xsl
+  docbook5-xml
+  flex
+  fop
+  'java-environment>=11'
+  'java-environment<=17'
+  git
+  libxslt
+  meson
+  w3m
+)
+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=("pam::git+https://github.com/linux-pam/linux-pam?signed#tag=v${pkgver}"
         "${pkgname}.tmpfiles")
 validpgpkeys=(
         '8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB' # Thorsten Kukuk
         '296D6F29A020808E8717A8842DB5BD89A340AEB7' # Dimitry V. Levin <ldv@altlinux.org>
 )
-b2sums=('12891f9064ce7f00d22452d8ff39c14af87c24f9fbf3eab65e475a7d2a592d2b1c1d585f3718b2fa72f277a8ad1faa17149fe0a911bfabdaa4a2957c32e29fe3'
+b2sums=('88ecba59692fe86f6f6516007b87fb897018cc5f818c106a037f15df4dda7c31e50fbfcb137493d49cb754e41f2f69a60f24ffea3374ff5e38ce6263bfa7abac'
         '36582c80020008c3810b311a2e126d2fb4ffc94e565ea4c0c0ab567fdb92943e269781ffa548550742feb685847c26c340906c7454dcc31df4e1e47d511d8d6f')
 options=('!emptydirs')
 
 prepare() {
   cd "${pkgname}"
-  ./autogen.sh
   # apply patch from the source array (should be a pacman feature)
   local src
   for src in "${source[@]}"; do
@@ -39,19 +67,23 @@ prepare() {
 }
 
 build() {
-  cd "${pkgname}"
-  ./configure \
-    --libdir=/usr/lib \
-    --sbindir=/usr/bin \
-    --enable-logind \
-    --disable-db
-  make
+  which java
+  arch-meson "${pkgname}" \
+    -Dlogind=enabled \
+    -Deconf=disabled \
+    -Dselinux=disabled \
+    -Dpam_userdb=disabled \
+    build
+  meson compile -C build
+}
+
+check() {
+  meson test -C build
 }
 
 package() {
+  meson install -C build --destdir "${pkgdir}"
   install -Dm 644 $pkgname.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
-  cd "${pkgname}"
-  make DESTDIR="${pkgdir}" SCONFIGDIR=/etc/security install
 
   # set unix_chkpwd uid
   chmod +s "${pkgdir}"/usr/bin/unix_chkpwd