From 69c20bd95623cb23f6370e2573c9b29517a8bd75 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Fri, 7 Oct 2005 14:19:10 +0000
Subject: [PATCH] * Fri Oct 6 2005 Dan Walsh <dwalsh@redhat.com> 1.27.5-2 -
 Update newrole pam file to remove pam-stack

---
 policycoreutils-rhat.patch | 42 ++++++++++++++------------------------
 policycoreutils.spec       | 11 +++++++---
 2 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 034a980..b058c3a 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,27 +1,15 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.27.2/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2005-09-20 21:21:07.000000000 -0400
-+++ policycoreutils-1.27.2/scripts/fixfiles	2005-09-28 10:41:52.000000000 -0400
-@@ -62,8 +62,8 @@
- 	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
- 	test -z "$TEMPFILE" && exit
- 	PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX`
--	sed -r -e 's,:s0[[:space:]], ,g' $PREFC > ${PREFCTEMPFILE}
--	sed -r -e 's,:s0[[:space:]], ,g' $FC | \
-+	sed -r -e 's,:s0, ,g' $PREFC > ${PREFCTEMPFILE}
-+	sed -r -e 's,:s0, ,g' $FC | \
- 	/usr/bin/diff -b ${PREFCTEMPFILE} - | \
- 	    grep '^[<>]'|cut -c3-| grep ^/ | \
- 	    egrep -v '(^/home|^/root|^/tmp|^/dev)' |\
-@@ -86,8 +86,10 @@
-                   esac; \
-                fi; \
-             done | \
--	while read pattern ; do find $pattern \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -print; done 2> /dev/null | \
--	    egrep -v '(^/home|^/root|^/tmp|^/dev)' |\
-+	while read pattern ; do find $pattern \
-+		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o \
-+		      \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
-+		      done 2> /dev/null | \
- 	 ${RESTORECON} $2 -v -f - 
- 	rm -f ${TEMPFILE} ${PREFCTEMPFILE}
- fi
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.pamd policycoreutils-1.27.5/newrole/newrole.pamd
+--- nsapolicycoreutils/newrole/newrole.pamd	2005-09-12 16:33:29.000000000 -0400
++++ policycoreutils-1.27.5/newrole/newrole.pamd	2005-10-07 10:03:34.000000000 -0400
+@@ -1,6 +1,6 @@
+ #%PAM-1.0
+-auth       required	/lib/security/$ISA/pam_stack.so service=system-auth
+-account    required	/lib/security/$ISA/pam_stack.so service=system-auth
+-password   required	/lib/security/$ISA/pam_stack.so service=system-auth
+-session    required	/lib/security/$ISA/pam_stack.so service=system-auth
+-session    optional	/lib/security/$ISA/pam_xauth.so
++auth       include	system-auth
++account    include	system-auth
++password   include	system-auth
++session    include	system-auth
++session    optional	pam_xauth.so
diff --git a/policycoreutils.spec b/policycoreutils.spec
index d8c5781..6a3b139 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,13 +1,14 @@
-%define libselinuxver 1.27.6-1
-%define libsepolver 1.9.10-1
+%define libselinuxver 1.27.7-1
+%define libsepolver 1.9.12-1
 %define libsemanagever 1.3.8-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.27.5
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Patch: policycoreutils-rhat.patch
 
 BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever}
 
@@ -34,6 +35,7 @@ context.
 p
 %prep
 %setup -q
+patch -p1 -b .rhat
 
 %build
 make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -86,6 +88,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Fri Oct 6 2005 Dan Walsh <dwalsh@redhat.com> 1.27.5-2
+- Update newrole pam file to remove pam-stack
+
 * Thu Oct 6 2005 Dan Walsh <dwalsh@redhat.com> 1.27.5-1
 - Update to match NSA
 	* Fixed warnings in load_policy.