From b30ac013f15cff7a727c658b0a87b8d838c19ac6 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Mon, 1 Jun 2009 10:43:27 +0000
Subject: [PATCH] * Mon Jun 1 2009 Dan Walsh <dwalsh@redhat.com> 2.0.63-4 - Fix
 Sandbox option handling - Fix fixfiles handling of btrfs

---
 policycoreutils-rhat.patch | 17 +++++++++--------
 policycoreutils.spec       |  6 +++++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index ab15fac..c88079e 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1234,7 +1234,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
      if len(newcats) > 25:
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.63/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.63/scripts/fixfiles	2009-05-22 13:40:04.000000000 -0400
++++ policycoreutils-2.0.63/scripts/fixfiles	2009-06-01 06:40:21.000000000 -0400
 @@ -89,7 +89,7 @@
                 fi; \
              done | \
@@ -1249,7 +1249,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
      if [ -x /usr/bin/find ]; then
  	/usr/bin/find "$FILEPATH" \
 -	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune  -o -print0 | \
-+	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o fstype btrfs \) -prune  -o -print0 | \
++	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o -fstype btrfs \) -prune  -o -print0 | \
  	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
      else
  	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
@@ -1272,8 +1272,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
  	-mkdir -p $(MANDIR)/man8
 diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.63/scripts/sandbox
 --- nsapolicycoreutils/scripts/sandbox	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.63/scripts/sandbox	2009-05-26 12:30:25.000000000 -0400
-@@ -0,0 +1,138 @@
++++ policycoreutils-2.0.63/scripts/sandbox	2009-06-01 06:40:12.000000000 -0400
+@@ -0,0 +1,139 @@
 +#!/usr/bin/python -E
 +import os, sys, getopt, socket, random, fcntl
 +import selinux
@@ -1374,10 +1374,11 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
 +                  if o == "-t" or o == "--type":
 +                         setype = a
 +                         
-+           if o == "-m" or o == "--mount":
-+                  mount_ind = True
-+           if o == "-h" or o == "--help":
-+                  usage(_("Usage"));
++                  if o == "-m" or o == "--mount":
++                         mount_ind = True
++
++                  if o == "-h" or o == "--help":
++                         usage(_("Usage"));
 +            
 +           if len(cmds) == 0:
 +                  usage(_("Command required"))
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 547c5b5..a88a25a 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.63
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -226,6 +226,10 @@ else
 fi
 
 %changelog
+* Mon Jun 1 2009 Dan Walsh <dwalsh@redhat.com> 2.0.63-4
+- Fix Sandbox option handling
+- Fix fixfiles handling of btrfs
+
 * Tue May 26 2009 Dan Walsh <dwalsh@redhat.com> 2.0.63-3
 - Fix sandbox to be able to execute files in homedir