diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam index e25fc9c26..de5c5b466 100644 --- a/config/rootfiles/common/pam +++ b/config/rootfiles/common/pam @@ -17,6 +17,8 @@ etc/security #lib/security/mkhomedir_helper #lib/security/pam_access.la lib/security/pam_access.so +#lib/security/pam_canonicalize_user.la +#lib/security/pam_canonicalize_user.so #lib/security/pam_debug.la #lib/security/pam_debug.so #lib/security/pam_deny.la @@ -193,6 +195,7 @@ usr/lib/libpamc.so.0.82.1 #usr/share/man/man8/mkhomedir_helper.8 #usr/share/man/man8/pam.8 #usr/share/man/man8/pam_access.8 +#usr/share/man/man8/pam_canonicalize_user.8 #usr/share/man/man8/pam_debug.8 #usr/share/man/man8/pam_deny.8 #usr/share/man/man8/pam_echo.8 diff --git a/lfs/pam b/lfs/pam index 020de981c..5e315a027 100644 --- a/lfs/pam +++ b/lfs/pam @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.5.3 +VER = 1.6.0 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 = 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb +$(DL_FILE)_BLAKE2 = 8ad3ed2d58b48cf43d065f15669788c113eee2aa3fc86cf38565a0e4835b142564ff1af5bcd3377db08af77141d25b4e93752a387ff7eabc00b4a826aa9ea39d install : $(TARGET) @@ -70,6 +70,7 @@ $(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 new file mode 100644 index 000000000..1736c5f35 --- /dev/null +++ b/src/patches/Linux-PAM-1.6.0-libpam:_fix_build_with_--enable-read-both-confs.patch @@ -0,0 +1,11 @@ +--- 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 */