[PATCH] pam: Update to version 1.6.1

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3698 bytes --]

- Update from version 1.6.0 to 1.6.1
- Update of rootfile
- Removal of patch for as changes now incorporated in source tarball.
- Changelog
    1.6.1
	build: fail if specified configure options cannot be satisfied.
	pam_env: fixed --disable-econf --enable-vendordir support.
	pam_unix: do not warn if password aging is disabled.
	pam_unix: try to set uid to 0 before unix_chkpwd invocation.
	pam_unix: allow empty passwords with non-empty hashes.
	Multiple minor bug fixes, build fixes, portability fixes,
	 documentation improvements, and translation updates.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/common/pam                           |  4 ----
 lfs/pam                                               |  5 ++---
 ...pam:_fix_build_with_--enable-read-both-confs.patch | 11 -----------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch

diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam
index de5c5b466..c38cb9ea5 100644
--- a/config/rootfiles/common/pam
+++ b/config/rootfiles/common/pam
@@ -101,9 +101,7 @@ lib/security/pam_unix.so
 #lib/security/pam_wheel.so
 #lib/security/pam_xauth.la
 #lib/security/pam_xauth.so
-#lib/security/pwhistory_helper
 lib/security/unix_chkpwd
-lib/security/unix_update
 #usr/include/security
 #usr/include/security/_pam_compat.h
 #usr/include/security/_pam_macros.h
@@ -237,6 +235,4 @@ usr/lib/libpamc.so.0.82.1
 #usr/share/man/man8/pam_warn.8
 #usr/share/man/man8/pam_wheel.8
 #usr/share/man/man8/pam_xauth.8
-#usr/share/man/man8/pwhistory_helper.8
 #usr/share/man/man8/unix_chkpwd.8
-#usr/share/man/man8/unix_update.8
diff --git a/lfs/pam b/lfs/pam
index 5e315a027..8e5b6f602 100644
--- a/lfs/pam
+++ b/lfs/pam
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.0
+VER        = 1.6.1
 
 THISAPP    = Linux-PAM-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 8ad3ed2d58b48cf43d065f15669788c113eee2aa3fc86cf38565a0e4835b142564ff1af5bcd3377db08af77141d25b4e93752a387ff7eabc00b4a826aa9ea39d
+$(DL_FILE)_BLAKE2 = 649b4ff892fbd3eb90adcbd9ccc5b3f5df51bf1c79b9084c7a1613c432587b13b81761d1eb4f31ef12d58843d16af24a3c441d0b6f5d2f2a1db9c8da15a61e2f
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --libdir=/usr/lib \
 		--sbindir=/lib/security \
diff --git a/src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch b/src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch
deleted file mode 100644
index 1736c5f35..000000000
--- a/src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Linux-PAM-1.6.0/libpam/pam_handlers.c.orig	2024-01-17 11:29:36.000000000 +0100
-+++ Linux-PAM-1.6.0/libpam/pam_handlers.c	2024-01-22 16:02:45.546376172 +0100
-@@ -500,7 +500,7 @@
- 
- 		if (pamh->confdir == NULL
- 		    && (f = fopen(PAM_CONFIG,"r")) != NULL) {
--		    retval = _pam_parse_conf_file(pamh, f, NULL, PAM_T_ANY, 0, 1);
-+		    retval = _pam_parse_conf_file(pamh, f, NULL, PAM_T_ANY, 0, 0, 1);
- 		    fclose(f);
- 		} else
- #endif /* PAM_READ_BOTH_CONFS */
-- 
2.44.0