rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.417, 1.418 policycoreutils.spec, 1.605, 1.606
Daniel J Walsh
dwalsh at fedoraproject.org
Tue May 5 14:53:44 UTC 2009
- Previous message: rpms/perl-Email-MIME-Encodings/devel .cvsignore, 1.5, 1.6 perl-Email-MIME-Encodings.spec, 1.9, 1.10 sources, 1.5, 1.6
- Next message: rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14715
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Tue May 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.2
- Fix fixfiles to handle btrfs
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -p -r1.417 -r1.418
--- policycoreutils-rhat.patch 24 Apr 2009 17:57:46 -0000 1.417
+++ policycoreutils-rhat.patch 5 May 2009 14:53:42 -0000 1.418
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.62/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow 2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.62/audit2allow/audit2allow 2009-04-24 13:18:45.000000000 -0400
-@@ -126,6 +126,7 @@
+diff -up policycoreutils-2.0.62/audit2allow/audit2allow.rhat policycoreutils-2.0.62/audit2allow/audit2allow
+--- policycoreutils-2.0.62/audit2allow/audit2allow.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/audit2allow/audit2allow 2009-05-05 10:49:02.000000000 -0400
+@@ -126,6 +126,7 @@ class AuditToPolicy:
elif self.__options.audit:
try:
messages = audit.get_audit_msgs()
@@ -9,120 +9,18 @@ diff --exclude-from=exclude --exclude=se
except OSError, e:
sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
sys.exit(1)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list
---- nsapolicycoreutils/debugfiles.list 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.62/debugfiles.list 2009-04-03 14:13:23.000000000 -0400
-@@ -0,0 +1,64 @@
-+%dir /usr/lib/debug
-+%dir /usr/lib/debug/sbin
-+%dir /usr/lib/debug/.build-id
-+%dir /usr/lib/debug/.build-id/3d
-+%dir /usr/lib/debug/.build-id/ec
-+%dir /usr/lib/debug/.build-id/9d
-+%dir /usr/lib/debug/.build-id/cb
-+%dir /usr/lib/debug/.build-id/bc
-+%dir /usr/lib/debug/.build-id/0a
-+%dir /usr/lib/debug/.build-id/81
-+%dir /usr/lib/debug/.build-id/ad
-+%dir /usr/lib/debug/.build-id/7f
-+%dir /usr/lib/debug/.build-id/f4
-+%dir /usr/lib/debug/.build-id/15
-+%dir /usr/lib/debug/.build-id/1d
-+%dir /usr/lib/debug/.build-id/a8
-+%dir /usr/lib/debug/.build-id/d3
-+%dir /usr/lib/debug/usr
-+%dir /usr/lib/debug/usr/sbin
-+%dir /usr/lib/debug/usr/bin
-+/usr/lib/debug/sbin/setfiles.debug
-+/usr/lib/debug/sbin/restorecon.debug
-+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug
-+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70
-+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab
-+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug
-+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug
-+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665
-+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce
-+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug
-+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865
-+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug
-+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug
-+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082
-+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug
-+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401
-+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug
-+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be
-+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug
-+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a
-+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug
-+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7
-+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug
-+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8
-+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug
-+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f
-+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b
-+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug
-+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9
-+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug
-+/usr/lib/debug/usr/sbin/load_policy.debug
-+/usr/lib/debug/usr/sbin/restorecond.debug
-+/usr/lib/debug/usr/sbin/semodule.debug
-+/usr/lib/debug/usr/sbin/sestatus.debug
-+/usr/lib/debug/usr/sbin/setsebool.debug
-+/usr/lib/debug/usr/sbin/open_init_pty.debug
-+/usr/lib/debug/usr/sbin/run_init.debug
-+/usr/lib/debug/usr/bin/semodule_package.debug
-+/usr/lib/debug/usr/bin/newrole.debug
-+/usr/lib/debug/usr/bin/semodule_link.debug
-+/usr/lib/debug/usr/bin/semodule_deps.debug
-+/usr/lib/debug/usr/bin/semodule_expand.debug
-+/usr/lib/debug/usr/bin/secon.debug
-+/usr/src/debug/policycoreutils-2.0.62
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debuglinks.list policycoreutils-2.0.62/debuglinks.list
---- nsapolicycoreutils/debuglinks.list 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.62/debuglinks.list 2009-04-03 14:13:23.000000000 -0400
-@@ -0,0 +1,29 @@
-+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 /sbin/setfiles
-+/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug /usr/lib/debug/sbin/setfiles.debug
-+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 /usr/sbin/open_init_pty
-+/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug /usr/lib/debug/usr/sbin/open_init_pty.debug
-+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 /usr/sbin/sestatus
-+/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug /usr/lib/debug/usr/sbin/sestatus.debug
-+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 /usr/sbin/semodule
-+/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug /usr/lib/debug/usr/sbin/semodule.debug
-+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 /usr/sbin/load_policy
-+/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug /usr/lib/debug/usr/sbin/load_policy.debug
-+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b /usr/sbin/run_init
-+/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug /usr/lib/debug/usr/sbin/run_init.debug
-+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a /usr/sbin/restorecond
-+/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug /usr/lib/debug/usr/sbin/restorecond.debug
-+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab /usr/sbin/setsebool
-+/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug /usr/lib/debug/usr/sbin/setsebool.debug
-+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 /usr/bin/secon
-+/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug /usr/lib/debug/usr/bin/secon.debug
-+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f /usr/bin/newrole
-+/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug /usr/lib/debug/usr/bin/newrole.debug
-+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 /usr/bin/semodule_link
-+/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug /usr/lib/debug/usr/bin/semodule_link.debug
-+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be /usr/bin/semodule_expand
-+/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug /usr/lib/debug/usr/bin/semodule_expand.debug
-+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce /usr/bin/semodule_package
-+/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug /usr/lib/debug/usr/bin/semodule_package.debug
-+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 /usr/bin/semodule_deps
-+/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug /usr/lib/debug/usr/bin/semodule_deps.debug
-+/usr/lib/debug/sbin/restorecon.debug /usr/lib/debug/sbin/setfiles.debug
-Binary files nsapolicycoreutils/debugsources.list and policycoreutils-2.0.62/debugsources.list differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile
---- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/Makefile 2009-04-03 14:12:56.000000000 -0400
+diff -up policycoreutils-2.0.62/Makefile.rhat policycoreutils-2.0.62/Makefile
+--- policycoreutils-2.0.62/Makefile.rhat 2009-02-18 16:45:00.000000000 -0500
++++ policycoreutils-2.0.62/Makefile 2009-05-05 10:49:02.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-04-03 14:12:56.000000000 -0400
+diff -up policycoreutils-2.0.62/restorecond/restorecond.conf.rhat policycoreutils-2.0.62/restorecond/restorecond.conf
+--- policycoreutils-2.0.62/restorecond/restorecond.conf.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-05-05 10:49:02.000000000 -0400
@@ -5,3 +5,7 @@
/var/run/utmp
/var/log/wtmp
@@ -131,10 +29,10 @@ diff --exclude-from=exclude --exclude=se
+/root/.ssh/*
+
+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.62/scripts/chcat
---- nsapolicycoreutils/scripts/chcat 2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/chcat 2009-04-09 12:28:34.000000000 -0400
-@@ -281,14 +281,14 @@
+diff -up policycoreutils-2.0.62/scripts/chcat.rhat policycoreutils-2.0.62/scripts/chcat
+--- policycoreutils-2.0.62/scripts/chcat.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/scripts/chcat 2009-05-05 10:49:02.000000000 -0400
+@@ -281,14 +281,14 @@ def isSensitivity(sensitivity):
def expandCats(cats):
newcats = []
for c in cats:
@@ -157,10 +55,19 @@ diff --exclude-from=exclude --exclude=se
if i not in newcats:
newcats.append(i)
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.62/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/fixfiles 2009-04-03 14:12:56.000000000 -0400
-@@ -122,7 +122,7 @@
+diff -up policycoreutils-2.0.62/scripts/fixfiles.rhat policycoreutils-2.0.62/scripts/fixfiles
+--- policycoreutils-2.0.62/scripts/fixfiles.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/scripts/fixfiles 2009-05-05 10:49:24.000000000 -0400
+@@ -89,7 +89,7 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ];
+ fi; \
+ done | \
+ while read pattern ; do sh -c "find $pattern \
+- ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune -o \
++ ! \( -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 \
+ \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print0"; \
+ done 2> /dev/null | \
+ ${RESTORECON} $* -0 -f -
+@@ -122,14 +122,14 @@ if [ ! -z "$PREFC" ]; then
fi
if [ ! -z "$RPMFILES" ]; then
for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
@@ -169,10 +76,30 @@ diff --exclude-from=exclude --exclude=se
done
exit $?
fi
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
---- nsapolicycoreutils/semanage/semanage 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/semanage 2009-04-16 14:46:41.000000000 -0400
-@@ -44,16 +44,17 @@
+ if [ ! -z "$FILEPATH" ]; then
+ 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 | \
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
+ else
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
+diff -up policycoreutils-2.0.62/semanage/semanage.8.rhat policycoreutils-2.0.62/semanage/semanage.8
+--- policycoreutils-2.0.62/semanage/semanage.8.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/semanage/semanage.8 2009-05-05 10:49:02.000000000 -0400
+@@ -21,6 +21,8 @@ semanage \- SELinux Policy Management to
+ .br
+ .B semanage permissive \-{a|d} type
+ .br
++.B semanage module \-{a|d} policy_package
++.br
+ .B semanage translation \-{a|d|m} [\-T] level
+ .P
+
+diff -up policycoreutils-2.0.62/semanage/semanage.rhat policycoreutils-2.0.62/semanage/semanage
+--- policycoreutils-2.0.62/semanage/semanage.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/semanage/semanage 2009-05-05 10:49:02.000000000 -0400
+@@ -44,16 +44,17 @@ if __name__ == '__main__':
text = _("""
semanage [ -S store ] -i [ input_file | - ]
@@ -193,7 +120,7 @@ diff --exclude-from=exclude --exclude=se
Primary Options:
-@@ -68,6 +69,7 @@
+@@ -68,6 +69,7 @@ Primary Options:
-h, --help Display this message
-n, --noheading Do not print heading when listing OBJECTS
-S, --store Select and alternate SELinux store to manage
@@ -201,7 +128,7 @@ diff --exclude-from=exclude --exclude=se
Object-specific Options (see above):
-@@ -84,6 +86,7 @@
+@@ -84,6 +86,7 @@ Object-specific Options (see above):
-F, --file Treat target as an input file for command, change multiple settings
-p, --proto Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
-M, --mask Netmask
@@ -209,7 +136,7 @@ diff --exclude-from=exclude --exclude=se
-P, --prefix Prefix for home directory labeling
-L, --level Default SELinux Level (MLS/MCS Systems only)
-R, --roles SELinux Roles (ex: "sysadm_r staff_r")
-@@ -115,11 +118,14 @@
+@@ -115,11 +118,14 @@ Object-specific Options (see above):
valid_option["node"] = []
valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
valid_option["fcontext"] = []
@@ -225,7 +152,7 @@ diff --exclude-from=exclude --exclude=se
valid_option["permissive"] = []
valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
return valid_option
-@@ -192,7 +198,10 @@
+@@ -192,7 +198,10 @@ Object-specific Options (see above):
locallist = False
use_file = False
store = ""
@@ -236,7 +163,7 @@ diff --exclude-from=exclude --exclude=se
object = argv[0]
option_dict=get_options()
if object not in option_dict.keys():
-@@ -201,10 +210,12 @@
+@@ -201,10 +210,12 @@ Object-specific Options (see above):
args = argv[1:]
gopts, cmds = getopt.getopt(args,
@@ -250,7 +177,7 @@ diff --exclude-from=exclude --exclude=se
'ftype=',
'file',
'help',
-@@ -241,16 +252,24 @@
+@@ -241,16 +252,24 @@ Object-specific Options (see above):
if modify or add:
raise ValueError(_("%s bad option") % o)
delete = True
@@ -276,7 +203,7 @@ diff --exclude-from=exclude --exclude=se
if o == "-h" or o == "--help":
raise ValueError(_("%s bad option") % o)
-@@ -323,6 +342,9 @@
+@@ -323,6 +342,9 @@ Object-specific Options (see above):
if object == "boolean":
OBJECT = seobject.booleanRecords(store)
@@ -286,7 +213,7 @@ diff --exclude-from=exclude --exclude=se
if object == "translation":
OBJECT = seobject.setransRecords()
-@@ -341,6 +363,13 @@
+@@ -341,6 +363,13 @@ Object-specific Options (see above):
OBJECT.deleteall()
return
@@ -300,7 +227,7 @@ diff --exclude-from=exclude --exclude=se
if len(cmds) != 1:
raise ValueError(_("%s bad option") % o)
-@@ -362,11 +391,17 @@
+@@ -362,11 +391,17 @@ Object-specific Options (see above):
if object == "interface":
OBJECT.add(target, serange, setype)
@@ -319,7 +246,7 @@ diff --exclude-from=exclude --exclude=se
if object == "permissive":
OBJECT.add(target)
-@@ -386,6 +421,9 @@
+@@ -386,6 +421,9 @@ Object-specific Options (see above):
rlist = roles.split()
OBJECT.modify(target, rlist, selevel, serange, prefix)
@@ -329,7 +256,7 @@ diff --exclude-from=exclude --exclude=se
if object == "port":
OBJECT.modify(target, proto, serange, setype)
-@@ -396,7 +434,10 @@
+@@ -396,7 +434,10 @@ Object-specific Options (see above):
OBJECT.modify(target, mask, proto, serange, setype)
if object == "fcontext":
@@ -341,7 +268,7 @@ diff --exclude-from=exclude --exclude=se
return
-@@ -405,7 +446,7 @@
+@@ -405,7 +446,7 @@ Object-specific Options (see above):
OBJECT.delete(target, proto)
elif object == "fcontext":
@@ -350,7 +277,7 @@ diff --exclude-from=exclude --exclude=se
elif object == "node":
OBJECT.delete(target, mask, proto)
-@@ -464,10 +505,10 @@
+@@ -464,10 +505,10 @@ Object-specific Options (see above):
else:
fd = open(input, 'r')
trans = seobject.semanageRecords(store)
@@ -363,21 +290,9 @@ diff --exclude-from=exclude --exclude=se
else:
process_args(sys.argv[1:])
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.62/semanage/semanage.8
---- nsapolicycoreutils/semanage/semanage.8 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/semanage/semanage.8 2009-04-16 13:51:38.000000000 -0400
-@@ -21,6 +21,8 @@
- .br
- .B semanage permissive \-{a|d} type
- .br
-+.B semanage module \-{a|d} policy_package
-+.br
- .B semanage translation \-{a|d|m} [\-T] level
- .P
-
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py 2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/seobject.py 2009-04-16 14:46:58.000000000 -0400
+diff -up policycoreutils-2.0.62/semanage/seobject.py.rhat policycoreutils-2.0.62/semanage/seobject.py
+--- policycoreutils-2.0.62/semanage/seobject.py.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/semanage/seobject.py 2009-05-05 10:49:02.000000000 -0400
@@ -21,16 +21,16 @@
#
#
@@ -398,7 +313,7 @@ diff --exclude-from=exclude --exclude=se
except IOError:
import __builtin__
__builtin__.__dict__['_'] = unicode
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ try:
self.audit_fd = audit.audit_open()
def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
@@ -407,7 +322,7 @@ diff --exclude-from=exclude --exclude=se
except:
class logger:
def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ except:
message = "Successful: "
else:
message = "Failed: "
@@ -416,7 +331,7 @@ diff --exclude-from=exclude --exclude=se
if sename != "":
message += " sename=" + sename
if old_sename != "":
-@@ -123,9 +123,9 @@
+@@ -123,9 +123,9 @@ mylog = logger()
import xml.etree.ElementTree
@@ -428,7 +343,7 @@ diff --exclude-from=exclude --exclude=se
for l in tree.findall("layer"):
for m in l.findall("module"):
for b in m.findall("tunable"):
-@@ -160,12 +160,12 @@
+@@ -160,12 +160,12 @@ def validate_level(raw):
cat_range = category + "(\." + category +")?"
categories = cat_range + "(\," + cat_range + ")*"
reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?"
@@ -444,7 +359,7 @@ diff --exclude-from=exclude --exclude=se
else:
context = raw
(rc, trans) = selinux.selinux_raw_to_trans_context(context)
-@@ -179,9 +179,9 @@
+@@ -179,9 +179,9 @@ def translate(raw, prepend = 1):
return trans
def untranslate(trans, prepend = 1):
@@ -456,7 +371,7 @@ diff --exclude-from=exclude --exclude=se
else:
context = trans
-@@ -234,7 +234,7 @@
+@@ -234,7 +234,7 @@ class setransRecords:
rec += "%s=%s\n" % (k, self.ddict[k])
return rec
@@ -465,7 +380,7 @@ diff --exclude-from=exclude --exclude=se
if heading:
print "\n%-25s %s\n" % (_("Level"), _("Translation"))
keys = self.ddict.keys()
-@@ -273,6 +273,7 @@
+@@ -273,6 +273,7 @@ class setransRecords:
(fd, newfilename) = tempfile.mkstemp('', self.filename)
os.write(fd, self.out())
os.close(fd)
@@ -473,7 +388,7 @@ diff --exclude-from=exclude --exclude=se
os.rename(newfilename, self.filename)
os.system("/sbin/service mcstrans reload > /dev/null")
-@@ -281,15 +282,20 @@
+@@ -281,15 +282,20 @@ class semanageRecords:
global handle
if handle != None:
@@ -497,7 +412,7 @@ diff --exclude-from=exclude --exclude=se
def begin(self):
if self.transaction:
return
-@@ -303,6 +309,55 @@
+@@ -303,6 +309,55 @@ class semanageRecords:
if rc < 0:
raise ValueError(_("Could not commit semanage transaction"))
@@ -553,7 +468,7 @@ diff --exclude-from=exclude --exclude=se
class permissiveRecords(semanageRecords):
def __init__(self, store):
semanageRecords.__init__(self, store)
-@@ -320,7 +375,7 @@
+@@ -320,7 +375,7 @@ class permissiveRecords(semanageRecords)
l.append(name.split("permissive_")[1])
return l
@@ -562,7 +477,7 @@ diff --exclude-from=exclude --exclude=se
if heading:
print "\n%-25s\n" % (_("Permissive Types"))
for t in self.get_all():
-@@ -328,6 +383,7 @@
+@@ -328,6 +383,7 @@ class permissiveRecords(semanageRecords)
def add(self, type):
@@ -570,7 +485,7 @@ diff --exclude-from=exclude --exclude=se
name = "permissive_%s" % type
dirname = "/var/lib/selinux"
os.chdir(dirname)
-@@ -341,7 +397,7 @@
+@@ -341,7 +397,7 @@ require {
permissive %s;
""" % (name, type, type)
@@ -579,7 +494,7 @@ diff --exclude-from=exclude --exclude=se
fd.write(modtxt)
fd.close()
mc = module.ModuleCompiler()
-@@ -351,16 +407,19 @@
+@@ -351,16 +407,19 @@ permissive %s;
fd.close()
rc = semanage_module_install(self.sh, data, len(data));
@@ -604,7 +519,7 @@ diff --exclude-from=exclude --exclude=se
def delete(self, name):
for n in name.split():
-@@ -390,11 +449,11 @@
+@@ -390,11 +449,11 @@ class loginRecords(semanageRecords):
if sename == "":
sename = "user_u"
@@ -618,7 +533,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if login mapping for %s is defined") % name)
if exists:
-@@ -410,7 +469,7 @@
+@@ -410,7 +469,7 @@ class loginRecords(semanageRecords):
except:
raise ValueError(_("Linux User %s does not exist") % name)
@@ -627,7 +542,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create login mapping for %s") % name)
-@@ -450,17 +509,17 @@
+@@ -450,17 +509,17 @@ class loginRecords(semanageRecords):
if sename == "" and serange == "":
raise ValueError(_("Requires seuser or serange"))
@@ -648,7 +563,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query seuser for %s") % name)
-@@ -483,7 +542,7 @@
+@@ -483,7 +542,7 @@ class loginRecords(semanageRecords):
semanage_seuser_key_free(k)
semanage_seuser_free(u)
@@ -657,7 +572,7 @@ diff --exclude-from=exclude --exclude=se
def modify(self, name, sename = "", serange = ""):
try:
-@@ -492,21 +551,21 @@
+@@ -492,21 +551,21 @@ class loginRecords(semanageRecords):
self.commit()
except ValueError, error:
@@ -683,7 +598,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if login mapping for %s is defined") % name)
if not exists:
-@@ -525,10 +584,10 @@
+@@ -525,10 +584,10 @@ class loginRecords(semanageRecords):
self.commit()
except ValueError, error:
@@ -696,7 +611,7 @@ diff --exclude-from=exclude --exclude=se
def get_all(self, locallist = 0):
ddict = {}
-@@ -578,17 +637,17 @@
+@@ -578,17 +637,17 @@ class seluserRecords(semanageRecords):
if len(roles) < 1:
raise ValueError(_("You must add at least one role for %s") % name)
@@ -717,7 +632,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create SELinux user for %s") % name)
-@@ -612,7 +671,7 @@
+@@ -612,7 +671,7 @@ class seluserRecords(semanageRecords):
rc = semanage_user_set_prefix(self.sh, u, prefix)
if rc < 0:
raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
@@ -726,7 +641,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not extract key for %s") % name)
-@@ -645,17 +704,17 @@
+@@ -645,17 +704,17 @@ class seluserRecords(semanageRecords):
else:
raise ValueError(_("Requires prefix or roles"))
@@ -747,7 +662,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query user for %s") % name)
-@@ -703,17 +762,17 @@
+@@ -703,17 +762,17 @@ class seluserRecords(semanageRecords):
raise error
def __delete(self, name):
@@ -768,7 +683,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if SELinux user %s is defined") % name)
if not exists:
-@@ -795,7 +854,7 @@
+@@ -795,7 +854,7 @@ class portRecords(semanageRecords):
low = int(ports[0])
high = int(ports[1])
@@ -777,7 +692,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
return ( k, proto_d, low, high )
-@@ -812,13 +871,13 @@
+@@ -812,13 +871,13 @@ class portRecords(semanageRecords):
( k, proto_d, low, high ) = self.__genkey(port, proto)
@@ -793,7 +708,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create port for %s/%s") % (proto, port))
-@@ -871,13 +930,13 @@
+@@ -871,13 +930,13 @@ class portRecords(semanageRecords):
( k, proto_d, low, high ) = self.__genkey(port, proto)
@@ -809,7 +724,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query port %s/%s") % (proto, port))
-@@ -926,13 +985,13 @@
+@@ -926,13 +985,13 @@ class portRecords(semanageRecords):
def __delete(self, port, proto):
( k, proto_d, low, high ) = self.__genkey(port, proto)
@@ -825,7 +740,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
if not exists:
-@@ -1038,17 +1097,17 @@
+@@ -1038,17 +1097,17 @@ class nodeRecords(semanageRecords):
if ctype == "":
raise ValueError(_("SELinux Type is required"))
@@ -846,7 +761,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create addr for %s") % addr)
-@@ -1113,17 +1172,17 @@
+@@ -1113,17 +1172,17 @@ class nodeRecords(semanageRecords):
if serange == "" and setype == "":
raise ValueError(_("Requires setype or serange"))
@@ -867,7 +782,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query addr %s") % addr)
-@@ -1160,17 +1219,17 @@
+@@ -1160,17 +1219,17 @@ class nodeRecords(semanageRecords):
else:
raise ValueError(_("Unknown or missing protocol"))
@@ -888,7 +803,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if addr %s is defined") % addr)
if not exists:
-@@ -1240,17 +1299,17 @@
+@@ -1240,17 +1299,17 @@ class interfaceRecords(semanageRecords):
if ctype == "":
raise ValueError(_("SELinux Type is required"))
@@ -909,7 +824,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create interface for %s") % interface)
-@@ -1301,17 +1360,17 @@
+@@ -1301,17 +1360,17 @@ class interfaceRecords(semanageRecords):
if serange == "" and setype == "":
raise ValueError(_("Requires setype or serange"))
@@ -930,7 +845,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query interface %s") % interface)
-@@ -1335,17 +1394,17 @@
+@@ -1335,17 +1394,17 @@ class interfaceRecords(semanageRecords):
self.commit()
def __delete(self, interface):
@@ -951,7 +866,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if interface %s is defined") % interface)
if not exists:
-@@ -1393,6 +1452,45 @@
+@@ -1393,6 +1452,45 @@ class interfaceRecords(semanageRecords):
class fcontextRecords(semanageRecords):
def __init__(self, store = ""):
semanageRecords.__init__(self, store)
@@ -997,7 +912,7 @@ diff --exclude-from=exclude --exclude=se
def createcon(self, target, seuser = "system_u"):
(rc, con) = semanage_context_create(self.sh)
-@@ -1429,23 +1527,23 @@
+@@ -1429,23 +1527,23 @@ class fcontextRecords(semanageRecords):
if type == "":
raise ValueError(_("SELinux Type is required"))
@@ -1025,7 +940,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create file context for %s") % target)
-@@ -1486,21 +1584,21 @@
+@@ -1486,21 +1584,21 @@ class fcontextRecords(semanageRecords):
raise ValueError(_("Requires setype, serange or seuser"))
self.validate(target)
@@ -1052,7 +967,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query file context for %s") % target)
-@@ -1550,7 +1648,7 @@
+@@ -1550,7 +1648,7 @@ class fcontextRecords(semanageRecords):
target = semanage_fcontext_get_expr(fcontext)
ftype = semanage_fcontext_get_type(fcontext)
ftype_str = semanage_fcontext_get_type_str(ftype)
@@ -1061,7 +976,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not create a key for %s") % target)
-@@ -1558,19 +1656,26 @@
+@@ -1558,19 +1656,26 @@ class fcontextRecords(semanageRecords):
if rc < 0:
raise ValueError(_("Could not delete the file context %s") % target)
semanage_fcontext_key_free(k)
@@ -1092,7 +1007,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if file context for %s is defined") % target)
if exists:
-@@ -1617,11 +1722,11 @@
+@@ -1617,11 +1722,11 @@ class fcontextRecords(semanageRecords):
return ddict
def list(self, heading = 1, locallist = 0 ):
@@ -1106,7 +1021,7 @@ diff --exclude-from=exclude --exclude=se
for k in keys:
if fcon_dict[k]:
if is_mls_enabled:
-@@ -1630,11 +1735,17 @@
+@@ -1630,11 +1735,17 @@ class fcontextRecords(semanageRecords):
print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
else:
print "%-50s %-18s <<None>>" % (k[0], k[1])
@@ -1125,7 +1040,7 @@ diff --exclude-from=exclude --exclude=se
self.dict["TRUE"] = 1
self.dict["FALSE"] = 0
self.dict["ON"] = 1
-@@ -1643,16 +1754,16 @@
+@@ -1643,16 +1754,16 @@ class booleanRecords(semanageRecords):
self.dict["0"] = 0
def __mod(self, name, value):
@@ -1145,7 +1060,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not query file context %s") % name)
-@@ -1670,7 +1781,7 @@
+@@ -1670,7 +1781,7 @@ class booleanRecords(semanageRecords):
semanage_bool_key_free(k)
semanage_bool_free(b)
@@ -1154,7 +1069,7 @@ diff --exclude-from=exclude --exclude=se
self.begin()
-@@ -1694,16 +1805,16 @@
+@@ -1694,16 +1805,16 @@ class booleanRecords(semanageRecords):
def __delete(self, name):
@@ -1174,7 +1089,7 @@ diff --exclude-from=exclude --exclude=se
if rc < 0:
raise ValueError(_("Could not check if boolean %s is defined") % name)
if not exists:
-@@ -1762,7 +1873,7 @@
+@@ -1762,7 +1873,7 @@ class booleanRecords(semanageRecords):
return _("unknown")
def list(self, heading = True, locallist = False, use_file = False):
@@ -1183,11 +1098,9 @@ diff --exclude-from=exclude --exclude=se
if use_file:
ddict = self.get_all(locallist)
keys = ddict.keys()
-Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.62/setfiles/restorecon differ
-Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.62/setfiles/setfiles differ
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.62/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-04-14 09:38:55.000000000 -0400
+diff -up policycoreutils-2.0.62/setfiles/setfiles.c.rhat policycoreutils-2.0.62/setfiles/setfiles.c
+--- policycoreutils-2.0.62/setfiles/setfiles.c.rhat 2009-02-18 16:45:01.000000000 -0500
++++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-05-05 10:49:02.000000000 -0400
@@ -29,6 +29,8 @@
static int mass_relabel;
static int mass_relabel_errs;
@@ -1197,7 +1110,7 @@ diff --exclude-from=exclude --exclude=se
static FILE *outfile = NULL;
static int force = 0;
#define STAT_BLOCK_SIZE 1
-@@ -444,11 +446,11 @@
+@@ -444,11 +446,11 @@ static int restore(const char *file)
if (progress) {
count++;
@@ -1211,7 +1124,7 @@ diff --exclude-from=exclude --exclude=se
fprintf(stdout, "*");
fflush(stdout);
}
-@@ -1017,7 +1019,7 @@
+@@ -1017,7 +1019,7 @@ int main(int argc, char **argv)
free(excludeArray[i].directory);
}
@@ -1220,4 +1133,3 @@ diff --exclude-from=exclude --exclude=se
printf("\n");
exit(errors);
}
-Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.62/setfiles/setfiles.o differ
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -p -r1.605 -r1.606
--- policycoreutils.spec 24 Apr 2009 17:57:47 -0000 1.605
+++ policycoreutils.spec 5 May 2009 14:53:43 -0000 1.606
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.62
-Release: 12.1%{?dist}
+Release: 12.2%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@ else
fi
%changelog
+* Tue May 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.2
+- Fix fixfiles to handle btrfs
+
* Fri Apr 24 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.1
- Fix audit2allow -a to read /var/log/messages
- Previous message: rpms/perl-Email-MIME-Encodings/devel .cvsignore, 1.5, 1.6 perl-Email-MIME-Encodings.spec, 1.9, 1.10 sources, 1.5, 1.6
- Next message: rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list