shadow 4.1.5.1-2 support pam

4 files changed, 64 insertions, 20 deletions

diff --git a/shadow/.footprint.i686 b/shadow/.footprint.i686
index 26279055d..a6a06e874 100644
--- a/shadow/.footprint.i686
+++ b/shadow/.footprint.i686
@@ -3,9 +3,24 @@ drwxr-xr-x	root/root	bin/
 -rwsr-xr-x	root/root	bin/passwd
 -rwsr-xr-x	root/root	bin/su
 drwxr-xr-x	root/root	etc/
--rw-r--r--	root/root	etc/limits
--rw-r--r--	root/root	etc/login.access
 -rw-r--r--	root/root	etc/login.defs
+drwxr-xr-x	root/root	etc/pam.d/
+-rw-r--r--	root/root	etc/pam.d/chage
+-rw-r--r--	root/root	etc/pam.d/chfn
+-rw-r--r--	root/root	etc/pam.d/chgpasswd
+-rw-r--r--	root/root	etc/pam.d/chpasswd
+-rw-r--r--	root/root	etc/pam.d/chsh
+-rw-r--r--	root/root	etc/pam.d/groupadd
+-rw-r--r--	root/root	etc/pam.d/groupdel
+-rw-r--r--	root/root	etc/pam.d/groupmems
+-rw-r--r--	root/root	etc/pam.d/groupmod
+-rw-r--r--	root/root	etc/pam.d/login
+-rw-r--r--	root/root	etc/pam.d/newusers
+-rw-r--r--	root/root	etc/pam.d/passwd
+-rw-r--r--	root/root	etc/pam.d/su
+-rw-r--r--	root/root	etc/pam.d/useradd
+-rw-r--r--	root/root	etc/pam.d/userdel
+-rw-r--r--	root/root	etc/pam.d/usermod
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/nologin
 drwxr-xr-x	root/root	usr/
@@ -77,11 +92,8 @@ drwxr-xr-x	root/root	usr/share/man/fr/man3/
 drwxr-xr-x	root/root	usr/share/man/fr/man5/
 -rw-r--r--	root/root	usr/share/man/fr/man5/faillog.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/gshadow.5.gz
--rw-r--r--	root/root	usr/share/man/fr/man5/limits.5.gz
--rw-r--r--	root/root	usr/share/man/fr/man5/login.access.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/login.defs.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/passwd.5.gz
--rw-r--r--	root/root	usr/share/man/fr/man5/porttime.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/shadow.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/suauth.5.gz
 drwxr-xr-x	root/root	usr/share/man/fr/man8/
@@ -124,11 +136,8 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/faillog.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/gshadow.5.gz
--rw-r--r--	root/root	usr/share/man/man5/limits.5.gz
--rw-r--r--	root/root	usr/share/man/man5/login.access.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/login.defs.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/passwd.5.gz
--rw-r--r--	root/root	usr/share/man/man5/porttime.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/shadow.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/suauth.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
diff --git a/shadow/.footprint.x86_64 b/shadow/.footprint.x86_64
index 26279055d..a6a06e874 100644
--- a/shadow/.footprint.x86_64
+++ b/shadow/.footprint.x86_64
@@ -3,9 +3,24 @@ drwxr-xr-x	root/root	bin/
 -rwsr-xr-x	root/root	bin/passwd
 -rwsr-xr-x	root/root	bin/su
 drwxr-xr-x	root/root	etc/
--rw-r--r--	root/root	etc/limits
--rw-r--r--	root/root	etc/login.access
 -rw-r--r--	root/root	etc/login.defs
+drwxr-xr-x	root/root	etc/pam.d/
+-rw-r--r--	root/root	etc/pam.d/chage
+-rw-r--r--	root/root	etc/pam.d/chfn
+-rw-r--r--	root/root	etc/pam.d/chgpasswd
+-rw-r--r--	root/root	etc/pam.d/chpasswd
+-rw-r--r--	root/root	etc/pam.d/chsh
+-rw-r--r--	root/root	etc/pam.d/groupadd
+-rw-r--r--	root/root	etc/pam.d/groupdel
+-rw-r--r--	root/root	etc/pam.d/groupmems
+-rw-r--r--	root/root	etc/pam.d/groupmod
+-rw-r--r--	root/root	etc/pam.d/login
+-rw-r--r--	root/root	etc/pam.d/newusers
+-rw-r--r--	root/root	etc/pam.d/passwd
+-rw-r--r--	root/root	etc/pam.d/su
+-rw-r--r--	root/root	etc/pam.d/useradd
+-rw-r--r--	root/root	etc/pam.d/userdel
+-rw-r--r--	root/root	etc/pam.d/usermod
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/nologin
 drwxr-xr-x	root/root	usr/
