From bbe6c682e17312c5711aa6a7708eb8f9811d6748 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Thu, 11 Apr 2024 22:41:15 +0200 Subject: [PATCH] automatic version update by autodist [release 1.6.1-1mamba;Wed Apr 10 2024] --- pam-0.77-pam_unix2.conf | 14 -------------- pam-system-auth | 2 +- pam-system-auth-noshell | 2 +- pam.spec | 29 ++++++++--------------------- 4 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 pam-0.77-pam_unix2.conf diff --git a/pam-0.77-pam_unix2.conf b/pam-0.77-pam_unix2.conf deleted file mode 100644 index 71c486a..0000000 --- a/pam-0.77-pam_unix2.conf +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru Linux-PAM-0.78.orig/pam_unix2-1.25/etc/pam_unix2.conf Linux-PAM-0.78/pam_unix2-1.25/etc/pam_unix2.conf ---- Linux-PAM-0.78.orig/pam_unix2-1.25/etc/pam_unix2.conf 2005-03-07 16:54:10.000000000 +0100 -+++ Linux-PAM-0.78/pam_unix2-1.25/etc/pam_unix2.conf 2005-03-07 16:54:58.000000000 +0100 -@@ -27,7 +27,7 @@ - # password: nullok blowfish crypt_rounds=8 - # session: none - # --auth: --account: --password: -+auth: use_ldap nullok -+account: use_ldap -+password: use_ldap nullok - session: none diff --git a/pam-system-auth b/pam-system-auth index 06f18da..a08cb9b 100644 --- a/pam-system-auth +++ b/pam-system-auth @@ -12,7 +12,7 @@ password required pam_pwquality.so retry=3 minlen=4 dcredit=2 ucredit=2 password sufficient pam_unix.so shadow md5 use_authtok password required pam_deny.so -session required pam_limits.so +session optional pam_limits.so session required pam_unix.so session required pam_mkhomedir.so session optional pam_loginuid.so diff --git a/pam-system-auth-noshell b/pam-system-auth-noshell index 287a52a..5e03349 100644 --- a/pam-system-auth-noshell +++ b/pam-system-auth-noshell @@ -9,7 +9,7 @@ password required pam_pwquality.so retry=3 minlen=4 dcredit=2 ucredit=2 password sufficient pam_unix.so shadow md5 use_authtok password required pam_deny.so -session required pam_limits.so +session optional pam_limits.so session required pam_unix.so session required pam_mkhomedir.so session optional pam_loginuid.so diff --git a/pam.spec b/pam.spec index 0d8ecde..1c1e6d0 100644 --- a/pam.spec +++ b/pam.spec @@ -9,7 +9,7 @@ %define unix2_ver 2.6 Name: pam -Version: 1.6.0 +Version: 1.6.1 Release: 1mamba Summary: Utilities for monitoring your system and processes on your system Group: System/Libraries @@ -18,7 +18,6 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/linux-pam/linux-pam Source: https://github.com/linux-pam/linux-pam.git/v%{version}/linux-pam-%{version}.tar.bz2 -#Source1: pam.conf Source2: pam_other Source3: pam-system-auth Source4: pam-module-stack.tar.bz2 @@ -26,11 +25,8 @@ Source5: pam-module-cracklib.tar.bz2 Source6: pam-modules-redhat.tar.bz2 Source7: pam-module-console.tar.bz2 Source8: pam-system-auth-noshell -Source9: ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-%{pwcheck_ver}.tar.bz2 -Source10: ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-%{unix2_ver}.tar.bz2 Source11: pam-group.conf Source12: macros.pam -Patch0: %{name}-0.77-pam_unix2.conf Patch1: %{name}-0.99.7.1-cracklib_module.patch Patch2: %{name}-1.1.3-limits.patch Patch3: pam-1.1.6-glibc-2.16.patch @@ -103,7 +99,7 @@ This package contains the documentation files in html, pdf and postscript format %debug_package %prep -%setup -q -a4 -a5 -a9 -a10 -n linux-pam-%{version} +%setup -q -a4 -a5 -n linux-pam-%{version} %patch 1 -p1 %patch 2 -p1 %patch 3 -p1 @@ -152,21 +148,6 @@ ln -s system-auth %{buildroot}%{_sysconfdir}/pam.d/password-auth install -D -m0644 %{SOURCE12} %{buildroot}%{_rpmmacrodir}/macros.pam -#install -d -m0755 %{buildroot}%{_prefix}/lib/pam.d - -#install -m 644 conf/pam.conf pam.conf-example -#install -m 644 modules/pam_env/pam_env.conf-example pam_env.conf-example - -#% makeinstall -C pam_pwcheck-%{pwcheck_ver} -#% makeinstall -C pam_unix2-%{unix2_ver} - -#sed -i "s|CRYPT=.*|CRYPT=md5|" %{buildroot}/etc/default/passwd - -#%find_lang pam_unix2 -#cat pam_unix2.lang > %{name}.lang -#%find_lang pam_pwcheck -#cat pam_pwcheck.lang >> %{name}.lang - %find_lang Linux-PAM %clean @@ -265,6 +246,12 @@ sed -i "s|pam_cracklib.so|pam_pwquality.so|" %{_sysconfdir}/pam.d/system-auth{,- %{_docdir}/Linux-PAM/* %changelog +* Wed Apr 10 2024 Automatic Build System 1.6.1-1mamba +- automatic version update by autodist + +* Sun Apr 07 2024 Silvan Calarco 1.6.0-2mamba +- pam-system-auth[-noshell]: set pam_limits optional to fix behaviour in docker container + * Thu Jan 18 2024 Automatic Build System 1.6.0-1mamba - automatic version update by autodist