rpms/policycoreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Jun 1 2009 Dan Walsh <dwalsh@redhat.com> 2.0.63-4

Browse Source 
- Fix Sandbox option handling
- Fix fixfiles handling of btrfs
This commit is contained in:
Daniel J Walsh 2009-06-01 10:43:27 +00:00
parent 61c2d77e4e
commit b30ac013f1
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
policycoreutils-rhat.patch
View File

@ -1234,7 +1234,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
if len(newcats) > 25: 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 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 --- 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 @@ @@ -89,7 +89,7 @@
fi; \ fi; \
done | \ done | \
@ -1249,7 +1249,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
if [ -x /usr/bin/find ]; then if [ -x /usr/bin/find ]; then
/usr/bin/find "$FILEPATH" \ /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 \) -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 ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
else else
${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE ${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 -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 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 --- 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 +++ policycoreutils-2.0.63/scripts/sandbox 2009-06-01 06:40:12.000000000 -0400
@@ -0,0 +1,138 @@ @@ -0,0 +1,139 @@
+#!/usr/bin/python -E +#!/usr/bin/python -E
+import os, sys, getopt, socket, random, fcntl +import os, sys, getopt, socket, random, fcntl
+import selinux +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": + if o == "-t" or o == "--type":
+ setype = a + setype = a
+ +
+ if o == "-m" or o == "--mount": + if o == "-m" or o == "--mount":
+ mount_ind = True + mount_ind = True
+ if o == "-h" or o == "--help": +
+ usage(_("Usage")); + if o == "-h" or o == "--help":
+ usage(_("Usage"));
+ +
+ if len(cmds) == 0: + if len(cmds) == 0:
+ usage(_("Command required")) + usage(_("Command required"))

6
policycoreutils.spec
View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.63 Version: 2.0.63
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
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
@ -226,6 +226,10 @@ else
fi fi
%changelog %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 * Tue May 26 2009 Dan Walsh <dwalsh@redhat.com> 2.0.63-3
- Fix sandbox to be able to execute files in homedir - Fix sandbox to be able to execute files in homedir