From 4017de01bdc07f5f9dd91b1039612a9622f2f1b1 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Wed, 4 May 2022 03:42:53 +0000
Subject: system/linux-pam: bump { 1.3.1 --> 1.5.2 }.

---
 system/linux-pam/APKBUILD                | 10 ++++------
 system/linux-pam/musl-fix-pam_exec.patch | 32 --------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 system/linux-pam/musl-fix-pam_exec.patch

diff --git a/system/linux-pam/APKBUILD b/system/linux-pam/APKBUILD
index 5433b99e7..9b4cfd9e4 100644
--- a/system/linux-pam/APKBUILD
+++ b/system/linux-pam/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=linux-pam
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.5.2
+pkgrel=0
 pkgdesc="Pluggable Authentication Modules"
 url="https://www.kernel.org/pub/linux/libs/pam"
 arch="all"
@@ -13,10 +13,9 @@ makedepends_host="$depends_dev utmps-dev"
 makedepends_build="$depends_dev byacc flex-dev autoconf automake libtool"
 makedepends="$makedepends_host $makedepends_build"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://github.com/$pkgname/$pkgname/releases/download/v1.3.1/Linux-PAM-$pkgver.tar.xz
+source="https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz
 	fix-compat.patch
 	libpam-fix-build-with-eglibc-2.16.patch
-	musl-fix-pam_exec.patch
 	use-utmpx.patch
 
 	base-auth.pamd
@@ -79,10 +78,9 @@ package() {
 		&& chmod g+s "$pkgdir"/sbin/unix_chkpwd
 }
 
-sha512sums="6bc8e2a5b64686f0a23846221c5228c88418ba485b17c53b3a12f91262b5bb73566d6b6a5daa1f63bbae54310aee918b987e44a72ce809b4e7c668f0fadfe08e  Linux-PAM-1.3.1.tar.xz
+sha512sums="fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144  Linux-PAM-1.5.2.tar.xz
 1a8ae3a212684b0dfef12aaeb1d4cec6e85b056a79b13ddc9ebe1cd61fe8da1a6210a06eb3e4f5bacc0c2fa71b82346d87f673921ce1453cbc46cb905e86a6c6  fix-compat.patch
 f49edf3876cc6bcb87bbea4e7beaeb0a382d596898c755f5fbaf6c2ed4e0c8f082b2cd16dde8a74af82bb09a1334f463e07a4bb5b8a48f023ff90a67ad2fdd44  libpam-fix-build-with-eglibc-2.16.patch
-82fb1ec27b370ed5d30451f31aecbacf94ff8aff9db52e79090466dcdd1b1b2c18ca7e0641b1b51a3ed78ea7203fe9464b50f63d6dbf661e10f68366c79196ae  musl-fix-pam_exec.patch
 8352c0bd36f776251143d1e73d92a1e746e8f23778462e441cc989afd4204887aca6b310d87ab8e5b315b13c4ad1225c87531b71a0fef693772fc7e12bcde418  use-utmpx.patch
 2df1d45af0f32ed3755fde2771129f73f28761e0c5d8b08ca880a0206c6eaa3a32cc1bcf27045b960f33d062cff901220acd535e319ae3c4368614dada08cd2a  base-auth.pamd
 62144e8f785ce324771465017a27b9a538856ba120d80d1181f5b1012d56170b712c4cd9d018ee51af387a2cdf0442c14f7d07d556abcb2e2bea54bca2c4c262  base-account.pamd
diff --git a/system/linux-pam/musl-fix-pam_exec.patch b/system/linux-pam/musl-fix-pam_exec.patch
deleted file mode 100644
index 52e316ac8..000000000
--- a/system/linux-pam/musl-fix-pam_exec.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./modules/pam_exec/pam_exec.c.orig
-+++ ./modules/pam_exec/pam_exec.c
-@@ -103,11 +103,14 @@
-   int optargc;
-   const char *logfile = NULL;
-   const char *authtok = NULL;
-+  char authtok_buf[PAM_MAX_RESP_SIZE+1];
-+
-   pid_t pid;
-   int fds[2];
-   int stdout_fds[2];
-   FILE *stdout_file = NULL;
- 
-+  memset(authtok_buf, 0, sizeof(authtok_buf));
-   if (argc < 1) {
-     pam_syslog (pamh, LOG_ERR,
- 		"This module needs at least one argument");
-@@ -180,12 +183,12 @@
- 	      if (resp)
- 		{
- 		  pam_set_item (pamh, PAM_AUTHTOK, resp);
--		  authtok = strndupa (resp, PAM_MAX_RESP_SIZE);
-+		  authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf));
- 		  _pam_drop (resp);
- 		}
- 	    }
- 	  else
--	    authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE);
-+	    authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf));
- 
- 	  if (pipe(fds) != 0)
- 	    {
-- 
cgit v1.2.3-70-g09d2