@@ -77,11 +92,8 @@ drwxr-xr-x	root/root	usr/share/man/fr/man3/
 drwxr-xr-x	root/root	usr/share/man/fr/man5/
 -rw-r--r--	root/root	usr/share/man/fr/man5/faillog.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/gshadow.5.gz
--rw-r--r--	root/root	usr/share/man/fr/man5/limits.5.gz
--rw-r--r--	root/root	usr/share/man/fr/man5/login.access.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/login.defs.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/passwd.5.gz
--rw-r--r--	root/root	usr/share/man/fr/man5/porttime.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/shadow.5.gz
 -rw-r--r--	root/root	usr/share/man/fr/man5/suauth.5.gz
 drwxr-xr-x	root/root	usr/share/man/fr/man8/
@@ -124,11 +136,8 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/faillog.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/gshadow.5.gz
--rw-r--r--	root/root	usr/share/man/man5/limits.5.gz
--rw-r--r--	root/root	usr/share/man/man5/login.access.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/login.defs.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/passwd.5.gz
--rw-r--r--	root/root	usr/share/man/man5/porttime.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/shadow.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/suauth.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
diff --git a/shadow/Pkgfile b/shadow/Pkgfile
index 61ba71c78..a34282e82 100755
--- a/shadow/Pkgfile
+++ b/shadow/Pkgfile
@@ -2,12 +2,12 @@
 # URL: http://shadow.pld.org.pl/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on:linux-pam
-# Run on:linux-pam
+# Depends on: linux-pam, pambase
+# Run on: linux-pam,pambase
 
 name=shadow
 version=4.1.5.1
-release=1
+release=2
 source=(http://pkg-shadow.alioth.debian.org/releases/$name-$version.tar.bz2)
 
 build() {
@@ -22,13 +22,37 @@ build() {
 	sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
 	       -e 's@/var/spool/mail@/var/mail@' etc/login.defs
 
-	./configure --sysconfdir=/etc --without-libpam
+	./configure --sysconfdir=/etc \
+		--with-libpam \
+		--without-selinux
 	make
 	make DESTDIR=$PKG install
 	for i in de cs fi id hu ja it ko pl ru sv tr pt_BR zh_CN zh_TW
 		do rm -r $PKG/usr/share/man/$i
 	done
 
+	for FUNCTION in FAIL_DELAY FAILLOG_ENAB \
+		LASTLOG_ENAB \
+		MAIL_CHECK_ENAB \
+		OBSCURE_CHECKS_ENAB \
+		PORTTIME_CHECKS_ENAB \
+		QUOTAS_ENAB \
+		CONSOLE MOTD_FILE \
+		FTMP_FILE NOLOGINS_FILE \
+		ENV_HZ PASS_MIN_LEN \
+		SU_WHEEL_ONLY \
+		CRACKLIB_DICTPATH \
+		PASS_CHANGE_TRIES \
+		PASS_ALWAYS_WARN \
+		CHFN_AUTH ENCRYPT_METHOD \
+		ENVIRON_FILE
+	do
+		sed -i "s/^${FUNCTION}/# &/" $PKG/etc/login.defs
+	done
+
+	sed "/pam_selinux.so/d" -i $PKG/etc/pam.d/login
+	sed "/pam_selinux.so/d" -i $PKG/etc/pam.d/su
+
 	# Remove the default as it is part of aaabasicfs
 	rm -rf $PKG/etc/default
 	mkdir $PKG/usr/lib
diff --git a/shadow/post-install b/shadow/post-install
new file mode 100644
index 000000000..dea2ee71c
--- /dev/null
+++ b/shadow/post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/sbin/pwconv