fedora-cvs-commits@redhat.com
[Top] [All Lists]

rpms/policycoreutils/FC-4 .cvsignore, 1.55, 1.56 policycoreutils-fixfile

Subject: rpms/policycoreutils/FC-4 .cvsignore, 1.55, 1.56 policycoreutils-fixfiles.patch, 1.1, 1.2 policycoreutils.spec, 1.122, 1.123
From:
Date: Thu, 25 Aug 2005 11:12:32 -0400
Author: dwalsh

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

Modified Files:
        .cvsignore policycoreutils-fixfiles.patch policycoreutils.spec 
Log Message:
* Thu Aug 25 2005 Dan Walsh <dwalsh@xxxxxxxxxx> 1.23.11-3.2
- More fixes for fixfiles



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-4/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore  20 May 2005 17:22:30 -0000      1.55
+++ .cvsignore  25 Aug 2005 15:12:30 -0000      1.56
@@ -38,3 +38,4 @@
 policycoreutils-1.23.9.tgz
 policycoreutils-1.23.10.tgz
 policycoreutils-1.23.11.tgz
+policycoreutils-1.25.6.tgz

policycoreutils-fixfiles.patch:
 fixfiles |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: policycoreutils-fixfiles.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-4/policycoreutils-fixfiles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policycoreutils-fixfiles.patch      22 Aug 2005 18:20:31 -0000      1.1
+++ policycoreutils-fixfiles.patch      25 Aug 2005 15:12:30 -0000      1.2
@@ -1,6 +1,5 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles 
policycoreutils-1.25.5/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles        2005-05-20 13:15:12.000000000 
-0400
-+++ policycoreutils-1.25.5/scripts/fixfiles    2005-08-17 10:58:52.000000000 
-0400
+--- policycoreutils-1.23.11/scripts/fixfiles.fixfiles  2005-05-20 
13:19:40.000000000 -0400
++++ policycoreutils-1.23.11/scripts/fixfiles   2005-08-25 11:09:19.000000000 
-0400
 @@ -62,6 +62,7 @@
        TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
        test -z "$TEMPFILE" && exit
@@ -9,12 +8,23 @@
        sed -r -e 's,[[:blank:]].*,,g' \
                 -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \
               -e 's|([/[:alnum:]])\?|{\1,}|g' \
-@@ -80,7 +81,7 @@
+@@ -70,7 +71,9 @@
+              -e 's|\[.*|*|g' \
+                -e 's|\.\*.*|*|g' \
+                -e 's|\.\+.*|*|g' | \
+-      sort -d -u | \
++          # These two sorts need to be separate commands \
++      sort -u | \
++      sort -d | \
+         while read pattern ; \
+           do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \
+                   echo "$pattern"; \
+@@ -80,7 +83,7 @@
                 fi; \
              done | \
        while read pattern ; do find $pattern \( -fstype ext2 -o -fstype ext3 
-o -fstype jfs -o -fstype xfs \) -print; done 2> /dev/null | \
 -       ${RESTORECON} $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
-+       ${RESTORECON} $2 -v -f - 
++       ${RESTORECON} $2 -v -e /home -e /root -e /tmp -e /dev -f - 
        rm -f ${TEMPFILE}
  fi
  }


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-4/policycoreutils.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- policycoreutils.spec        22 Aug 2005 18:20:31 -0000      1.122
+++ policycoreutils.spec        25 Aug 2005 15:12:30 -0000      1.123
@@ -3,7 +3,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.23.11
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -86,7 +86,10 @@
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
-* Sat May 28 2005 Dan Walsh <dwalsh@xxxxxxxxxx> 1.23.11-3.1
+* Thu Aug 25 2005 Dan Walsh <dwalsh@xxxxxxxxxx> 1.23.11-3.2
+- More fixes for fixfiles
+
+* Mon Aug 22 2005 Dan Walsh <dwalsh@xxxxxxxxxx> 1.23.11-3.1
 - Change fixfiles to not process /home, /tmp ...
 
 * Sat May 28 2005 Dan Walsh <dwalsh@xxxxxxxxxx> 1.23.11-3

-- 
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits

<Prev in Thread] Current Thread [Next in Thread>
  • rpms/policycoreutils/FC-4 .cvsignore, 1.55, 1.56 policycoreutils-fixfiles.patch, 1.1, 1.2 policycoreutils.spec, 1.122, 1.123, fedora-cvs-commits <=