SPECS: pam.spec - rel 0.5 - strict R/BR on cracklib - added pam_ex...

[baggins]

Author: baggins                      Date: Sun Feb 11 13:04:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 0.5
- strict R/BR on cracklib
- added pam_exec failok patch
- R: /usr/bin/make instead of just make (pam_exec needs full path)
- finished triggerpostun
- package ready for testing

---- Files affected:
SPECS:
   pam.spec (1.256 -> 1.257) 

---- Diffs:

================================================================
Index: SPECS/pam.spec
diff -u SPECS/pam.spec:1.256 SPECS/pam.spec:1.257
--- SPECS/pam.spec:1.256	Thu Feb  8 11:37:40 2007
+++ SPECS/pam.spec	Sun Feb 11 14:04:51 2007
@@ -1,10 +1,4 @@
 # $Revision$, $Date$
-#
-# TODO:
-#	triggers:
-#		s/pam_make\.so \(.*\)/pam_exec.so make -C \1/g
-#		s/pam_homedir\.so/pam_mkhomedir.so/g
-#		/var/lock/console -> /var/run/console
 #		
 # Conditional build:
 %bcond_without	doc		# don't build documentation
@@ -27,7 +21,7 @@
 Summary(uk):	śÎÓÔŇŐÍĹÎÔ, ÝĎ ÚÁÂĹÚĐĹŢŐ¤ ÁŐÔĹÎÔÉĆŚËÁĂŚŔ ÄĚŃ ĐŇĎÇŇÁÍ
 Name:		pam
 Version:	0.99.7.1
-Release:	0.4
+Release:	0.5
 License:	GPL or BSD
 Group:		Base
 Source0:	http://ftp.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -60,12 +54,13 @@
 Patch15:	%{name}-unix-blowfish.patch
 Patch16:	%{name}-mkhomedir-new-features.patch
 Patch17:	%{name}-db-gdbm.patch
+Patch18:	%{name}-exec-failok.patch
 URL:		http://www.kernel.org/pub/linux/libs/pam/
 %{?with_audit:BuildRequires:	audit-libs-devel >= 1.0.8}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	cracklib-devel
+BuildRequires:	cracklib-devel >= 2.8.3
 # gdbm due to db pulling libpthread
 BuildRequires:	gdbm-devel >= 1.8.3-7
 BuildRequires:	flex
@@ -85,9 +80,7 @@
 %endif
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	awk
-Requires:	cracklib
-Requires:	cracklib-dicts
-Requires:	make
+Requires:	/usr/bin/make
 Provides:	pam-pld
 Obsoletes:	pamconfig
 Obsoletes:	pam_make
@@ -163,7 +156,9 @@
 Summary(pl):	Moduły i biblioteki PAM
 Group:		Libraries
 Conflicts:	pam < 0:0.80.1-2
-Requires(triggerpostun):	sed
+Requires(triggerpostun):	sed >= 4.0
+Requires:	cracklib >= 2.8.3
+Requires:	cracklib-dicts >= 2.8.3
 Requires:	gdbm >= 1.8.3-7
 Requires:	glibc >= 2.5-0.5
 %{?with_audit:Requires:	audit-libs >= 1.0.8}
@@ -251,6 +246,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %{__libtoolize}
@@ -367,21 +363,21 @@
 rm -rf $RPM_BUILD_ROOT
 
 %triggerpostun libs -- %{name}-libs < 0.99.7.1
-for f in /etc/pam.d/* ; do
+for f in `grep -l "\(pam_make\|pam_homedir\)" /etc/pam.d/*` ; do
 	case "$f" in
 	*rpmorig|*rpmnew|*rpmsave|*~|*.orig)
 		continue
 		;;
 	*)
-		echo cp -f "$f" "$f.rpmorig"
-		echo sed -e 's/pam_make\.so \(.*\)/pam_exec.so seteuid make -C \1/g' \
-		    -e 's/pam_homedir\.so/pam_mkhomedir.so/g' "$f.rpmorig" to "$f"
+		cp -f "$f" "$f.rpmorig"
+		sed -i -e 's/pam_make\.so \(.*\)/pam_exec.so failok seteuid \/usr\/bin\/make -C \1/g' \
+		       -e 's/pam_homedir\.so/pam_mkhomedir.so/g' "$f"
 		;;
 	esac
 done
 if [ -d /var/lock/console -a -d /var/run/console ]; then
-	echo cp -a /var/lock/console/* /var/run/console/
-	echo rm -rf /var/lock/console
+	cp -a /var/lock/console/* /var/run/console/
+	rm -rf /var/lock/console
 fi
 
 %post
@@ -527,6 +523,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.257  2007/02/11 13:04:51  baggins
+- rel 0.5
+- strict R/BR on cracklib
+- added pam_exec failok patch
+- R: /usr/bin/make instead of just make (pam_exec needs full path)
+- finished triggerpostun
+- package ready for testing
+
 Revision 1.256  2007/02/08 10:37:40  glen
 - unify
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.256&r2=1.257&f=u