rpms/policycoreutils/F-11 policycoreutils-rhat.patch, 1.418, 1.419 policycoreutils.spec, 1.606, 1.607
Daniel J Walsh
dwalsh at fedoraproject.org
Tue May 5 18:49:57 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18834
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Tue May 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.3
- Fix handling of .subs file
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils-rhat.patch,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -p -r1.418 -r1.419
--- policycoreutils-rhat.patch 5 May 2009 14:53:42 -0000 1.418
+++ policycoreutils-rhat.patch 5 May 2009 18:49:56 -0000 1.419
@@ -9,6 +9,107 @@ diff -up policycoreutils-2.0.62/audit2al
except OSError, e:
sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
sys.exit(1)
+diff -up /dev/null policycoreutils-2.0.62/debugfiles.list
+--- /dev/null 2009-05-04 15:46:32.150257971 -0400
++++ policycoreutils-2.0.62/debugfiles.list 2009-05-05 10:49:02.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 -up /dev/null policycoreutils-2.0.62/debuglinks.list
+--- /dev/null 2009-05-04 15:46:32.150257971 -0400
++++ policycoreutils-2.0.62/debuglinks.list 2009-05-05 10:49:02.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
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
@@ -292,7 +393,14 @@ diff -up policycoreutils-2.0.62/semanage
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
++++ policycoreutils-2.0.62/semanage/seobject.py 2009-05-05 14:46:35.000000000 -0400
+@@ -1,5 +1,5 @@
+ #! /usr/bin/python -E
+-# Copyright (C) 2005, 2006, 2007, 2008 Red Hat
++# Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat
+ # see file 'COPYING' for use and warranty information
+ #
+ # semanage is a tool for managing SELinux configuration files
@@ -21,16 +21,16 @@
#
#
@@ -866,7 +974,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not check if interface %s is defined") % interface)
if not exists:
-@@ -1393,6 +1452,45 @@ class interfaceRecords(semanageRecords):
+@@ -1393,6 +1452,48 @@ class interfaceRecords(semanageRecords):
class fcontextRecords(semanageRecords):
def __init__(self, store = ""):
semanageRecords.__init__(self, store)
@@ -889,7 +997,10 @@ diff -up policycoreutils-2.0.62/semanage
+ for src in self.equiv.keys():
+ fd.write("%s %s\n" % (src, self.equiv[src]))
+ fd.close()
-+ os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE])
++ try:
++ os.chmod(tmpfile, os.stat(subs_file)[stat.ST_MODE])
++ except:
++ pass
+ os.rename(tmpfile,subs_file)
+ self.equil_ind = False
+ semanageRecords.commit(self)
@@ -912,7 +1023,7 @@ diff -up policycoreutils-2.0.62/semanage
def createcon(self, target, seuser = "system_u"):
(rc, con) = semanage_context_create(self.sh)
-@@ -1429,23 +1527,23 @@ class fcontextRecords(semanageRecords):
+@@ -1429,23 +1530,23 @@ class fcontextRecords(semanageRecords):
if type == "":
raise ValueError(_("SELinux Type is required"))
@@ -940,7 +1051,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not create file context for %s") % target)
-@@ -1486,21 +1584,21 @@ class fcontextRecords(semanageRecords):
+@@ -1486,21 +1587,21 @@ class fcontextRecords(semanageRecords):
raise ValueError(_("Requires setype, serange or seuser"))
self.validate(target)
@@ -967,7 +1078,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not query file context for %s") % target)
-@@ -1550,7 +1648,7 @@ class fcontextRecords(semanageRecords):
+@@ -1550,7 +1651,7 @@ class fcontextRecords(semanageRecords):
target = semanage_fcontext_get_expr(fcontext)
ftype = semanage_fcontext_get_type(fcontext)
ftype_str = semanage_fcontext_get_type_str(ftype)
@@ -976,7 +1087,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not create a key for %s") % target)
-@@ -1558,19 +1656,26 @@ class fcontextRecords(semanageRecords):
+@@ -1558,19 +1659,26 @@ class fcontextRecords(semanageRecords):
if rc < 0:
raise ValueError(_("Could not delete the file context %s") % target)
semanage_fcontext_key_free(k)
@@ -1007,7 +1118,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not check if file context for %s is defined") % target)
if exists:
-@@ -1617,11 +1722,11 @@ class fcontextRecords(semanageRecords):
+@@ -1617,11 +1725,11 @@ class fcontextRecords(semanageRecords):
return ddict
def list(self, heading = 1, locallist = 0 ):
@@ -1021,7 +1132,7 @@ diff -up policycoreutils-2.0.62/semanage
for k in keys:
if fcon_dict[k]:
if is_mls_enabled:
-@@ -1630,11 +1735,17 @@ class fcontextRecords(semanageRecords):
+@@ -1630,11 +1738,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])
@@ -1040,7 +1151,7 @@ diff -up policycoreutils-2.0.62/semanage
self.dict["TRUE"] = 1
self.dict["FALSE"] = 0
self.dict["ON"] = 1
-@@ -1643,16 +1754,16 @@ class booleanRecords(semanageRecords):
+@@ -1643,16 +1757,16 @@ class booleanRecords(semanageRecords):
self.dict["0"] = 0
def __mod(self, name, value):
@@ -1060,7 +1171,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not query file context %s") % name)
-@@ -1670,7 +1781,7 @@ class booleanRecords(semanageRecords):
+@@ -1670,7 +1784,7 @@ class booleanRecords(semanageRecords):
semanage_bool_key_free(k)
semanage_bool_free(b)
@@ -1069,7 +1180,7 @@ diff -up policycoreutils-2.0.62/semanage
self.begin()
-@@ -1694,16 +1805,16 @@ class booleanRecords(semanageRecords):
+@@ -1694,16 +1808,16 @@ class booleanRecords(semanageRecords):
def __delete(self, name):
@@ -1089,7 +1200,7 @@ diff -up policycoreutils-2.0.62/semanage
if rc < 0:
raise ValueError(_("Could not check if boolean %s is defined") % name)
if not exists:
-@@ -1762,7 +1873,7 @@ class booleanRecords(semanageRecords):
+@@ -1762,7 +1876,7 @@ class booleanRecords(semanageRecords):
return _("unknown")
def list(self, heading = True, locallist = False, use_file = False):
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-11/policycoreutils.spec,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -p -r1.606 -r1.607
--- policycoreutils.spec 5 May 2009 14:53:43 -0000 1.606
+++ policycoreutils.spec 5 May 2009 18:49:57 -0000 1.607
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.62
-Release: 12.2%{?dist}
+Release: 12.3%{?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.3
+- Fix handling of .subs file
+
* Tue May 5 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-12.2
- Fix fixfiles to handle btrfs
More information about the scm-commits
mailing list