From 458a08c0d322496e289da28cc7d1ff62ef392a56 Mon Sep 17 00:00:00 2001 From: Alex Burmashev Date: Tue, 1 Jul 2014 16:47:12 +0400 Subject: [PATCH] sync to certified branch --- .abf.yml | 5 +++-- Linux-PAM-1.1.4.tar.bz2.sign | 8 -------- pam.spec | 6 +++--- system-auth.pamd | 8 ++++---- 4 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 Linux-PAM-1.1.4.tar.bz2.sign diff --git a/.abf.yml b/.abf.yml index 60eb8ed..f1c6eb0 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,4 @@ sources: - "Linux-PAM-1.1.4.tar.bz2": 4634b09f9e059f384ce69dbaa4a67f88bef5cf7b - "pam-redhat-0.99.10-1.tar.bz2": 09e618edc5dcda9a6eb435a31db742afca673ae1 + Linux-PAM-1.1.4.tar.bz2: 4634b09f9e059f384ce69dbaa4a67f88bef5cf7b + Linux-PAM-1.1.4.tar.bz2.sign: f8d2e1b7d8d15ed3bca5fe0f7b5171e4f1105f29 + pam-redhat-0.99.10-1.tar.bz2: 09e618edc5dcda9a6eb435a31db742afca673ae1 diff --git a/Linux-PAM-1.1.4.tar.bz2.sign b/Linux-PAM-1.1.4.tar.bz2.sign deleted file mode 100644 index ed4c6f2..0000000 --- a/Linux-PAM-1.1.4.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBOBHzAyGugalF9Dw4RAvUUAJ0SfOT7ITyalk4JsmIe5tJSdIB5ygCfZ2ku -aHp5ptRfKYgWdlnFv+3F7H4= -=kqy6 ------END PGP SIGNATURE----- diff --git a/pam.spec b/pam.spec index 399a6c9..70159dd 100644 --- a/pam.spec +++ b/pam.spec @@ -19,7 +19,7 @@ Epoch: 1 Summary: A security tool which provides authentication for applications Name: pam Version: 1.1.4 -Release: 9 +Release: 13 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+, License: BSD and GPLv2+ @@ -93,7 +93,7 @@ Requires: cracklib-dicts Requires: setup >= 2.7.12-2 Requires: pam_tcb >= 1.0.2-16 Requires(pre): rpm-helper -Requires(post): coreutils +Requires(post): coreutils >= 8.12-7.2 Requires(post): tcb >= 1.0.2-16 Conflicts: %{_lib}pam0 < 1.1.4-5 @@ -334,4 +334,4 @@ fi %changelog * Tue Feb 26 2013 Alexander Romanov -- Enabled selinux support +- Rosa initial commit diff --git a/system-auth.pamd b/system-auth.pamd index 7b15fd6..028e644 100644 --- a/system-auth.pamd +++ b/system-auth.pamd @@ -1,17 +1,17 @@ #%PAM-1.0 auth required pam_env.so -auth sufficient pam_tcb.so shadow nullok prefix=$2a$ count=8 +auth sufficient pam_unix.so try_first_pass nullok auth required pam_deny.so -account required pam_tcb.so shadow +account required pam_unix.so password required pam_cracklib.so try_first_pass retry=3 -password sufficient pam_tcb.so use_authtok shadow write_to=shadow nullok prefix=$2a$ count=8 +password sufficient pam_unix.so try_first_pass use_authtok shadow nullok md5 password required pam_deny.so session optional pam_keyinit.so revoke session required pam_limits.so session [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid -session required pam_tcb.so +session required pam_unix.so -session optional pam_systemd.so