diff --git a/package/base/shadow/pamd-default_config.patch b/package/base/shadow/pamd-default_config.patch index 097d67303..e3118c239 100644 --- a/package/base/shadow/pamd-default_config.patch +++ b/package/base/shadow/pamd-default_config.patch @@ -1,95 +1,30 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/shadow/pamd-default_config.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./etc/pam.d/login.orig 2004-12-23 19:20:50.124013792 +0100 -+++ ./etc/pam.d/login 2004-12-23 19:21:14.542301648 +0100 -@@ -1,6 +1,6 @@ +--- ./etc/pam.d/login.orig 2006-01-20 22:05:12.000000000 +0100 ++++ ./etc/pam.d/login 2006-01-20 22:14:56.000000000 +0100 +@@ -1,11 +1,11 @@ #%PAM-1.0 - # /etc/pam.d/login --auth required pam_securetty.so -+#auth required pam_securetty.so - auth required pam_unix.so - auth required pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root - auth required pam_shells.so -@@ -12,8 +12,7 @@ - account required pam_unix.so - password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 - password required pam_unix.so md5 shadow use_authtok --password required pam_make.so /var/db - session required pam_unix.so - session required pam_env.so - session required pam_limits.so change_uid --session optional pam_console.so -+#session optional pam_console.so ---- ./etc/pam.d/chage.orig 2004-12-23 19:21:21.602228376 +0100 -+++ ./etc/pam.d/chage 2004-12-23 19:21:27.754293120 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/chage - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/chpasswd.orig 2004-12-23 19:21:32.728536920 +0100 -+++ ./etc/pam.d/chpasswd 2004-12-23 19:21:36.665938344 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/chpasswd - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/groupadd.orig 2004-12-23 19:21:41.124260576 +0100 -+++ ./etc/pam.d/groupadd 2004-12-23 19:21:44.268782536 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/groupadd - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/groupdel.orig 2004-12-23 19:21:49.481990008 +0100 -+++ ./etc/pam.d/groupdel 2004-12-23 19:21:52.520528080 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/groupdel - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/groupmod.orig 2004-12-23 19:22:00.196361176 +0100 -+++ ./etc/pam.d/groupmod 2004-12-23 19:22:02.988936640 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/groupmod - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/newusers.orig 2004-12-23 19:22:11.764602536 +0100 -+++ ./etc/pam.d/newusers 2004-12-23 19:22:15.149088016 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/newusers - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/usermod.orig 2004-12-23 19:22:20.528270256 +0100 -+++ ./etc/pam.d/usermod 2004-12-23 19:22:23.536812888 +0100 -@@ -2,4 +2,3 @@ - # /etc/pam.d/usermod - auth sufficient pam_rootok.so - account required pam_permit.so --password required pam_make.so /var/db ---- ./etc/pam.d/passwd.orig 2005-12-27 21:06:57.000000000 +0100 -+++ ./etc/pam.d/passwd 2005-12-27 21:07:04.000000000 +0100 -@@ -1,3 +1,3 @@ - #%PAM-1.0 - # /etc/pam.d/passwd - sample PAM config file for the `passwd' service --password required pam_unix_passwd.so -+password required pam_unix.so +-auth required pam_securetty.so ++#auth required pam_securetty.so + auth include system-auth + account required pam_nologin.so + account include system-auth + password include system-auth +-session required pam_selinux.so close ++#session required pam_selinux.so close + session include system-auth + session required pam_loginuid.so +-session optional pam_console.so +-session required pam_selinux.so open ++#session optional pam_console.so ++#session required pam_selinux.so open +--- ./etc/pam.d/su.orig 2006-01-20 22:17:37.000000000 +0100 ++++ ./etc/pam.d/su 2006-01-20 22:17:46.000000000 +0100 +@@ -7,7 +7,7 @@ + auth include system-auth + account include system-auth + password include system-auth +-session required pam_selinux.so close ++#session required pam_selinux.so close + session include system-auth +-session required pam_selinux.so open multiple ++#session required pam_selinux.so open multiple + session optional pam_xauth.so diff --git a/package/base/shadow/pamd-userdel.patch b/package/base/shadow/pamd-userdel.patch index 8db0a6f65..311efa7c5 100644 --- a/package/base/shadow/pamd-userdel.patch +++ b/package/base/shadow/pamd-userdel.patch @@ -19,9 +19,10 @@ --- ./etc/pam.d/userdel.orig 2004-12-22 20:15:47.894472968 +0100 +++ ./etc/pam.d/userdel 2004-12-22 20:15:23.889122336 +0100 -@@ -0,0 +1,5 @@ +@@ -0,0 +1,6 @@ +#%PAM-1.0 +# /etc/pam.d/userdel +auth sufficient pam_rootok.so +auth required pam_unix.so -+account required pam_permit.so ++account required pam_permit.so ++password include system-auth diff --git a/package/base/shadow/shadow.desc b/package/base/shadow/shadow.desc index 73a13ade2..4d0540f64 100644 --- a/package/base/shadow/shadow.desc +++ b/package/base/shadow/shadow.desc @@ -37,8 +37,8 @@ [L] BSD [S] Stable -[V] 4.0.13 +[V] 4.0.14 [P] X -?-3-----9 179.200 -[D] 3897482874 shadow-4.0.13.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/ +[D] 1814445054 shadow-4.0.14.tar.bz2 ftp://ftp.pld.org.pl/software/shadow/