rpms/pam/FC-4 pam.spec,1.80,1.81

[fedora-cvs-commits redhat com]

Author: tmraz

Update of /cvs/dist/rpms/pam/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6206

Modified Files:
	pam.spec 
Log Message:
* Tue Jul 19 2005 Tomas Mraz <tmraz redhat com> 0.79-9.2
- fixed module tests so the pam doesn't require itself to build (#163502)
- added buildprereq for building the documentation (#163503)
- pam_selinux module shouldn't fail on broken configs unless
  policy is set to enforcing (Dan Walsh)



Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-4/pam.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pam.spec	30 Jun 2005 12:17:19 -0000	1.80
+++ pam.spec	19 Jul 2005 09:07:57 -0000	1.81
@@ -12,7 +12,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.79
-Release: 9.1
+Release: 9.2
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 Patch34: pam-0.77-dbpam.patch
 Patch60: pam-0.78-selinux.patch
 Patch61: pam-pwdbselinux.patch
+Patch62: pam-0.80-selinux-nofail.patch
 Patch65: pam-0.77-audit.patch
 Patch70: pam-0.79-tally-null-data.patch
 Patch71: pam-0.79-unix-nis.patch
@@ -48,13 +49,17 @@
 BuildPrereq: cracklib-dicts >= 2.8
 BuildPrereq: perl, pkgconfig
 %if %{WITH_AUDIT}
-BuildPrereq: audit-libs-devel >= 0.9.7
-Requires: audit-libs >= 0.9.7
+BuildPrereq: audit-libs-devel >= 0.9.19
+Requires: audit-libs >= 0.9.19
 %endif
 %if %{WITH_SELINUX}
 BuildPrereq: libselinux-devel >= 1.17.1
 Requires: libselinux >= 1.17.1
 %endif
+# Following deps are necessary only to build the pam library documentation.
+# They can be safely removed if the documentation is not needed.
+BuildPrereq: ghostscript, linuxdoc-tools
+
 URL: http://www.us.kernel.org/pub/linux/libs/pam/index.html
 
 # We internalize libdb to get a non-threaded copy, but we should at least try
@@ -92,6 +97,7 @@
 %if %{WITH_SELINUX}
 %patch60 -p1 -b .selinux
 %patch61 -p1 -b .pwdbselinux 
+%patch62 -p1 -b .nofail
 %endif
 %if %{WITH_AUDIT}
 %patch65 -p1 -b .audit
@@ -177,15 +183,6 @@
 install -m 644 doc/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3/
 install -m 644 doc/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
-# Move static libraries and make new .so links -- this depends on the value
-# of _libdir not changing, and *not* being /usr/lib.
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-for lib in libpam libpamc libpam_misc ; do
-ln -sf ../../%{_lib}/${lib}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/${lib}.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/${lib}.so
-mv $RPM_BUILD_ROOT/%{_lib}/${lib}.a $RPM_BUILD_ROOT%{_libdir}/
-done
-
 # Make sure every module subdirectory gave us a module.  Yes, this is hackish.
 for dir in modules/pam_* ; do
 if [ -d ${dir} ] ; then
@@ -196,35 +193,47 @@
 fi
 done
 
-# Install the pwdb configuration file.
-install -m644 pwdb-%{pwdb_version}/conf/pwdb.conf $RPM_BUILD_ROOT%{_sysconfdir}/
-
-# Remove unwanted files from the buildroot.
-rm $RPM_BUILD_ROOT/%{_lib}/security/pam_radius.so
-rm -f doc/txts/README.pam_radius
-
-# Duplicate doc file sets.
-rm -fr $RPM_BUILD_ROOT/usr/doc/Linux-PAM $RPM_BUILD_ROOT/usr/share/doc/pam
-
-# Create /lib/security in case it isn't the same as /%{_lib}/security.
-install -m755 -d $RPM_BUILD_ROOT/lib/security
-
 # Check for module problems.  Specifically, check that every module we just
 # installed can actually be loaded by a minimal PAM-aware application.
+/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}
 for module in $RPM_BUILD_ROOT/%{_lib}/security/pam*.so ; do
-	if ! $RPM_SOURCE_DIR/dlopen.sh -lpam -ldl -L$RPM_BUILD_ROOT/%{_lib} ${module} ; then
+	if ! env LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib} \
+		 $RPM_SOURCE_DIR/dlopen.sh -ldl -lpam -L$RPM_BUILD_ROOT/%{_lib} ${module} ; then
 		echo ERROR module: ${module} cannot be loaded.
 		exit 1
 	fi
 # And for good measure, make sure that none of the modules pull in threading
 # libraries, which if loaded in a non-threaded application, can cause Very
 # Bad Things to happen.
-	if env LD_PRELOAD=$RPM_BUILD_ROOT/%{_libdir}/libpam.so ldd -r ${module} | fgrep -q libpthread ; then
+	if env LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_lib} \
+	       LD_PRELOAD=$RPM_BUILD_ROOT/%{_lib}/libpam.so ldd -r ${module} | fgrep -q libpthread ; then
 		echo ERROR module: ${module} pulls threading libraries.
 		exit 1
 	fi
 done
 
+# Move static libraries and make new .so links -- this depends on the value
+# of _libdir not changing, and *not* being /usr/lib.
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
+for lib in libpam libpamc libpam_misc ; do
+ln -sf ../../%{_lib}/${lib}.so.%{version} $RPM_BUILD_ROOT%{_libdir}/${lib}.so
+rm -f $RPM_BUILD_ROOT/%{_lib}/${lib}.so $RPM_BUILD_ROOT/%{_lib}/${lib}.so.?
+mv $RPM_BUILD_ROOT/%{_lib}/${lib}.a $RPM_BUILD_ROOT%{_libdir}/
+done
+
+# Install the pwdb configuration file.
+install -m644 pwdb-%{pwdb_version}/conf/pwdb.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+
+# Remove unwanted files from the buildroot.
+rm $RPM_BUILD_ROOT/%{_lib}/security/pam_radius.so
+rm -f doc/txts/README.pam_radius
+
+# Duplicate doc file sets.
+rm -fr $RPM_BUILD_ROOT/usr/doc/Linux-PAM $RPM_BUILD_ROOT/usr/share/doc/pam
+
+# Create /lib/security in case it isn't the same as /%{_lib}/security.
+install -m755 -d $RPM_BUILD_ROOT/lib/security
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -373,6 +382,12 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Tue Jul 19 2005 Tomas Mraz <tmraz redhat com> 0.79-9.2
+- fixed module tests so the pam doesn't require itself to build (#163502)
+- added buildprereq for building the documentation (#163503)
+- pam_selinux module shouldn't fail on broken configs unless
+  policy is set to enforcing (Dan Walsh)
+
 * Fri Jun 17 2005 Tomas Mraz <tmraz redhat com> 0.79-9.1
 - pam_loginuid shouldn't report error when /proc/self/loginuid
   is missing (#159974)
@@ -386,12 +401,6 @@
 - don't use the audit_fd as global static variable
 - don't unset the XAUTHORITY when target user is root
 
-* Fri May 20 2005 Tomas Mraz <tmraz redhat com> 0.79-9
-- update the pam audit patch to support newest audit library,
-  audit also pam_setcred calls (Steve Grubb)
-- don't use the audit_fd as global static variable
-- don't unset the XAUTHORITY when target user is root
-
 * Mon May  2 2005 Tomas Mraz <tmraz redhat com> 0.79-8
 - pam_console: support loading .perms files in the console.perms.d (#156069)