# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1636611661 -3600
# Node ID c6d6f953044e42dd971d9487aae5f8ab1a41f436
# Parent  a30768258e0ee08c13d1a49a516c3eaab982751f
security/linux-pam: upgrade to 1.5.2

diff -r a30768258e0e -r c6d6f953044e security/linux-pam/linux-pam.sh
--- a/security/linux-pam/linux-pam.sh	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/linux-pam.sh	Thu Nov 11 07:21:01 2021 +0100
@@ -16,10 +16,11 @@
 #
 
 PKGNAME=linux-pam
-PKGVERSION=1.3.1
+PKGVERSION=1.5.2
 PKGREVISION=1
 PKGLICENSE="BSD"
 PKGSUMMARY="pluggable authentication modules"
+PKGWWW="http://www.linux-pam.org"
 PKGDOWNLOAD="https://github.com/linux-pam/linux-pam/releases/download/v$PKGVERSION/Linux-PAM-$PKGVERSION.tar.xz"
 PKGOPTIONS="NLS SELINUX"
 PKGPROTECT="etc/environment
@@ -61,17 +62,10 @@
 build()
 {
 	rm -rf Linux-PAM-$PKGVERSION
-	tar xvf Linux-PAM-$PKGVERSION.tar.xz
+	tar -xvf Linux-PAM-$PKGVERSION.tar.xz
 	cd Linux-PAM-$PKGVERSION
 
-	# https://git.alpinelinux.org/aports/tree/main/linux-pam/APKBUILD#n32
-	sed -i -e 's/pam_rhosts//g' modules/Makefile.am
-
-	# https://git.alpinelinux.org/aports/plain/main/linux-pam/musl-fix-pam_exec.patch
-	# https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch
-	patch -p0 < ../musl.patch
-
-	autoreconf -vif
+	#autoreconf -vif
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/linux-pam.sha1
--- a/security/linux-pam/linux-pam.sha1	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/linux-pam.sha1	Thu Nov 11 07:21:01 2021 +0100
@@ -1,1 +1,1 @@
-e89b6d279c9bf8cb495dfc0b3f3931eb50f818e9  Linux-PAM-1.3.1.tar.xz
+8d20308cbf17823e9b88b01c2c70df3e1ad9d654  Linux-PAM-1.5.2.tar.xz
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/musl.patch
--- a/security/linux-pam/musl.patch	Wed Nov 10 15:12:39 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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)
- 	    {
---- modules/pam_lastlog/pam_lastlog.c.orig
-+++ modules/pam_lastlog/pam_lastlog.c
-@@ -10,6 +10,7 @@
- 
- #include "config.h"
- 
-+#include <paths.h>
- #include <fcntl.h>
- #include <time.h>
- #include <errno.h>
-@@ -48,6 +49,10 @@
- 
- #ifndef _PATH_BTMP
- # define _PATH_BTMP "/var/log/btmp"
-+#endif
-+
-+#ifndef __GLIBC__
-+#define logwtmp(args...)
- #endif
- 
- /* XXX - time before ignoring lock. Is 1 sec enough? */
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/other
--- a/security/linux-pam/other	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/other	Thu Nov 11 07:21:01 2021 +0100
@@ -1,5 +1,5 @@
 #
-# /etc/pam.d/other -- PAM configuration for Vanilla Linux
+# /etc/pam.d/other -- PAM configuration for vanilla
 #
 
 auth            required        pam_warn.so
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/system-account
--- a/security/linux-pam/system-account	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/system-account	Thu Nov 11 07:21:01 2021 +0100
@@ -1,5 +1,5 @@
 #
-# /etc/pam.d/system-account -- PAM configuration for Vanilla Linux
+# /etc/pam.d/system-account -- PAM configuration for vanilla
 #
 
 account required pam_unix.so
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/system-auth
--- a/security/linux-pam/system-auth	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/system-auth	Thu Nov 11 07:21:01 2021 +0100
@@ -1,5 +1,5 @@
 #
-# /etc/pam.d/system-auth -- PAM configuration for Vanilla Linux
+# /etc/pam.d/system-auth -- PAM configuration for vanilla
 #
 
 auth required pam_unix.so
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/system-password
--- a/security/linux-pam/system-password	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/system-password	Thu Nov 11 07:21:01 2021 +0100
@@ -1,5 +1,5 @@
 #
-# /etc/pam.d/system-password -- PAM configuration for Vanilla Linux
+# /etc/pam.d/system-password -- PAM configuration for vanilla
 #
 
 password required pam_unix.so shadow try_first_pass
diff -r a30768258e0e -r c6d6f953044e security/linux-pam/system-session
--- a/security/linux-pam/system-session	Wed Nov 10 15:12:39 2021 +0100
+++ b/security/linux-pam/system-session	Thu Nov 11 07:21:01 2021 +0100
@@ -1,5 +1,5 @@
 #
-# /etc/pam.d/system-session -- PAM configuration for Vanilla Linux
+# /etc/pam.d/system-session -- PAM configuration for vanilla
 #
 
 session required pam_unix.so