* Fri Jan 28 2005 Dan Walsh <dwalsh@redhat.com> 1.21.10-1

- More cleanup of fixfiles sed patch
- Upgrade to latest from NSA
	* Merged patch for open_init_pty from Manoj Srivastava.

.cvsignore

@@ -12,3 +12,4 @@ policycoreutils-1.21.4.tgz
 policycoreutils-1.21.5.tgz
 policycoreutils-1.21.7.tgz
 policycoreutils-1.21.9.tgz
+policycoreutils-1.21.10.tgz

policycoreutils-rhat.patch

@@ -1,25 +1,32 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.9/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2005-01-31 09:49:15.000000000 -0500
-+++ policycoreutils-1.21.9/scripts/fixfiles	2005-01-31 13:39:27.000000000 -0500
++++ policycoreutils-1.21.9/scripts/fixfiles	2005-02-01 14:06:56.000000000 -0500
-@@ -60,12 +60,20 @@
+@@ -60,12 +60,26 @@
  if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
  	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
  	test -z "$TEMPFILE" && exit
 -	/usr/bin/diff $PREFC $FC | egrep '^[<>]'|cut -c3-| grep ^/ | \
 -        sed -e 's,\\.*,*,g' -e 's,(.*,*,g' -e 's,\[.*,*,g' -e 's,\..*,*,g' \
 -            -e 's,[[:blank:]].*,,g' -e 's,\?.*,*,g' | sort -u | \
+-        while read pattern ; do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null ; then echo "$pattern"; case "$pattern" in *"*") echo "$pattern" |sed 's,\*$,,g'>> ${TEMPFILE};;  esac; fi; done | \
 +	/usr/bin/diff $PREFC $FC | grep '^[<>]'|cut -c3-| grep ^/ | \
-+	grep -v -e ^/root -e ^/home -e ^/tmp -e ^/var/tmp | \
++	sed -r -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \
-+	sed -r -e 's|\(([/?[:alnum:]]+)\)\?|{\1,}|g' \
++	       -e 's|([/[:alnum:]])\?|{\1,}|g' \
-+	       -e 's|([[:alnum:]])\?|{\1,}|g' \
++               -e 's|\?.*|*|g' \
-+	       -e 's,\(.*,*,g' -e 's,\[.*,*,g' \
++	       -e 's|\(.*|*|g' \
-+	       -e 's,[[:blank:]].*,,g' \
++	       -e 's|\[.*|*|g' \
-+               -e 's,\?.*,*,g' \
++               -e 's|\.\*|*|g' \
-+               -e 's,\.\*,*,g' \
++               -e 's|\.\+|*|g' \
-+	       -e 's,\(.*,*,g' \
-+	       -e 's,\[.*,*,g' | \
 +	sort -u | \
-         while read pattern ; do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null ; then echo "$pattern"; case "$pattern" in *"*") echo "$pattern" |sed 's,\*$,,g'>> ${TEMPFILE};;  esac; fi; done | \
++        while read pattern ; \
++	    do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \
++                  echo "$pattern"; \
++                  case "$pattern" in *"*") \
++	               echo "$pattern" | sed 's,\*$,,g' >> ${TEMPFILE};;  
++                  esac; \
++               fi; \
++            done | \
++	grep -v -e ^/root -e ^/home -e ^/tmp -e ^/var/tmp | \
  	while read pattern ; do find $pattern -maxdepth 0 -print; done 2> /dev/null | \
 -	${RESTORECON} $2 -v -f -R - 
 +	${RESTORECON} -R $2 -v -f - 

policycoreutils.spec

@@ -1,7 +1,7 @@
 #define LIBSELINUXVER 1.21.5
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.21.9
+Version: 1.21.10
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -81,6 +81,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Fri Jan 28 2005 Dan Walsh <dwalsh@redhat.com> 1.21.10-1
+- More cleanup of fixfiles sed patch
+- Upgrade to latest from NSA
+	* Merged patch for open_init_pty from Manoj Srivastava.
+
 * Fri Jan 28 2005 Dan Walsh <dwalsh@redhat.com> 1.21.9-1
 - More cleanup of sed patch
 - Upgrade to latest from NSA

sources

@@ -1 +1 @@
-cdab66d56c18037d49c508a021ee5334  policycoreutils-1.21.9.tgz
+6c55531633ac4377b0aba30e1d04702b  policycoreutils-1.21.10.tgz