* Fri Oct 6 2005 Dan Walsh <dwalsh@redhat.com> 1.27.5-2

- Update newrole pam file to remove pam-stack
This commit is contained in:
Daniel J Walsh 2005-10-07 14:19:10 +00:00
parent ab21aae5ca
commit 69c20bd956
2 changed files with 23 additions and 30 deletions

View File

@ -1,27 +1,15 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.27.2/scripts/fixfiles diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.pamd policycoreutils-1.27.5/newrole/newrole.pamd
--- nsapolicycoreutils/scripts/fixfiles 2005-09-20 21:21:07.000000000 -0400 --- nsapolicycoreutils/newrole/newrole.pamd 2005-09-12 16:33:29.000000000 -0400
+++ policycoreutils-1.27.2/scripts/fixfiles 2005-09-28 10:41:52.000000000 -0400 +++ policycoreutils-1.27.5/newrole/newrole.pamd 2005-10-07 10:03:34.000000000 -0400
@@ -62,8 +62,8 @@ @@ -1,6 +1,6 @@
TEMPFILE=`mktemp ${FC}.XXXXXXXXXX` #%PAM-1.0
test -z "$TEMPFILE" && exit -auth required /lib/security/$ISA/pam_stack.so service=system-auth
PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX` -account required /lib/security/$ISA/pam_stack.so service=system-auth
- sed -r -e 's,:s0[[:space:]], ,g' $PREFC > ${PREFCTEMPFILE} -password required /lib/security/$ISA/pam_stack.so service=system-auth
- sed -r -e 's,:s0[[:space:]], ,g' $FC | \ -session required /lib/security/$ISA/pam_stack.so service=system-auth
+ sed -r -e 's,:s0, ,g' $PREFC > ${PREFCTEMPFILE} -session optional /lib/security/$ISA/pam_xauth.so
+ sed -r -e 's,:s0, ,g' $FC | \ +auth include system-auth
/usr/bin/diff -b ${PREFCTEMPFILE} - | \ +account include system-auth
grep '^[<>]'|cut -c3-| grep ^/ | \ +password include system-auth
egrep -v '(^/home|^/root|^/tmp|^/dev)' |\ +session include system-auth
@@ -86,8 +86,10 @@ +session optional pam_xauth.so
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

View File

@ -1,13 +1,14 @@
%define libselinuxver 1.27.6-1 %define libselinuxver 1.27.7-1
%define libsepolver 1.9.10-1 %define libsepolver 1.9.12-1
%define libsemanagever 1.3.8-1 %define libsemanagever 1.3.8-1
Summary: SELinux policy core utilities. Summary: SELinux policy core utilities.
Name: policycoreutils Name: policycoreutils
Version: 1.27.5 Version: 1.27.5
Release: 1 Release: 2
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz 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} BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever}
@ -34,6 +35,7 @@ context.
p p
%prep %prep
%setup -q %setup -q
patch -p1 -b .rhat
%build %build
make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all
@ -86,6 +88,9 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/sestatus.conf %config(noreplace) %{_sysconfdir}/sestatus.conf
%changelog %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 * Thu Oct 6 2005 Dan Walsh <dwalsh@redhat.com> 1.27.5-1
- Update to match NSA - Update to match NSA
* Fixed warnings in load_policy. * Fixed warnings in load_policy.