rpms/policycoreutils/FC-5 policycoreutils-rhat.patch, 1.172, 1.173 policycoreutils.spec, 1.245, 1.246
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun May 7 11:34:08 UTC 2006
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4863
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Sun May 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-5.fc5
- Bump to build in FC5
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/Makefile | 4
audit2allow/audit2allow | 572 +++-------------------
audit2allow/audit2allow.1 | 5
audit2allow/avc.py | 514 ++++++++++++++++++++
po/Makefile | 276 ++--------
po/POTFILES | 9
po/POTFILES.in | 6
po/af.po | 926 ++++++++++++++++++++++++++++++++++++
po/am.po | 926 ++++++++++++++++++++++++++++++++++++
po/ar.po | 926 ++++++++++++++++++++++++++++++++++++
po/be.po | 926 ++++++++++++++++++++++++++++++++++++
po/bg.po | 926 ++++++++++++++++++++++++++++++++++++
po/bn.po | 926 ++++++++++++++++++++++++++++++++++++
po/bn_IN.po | 962 ++++++++++++++++++++++++++++++++++++++
po/ca.po | 926 ++++++++++++++++++++++++++++++++++++
po/cs.po | 926 ++++++++++++++++++++++++++++++++++++
po/cy.po | 926 ++++++++++++++++++++++++++++++++++++
po/da.po | 849 ++++++++++++++++++++++++++++-----
po/de.po | 1080 +++++++++++++++++++++++++++++++++++--------
po/el.po | 926 ++++++++++++++++++++++++++++++++++++
po/en_GB.po | 926 ++++++++++++++++++++++++++++++++++++
po/es.po | 970 ++++++++++++++++++++++++++++++++------
po/et.po | 849 ++++++++++++++++++++++++++++-----
po/eu_ES.po | 926 ++++++++++++++++++++++++++++++++++++
po/fa.po | 926 ++++++++++++++++++++++++++++++++++++
po/fi.po | 926 ++++++++++++++++++++++++++++++++++++
po/fr.po | 849 ++++++++++++++++++++++++++++-----
po/gl.po | 849 ++++++++++++++++++++++++++++-----
po/gu.po | 938 +++++++++++++++++++++++++++++++++++++
po/he.po | 926 ++++++++++++++++++++++++++++++++++++
po/hi.po | 926 ++++++++++++++++++++++++++++++++++++
po/hr.po | 993 +++++++++++++++++++++++++++++++++++++++
po/hu.po | 926 ++++++++++++++++++++++++++++++++++++
po/hy.po | 926 ++++++++++++++++++++++++++++++++++++
po/id.po | 849 ++++++++++++++++++++++++++++-----
po/is.po | 926 ++++++++++++++++++++++++++++++++++++
po/it.po | 849 ++++++++++++++++++++++++++++-----
po/ja.po | 926 ++++++++++++++++++++++++++++++++++++
po/ka.po | 926 ++++++++++++++++++++++++++++++++++++
po/ko.po | 849 ++++++++++++++++++++++++++++-----
po/ku.po | 926 ++++++++++++++++++++++++++++++++++++
po/lo.po | 926 ++++++++++++++++++++++++++++++++++++
po/lt.po | 926 ++++++++++++++++++++++++++++++++++++
po/lv.po | 926 ++++++++++++++++++++++++++++++++++++
po/mk.po | 926 ++++++++++++++++++++++++++++++++++++
po/ml.po | 933 +++++++++++++++++++++++++++++++++++++
po/mr.po | 926 ++++++++++++++++++++++++++++++++++++
po/ms.po | 1010 ++++++++++++++++++++++++++++++++++++++++
po/my.po | 926 ++++++++++++++++++++++++++++++++++++
po/nb.po | 926 ++++++++++++++++++++++++++++++++++++
po/nl.po | 849 ++++++++++++++++++++++++++++-----
po/nn.po | 926 ++++++++++++++++++++++++++++++++++++
po/no.po | 926 ++++++++++++++++++++++++++++++++++++
po/nso.po | 926 ++++++++++++++++++++++++++++++++++++
po/or.po | 931 +++++++++++++++++++++++++++++++++++++
po/pa.po | 930 +++++++++++++++++++++++++++++++++++++
po/pl.po | 849 ++++++++++++++++++++++++++++-----
po/policycoreutils.pot | 852 ++++++++++++++++++++++++++++-----
po/pt.po | 932 +++++++++++++++++++++++++++++++++++++
po/pt_BR.po | 849 ++++++++++++++++++++++++++++-----
po/ro.po | 926 ++++++++++++++++++++++++++++++++++++
po/ru.po | 849 ++++++++++++++++++++++++++++-----
po/si.po | 926 ++++++++++++++++++++++++++++++++++++
po/sk.po | 926 ++++++++++++++++++++++++++++++++++++
po/sl.po | 926 ++++++++++++++++++++++++++++++++++++
po/sq.po | 926 ++++++++++++++++++++++++++++++++++++
po/sr.po | 926 ++++++++++++++++++++++++++++++++++++
po/sr at Latn.po | 926 ++++++++++++++++++++++++++++++++++++
po/sv.po | 851 ++++++++++++++++++++++++++++-----
po/ta.po | 928 ++++++++++++++++++++++++++++++++++++
po/th.po | 926 ++++++++++++++++++++++++++++++++++++
po/tr.po | 926 ++++++++++++++++++++++++++++++++++++
po/uk.po | 926 ++++++++++++++++++++++++++++++++++++
po/ur.po | 926 ++++++++++++++++++++++++++++++++++++
po/vi.po | 926 ++++++++++++++++++++++++++++++++++++
po/zh_CN.po | 926 ++++++++++++++++++++++++++++++++++++
po/zh_TW.po | 926 ++++++++++++++++++++++++++++++++++++
po/zu.po | 926 ++++++++++++++++++++++++++++++++++++
restorecond/restorecond.conf | 2
scripts/chcat | 261 +++++-----
scripts/genhomedircon | 141 ++---
secon/Makefile | 33 +
secon/secon.c | 487 +++++++++++++++++++
semanage/semanage | 23
semanage/seobject.py | 601 ++++++++++++-----------
setsebool/setsebool.8 | 2
87 files changed, 64807 insertions(+), 3302 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.172 -r 1.173 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- policycoreutils-rhat.patch 21 Apr 2006 11:38:28 -0000 1.172
+++ policycoreutils-rhat.patch 7 May 2006 11:33:35 -0000 1.173
@@ -1,7 +1,7 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.6/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2006-03-29 15:35:22.000000000 -0500
-+++ policycoreutils-1.30.6/audit2allow/audit2allow 2006-04-20 09:47:19.000000000 -0400
-@@ -24,431 +24,8 @@
++++ policycoreutils-1.30.6/audit2allow/audit2allow 2006-05-05 16:12:45.000000000 -0400
+@@ -24,442 +24,19 @@
# 02111-1307 USA
#
#
@@ -430,11 +430,25 @@
- else:
- rec += self.seRules[i].out(verbose)+"\n"
- return rec
-+import commands, sys, os, getopt, selinux
+from avc import *
if __name__ == '__main__':
+-
++ from rhpl.translate import _, N_
++ import commands, sys, os, getopt, selinux
+ def get_mls_flag():
+ if selinux.is_selinux_mls_enabled():
+ return "-M"
+ else:
+ return ""
+- def usage(msg=""):
+- print 'audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i <inputfile> ] [[-m|-M] <modulename> ] [-o <outputfile>]\n\
++ def usage(msg = ""):
++ print _('audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i <inputfile> ] [[-m|-M] <modulename> ] [-o <outputfile>]\n\
+ -a, --all read input from audit and message log, conflicts with -i\n\
+ -d, --dmesg read input from output of /bin/dmesg\n\
+ -h, --help display this message\n\
@@ -469,10 +46,11 @@
-M generate loadable module package, conflicts with -o\n\
-o, --output append output to <outputfile>, conflicts with -M\n\
@@ -445,19 +459,42 @@
-v, --verbose verbose output\n\
- '
+ -A, --analyze Analyze output\n\
-+ '
++ ')
if msg != "":
print msg
sys.exit(1)
-@@ -498,13 +76,15 @@
- input_ind=0
- output_ind=0
- ref_ind=False
+@@ -487,24 +65,26 @@
+ #
+ #
+ try:
+- last_reload=0
+- input=sys.stdin
+- output=sys.stdout
+- module=""
+- requires=0
+- verbose=0
+- auditlogs=0
+- buildPP=0
+- input_ind=0
+- output_ind=0
+- ref_ind=False
- te_ind=0
-+ analyze=False
-+ te_inputs=[]
++ last_reload = 0
++ inputfd = sys.stdin
++ output = sys.stdout
++ module = ""
++ requires = 0
++ verbose = 0
++ auditlogs = 0
++ buildPP = 0
++ input_ind = 0
++ output_ind = 0
++ ref_ind = False
++ analyze = False
++ te_inputs = []
- fc_file=""
+- fc_file=""
++ fc_file = ""
gopts, cmds = getopt.getopt(sys.argv[1:],
- 'adf:hi:lm:M:o:rtvR',
+ 'Aadf:hi:lm:M:o:rt:vR',
@@ -468,7 +505,7 @@
'fcfile=',
'help',
'input=',
-@@ -513,12 +93,12 @@
+@@ -513,57 +93,61 @@
'output=',
'requires',
'reference',
@@ -481,17 +518,55 @@
- if input_ind or te_ind:
+ if input_ind:
usage()
- input=open("/var/log/messages", "r")
- auditlogs=1
-@@ -547,13 +127,14 @@
- module=a
- outfile=a+".te"
- buildPP=1
+- input=open("/var/log/messages", "r")
+- auditlogs=1
++ inputfd = open("/var/log/messages", "r")
++ auditlogs = 1
+ if o == "-d" or o == "--dmesg":
+- input=os.popen("/bin/dmesg", "r")
++ inputfd = os.popen("/bin/dmesg", "r")
+ if o == "-f" or o == "--fcfile":
+- if a[0]=="-":
++ if a[0] == "-":
+ usage()
+- fc_file=a
++ fc_file = a
+ if o == "-h" or o == "--help":
+ usage()
+ if o == "-i"or o == "--input":
+- if auditlogs or a[0]=="-":
++ if auditlogs or a[0] == "-":
+ usage()
+- input_ind=1
+- input=open(a, "r")
++ input_ind = 1
++ inputfd = open(a, "r")
+ if o == '--lastreload' or o == "-l":
+- last_reload=1
++ last_reload = 1
+ if o == "-m" or o == "--module":
+- if module != "" or a[0]=="-":
++ if module != "" or a[0] == "-":
+ usage()
+- module=a
++ module = a
+ if o == "-M":
+- if module != "" or output_ind or a[0]=="-":
++ if module != "" or output_ind or a[0] == "-":
+ usage()
+- module=a
+- outfile=a+".te"
+- buildPP=1
+- output=open(outfile, "w")
++ module = a
++ outfile = a+".te"
++ buildPP = 1
+ if not os.path.exists("/usr/bin/checkmodule"):
+ errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package")
- output=open(outfile, "w")
++ output = open(outfile, "w")
if o == "-r" or o == "--requires":
- requires=1
+- requires=1
++ requires = 1
if o == "-t" or o == "--tefile":
- if auditlogs:
- usage()
@@ -499,52 +574,96 @@
+ te_inputs.append(open(a, "r"))
+
if o == "-R" or o == "--reference":
- ref_ind=True
+- ref_ind=True
++ ref_ind = True
-@@ -565,25 +146,38 @@
+ if o == "-o" or o == "--output":
+- if module != "" or a[0]=="-":
++ if module != "" or a[0] == "-":
+ usage()
+- output=open(a, "a")
+- output_ind=1
++ output = open(a, "a")
++ output_ind = 1
if o == "-v" or o == "--verbose":
- verbose=1
-
-+ if o == "-A" or o == "--analyze":
-+ analyze=True
+- verbose=1
++ verbose = 1
+
++ if o == "-A" or o == "--analyze":
++ analyze = True
+
if len(cmds) != 0:
usage()
-
[...71988 lines suppressed...]
+
+ rc = semanage_begin_transaction(self.sh)
+ if rc < 0:
+- raise ValueError("Could not start semanage transaction")
++ raise ValueError(_("Could not start semanage transaction"))
+
+ rc = semanage_fcontext_modify_local(self.sh, k, fcontext)
+ if rc < 0:
+- raise ValueError("Could not modify file context for %s" % target)
++ raise ValueError(_("Could not modify file context for %s") % target)
+
+ rc = semanage_commit(self.sh)
+ if rc < 0:
+- raise ValueError("Could not modify file context for %s" % target)
++ raise ValueError(_("Could not modify file context for %s") % target)
+
+ semanage_fcontext_key_free(k)
+ semanage_fcontext_free(fcontext)
+
+ def delete(self, target, ftype):
+- (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype])
++ (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ if rc < 0:
+- raise ValueError("Could not create a key for %s" % target)
++ raise ValueError(_("Could not create a key for %s") % target)
+
+ (rc,exists) = semanage_fcontext_exists(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not check if file context for %s is defined" % target)
++ raise ValueError(_("Could not check if file context for %s is defined") % target)
+ if not exists:
+- raise ValueError("File context for %s is not defined" % target)
++ raise ValueError(_("File context for %s is not defined") % target)
+
+ (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not check if file context for %s is defined" % target)
++ raise ValueError(_("Could not check if file context for %s is defined") % target)
+ if not exists:
+- raise ValueError("File context for %s is defined in policy, cannot be deleted" % target)
++ raise ValueError(_("File context for %s is defined in policy, cannot be deleted") % target)
+
+ rc = semanage_begin_transaction(self.sh)
+ if rc < 0:
+- raise ValueError("Could not start semanage transaction")
++ raise ValueError(_("Could not start semanage transaction"))
+
+ rc = semanage_fcontext_del_local(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not delete file context for %s" % target)
++ raise ValueError(_("Could not delete file context for %s") % target)
+
+ rc = semanage_commit(self.sh)
+ if rc < 0:
+- raise ValueError("Could not delete file context for %s" % target)
+-
++ raise ValueError(_("Could not delete file context for %s") % target)
++
+ semanage_fcontext_key_free(k)
+
+ def get_all(self):
+- ddict={}
++ ddict = {}
+ (rc, self.flist) = semanage_fcontext_list(self.sh)
+ if rc < 0:
+- raise ValueError("Could not list file contexts")
++ raise ValueError(_("Could not list file contexts"))
+
+ for fcontext in self.flist:
+ expr = semanage_fcontext_get_expr(fcontext)
+@@ -1147,11 +1162,11 @@
+
+ return ddict
+
+- def list(self, heading=1):
++ def list(self, heading = 1):
+ if heading:
+ print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context")
+- ddict=self.get_all()
+- keys=ddict.keys()
++ ddict = self.get_all()
++ keys = ddict.keys()
+ if is_mls_enabled:
+ for k in keys:
+ if ddict[k]:
+@@ -1171,37 +1186,37 @@
+
+ def modify(self, name, value = ""):
+ if value == "":
+- raise ValueError("Requires value")
++ raise ValueError(_("Requires value"))
+
+ (rc,k) = semanage_bool_key_create(self.sh, name)
+ if rc < 0:
+- raise ValueError("Could not create a key for %s" % name)
++ raise ValueError(_("Could not create a key for %s") % name)
+
+ (rc,exists) = semanage_bool_exists(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not check if boolean %s is defined" % name)
++ raise ValueError(_("Could not check if boolean %s is defined") % name)
+ if not exists:
+- raise ValueError("Boolean %s is not defined" % name)
++ raise ValueError(_("Boolean %s is not defined") % name)
+
+ (rc,b) = semanage_bool_query(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not query file context %s" % name)
++ raise ValueError(_("Could not query file context %s") % name)
+
+ if value != "":
+- nvalue = string.atoi(value)
++ nvalue = int(value)
+ semanage_bool_set_value(b, nvalue)
+
+ rc = semanage_begin_transaction(self.sh)
+ if rc < 0:
+- raise ValueError("Could not start semanage transaction")
++ raise ValueError(_("Could not start semanage transaction"))
+
+ rc = semanage_bool_modify_local(self.sh, k, b)
+ if rc < 0:
+- raise ValueError("Could not modify boolean %s" % name)
++ raise ValueError(_("Could not modify boolean %s") % name)
+
+ rc = semanage_commit(self.sh)
+ if rc < 0:
+- raise ValueError("Could not modify boolean %s" % name)
++ raise ValueError(_("Could not modify boolean %s") % name)
+
+ semanage_bool_key_free(k)
+ semanage_bool_free(b)
+@@ -1209,39 +1224,39 @@
+ def delete(self, name):
+ (rc,k) = semanage_bool_key_create(self.sh, name)
+ if rc < 0:
+- raise ValueError("Could not create a key for %s" % name)
++ raise ValueError(_("Could not create a key for %s") % name)
+
+ (rc,exists) = semanage_bool_exists(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not check if boolean %s is defined" % name)
++ raise ValueError(_("Could not check if boolean %s is defined") % name)
+ if not exists:
+- raise ValueError("Boolean %s is not defined" % name)
++ raise ValueError(_("Boolean %s is not defined") % name)
+
+ (rc,exists) = semanage_bool_exists_local(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not check if boolean %s is defined" % name)
++ raise ValueError(_("Could not check if boolean %s is defined") % name)
+ if not exists:
+- raise ValueError("Boolean %s is defined in policy, cannot be deleted" % name)
++ raise ValueError(_("Boolean %s is defined in policy, cannot be deleted") % name)
+
+ rc = semanage_begin_transaction(self.sh)
+ if rc < 0:
+- raise ValueError("Could not start semanage transaction")
++ raise ValueError(_("Could not start semanage transaction"))
+
+ rc = semanage_fcontext_del_local(self.sh, k)
+ if rc < 0:
+- raise ValueError("Could not delete boolean %s" % name)
++ raise ValueError(_("Could not delete boolean %s") % name)
+
+ rc = semanage_commit(self.sh)
+ if rc < 0:
+- raise ValueError("Could not delete boolean %s" % name)
++ raise ValueError(_("Could not delete boolean %s") % name)
+
+ semanage_bool_key_free(k)
+
+ def get_all(self):
+- ddict={}
++ ddict = {}
+ (rc, self.blist) = semanage_bool_list(self.sh)
+ if rc < 0:
+- raise ValueError("Could not list booleans")
++ raise ValueError(_("Could not list booleans"))
+
+ for boolean in self.blist:
+ name = semanage_bool_get_name(boolean)
+@@ -1250,11 +1265,11 @@
+
+ return ddict
+
+- def list(self, heading=1):
++ def list(self, heading = 1):
+ if heading:
+ print "%-50s %-18s\n" % ("SELinux boolean", "value")
+- ddict=self.get_all()
+- keys=ddict.keys()
++ ddict = self.get_all()
++ keys = ddict.keys()
+ for k in keys:
+ if ddict[k]:
+ print "%-50s %-18s " % (k[0], ddict[k][0])
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.6/setsebool/setsebool.8
--- nsapolicycoreutils/setsebool/setsebool.8 2005-11-04 15:37:49.000000000 -0500
+++ policycoreutils-1.30.6/setsebool/setsebool.8 2006-04-20 09:47:19.000000000 -0400
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- policycoreutils.spec 21 Apr 2006 11:38:29 -0000 1.245
+++ policycoreutils.spec 7 May 2006 11:33:52 -0000 1.246
@@ -5,7 +5,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.6
-Release: 3.fc5
+Release: 5.fc5
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -109,6 +109,16 @@
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
+* Sun May 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-5.fc5
+- Bump to build in FC5
+
+* Sun May 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-5
+- Fix genhomedircon to catch duplicate homedir problem
+
+* Thu May 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-4
+- Add secon program
+- Add translations
+
* Fri Apr 21 2006 Dan Walsh <dwalsh at redhat.com> 1.30.6-3.fc5
- Bump to build in FC5
More information about the fedora-cvs-commits
mailing list