rpms/policycoreutils/devel .cvsignore, 1.109, 1.110 policycoreutils-rhat.patch, 1.192, 1.193 policycoreutils.spec, 1.266, 1.267 sources, 1.113, 1.114
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon May 15 14:06:30 UTC 2006
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.711, 1.712 workspace.vcl59.patch, 1.1, 1.2 openoffice.org-2.0.3.ooo65304.sn.vcl.patch, 1.1, NONE
- Next message (by thread): rpms/dhcp/devel dhcp-3.0.4-libdhcp4client.patch, NONE, 1.1 libdhcp4client.Makefile, NONE, 1.1 libdhcp4client.pc, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2291
Modified Files:
.cvsignore policycoreutils-rhat.patch policycoreutils.spec
sources
Log Message:
* Mon May 15 2006 Dan Walsh <dwalsh at redhat.com> 1.30.9-1
- Update to upstream
* Fixed audit2allow and po Makefiles for DESTDIR= builds.
* Merged .po file patch from Dan Walsh.
* Merged bug fix for genhomedircon.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- .cvsignore 8 May 2006 15:24:36 -0000 1.109
+++ .cvsignore 15 May 2006 14:06:13 -0000 1.110
@@ -1,3 +1,4 @@
+.svn
policycoreutils-1.17.5.tgz
policycoreutils-1.17.6.tgz
policycoreutils-1.17.7.tgz
@@ -100,3 +101,4 @@
policycoreutils-1.30.6.tgz
policycoreutils-1.30.7.tgz
policycoreutils-1.30.8.tgz
+policycoreutils-1.30.9.tgz
policycoreutils-rhat.patch:
audit2allow/Makefile | 1
audit2allow/avc.py | 45 +++
po/af.po | 23 -
po/am.po | 23 -
po/ar.po | 23 -
po/be.po | 23 -
po/bg.po | 23 -
po/bn.po | 23 -
po/bn_IN.po | 55 ++--
po/ca.po | 140 ++++++-----
po/cs.po | 23 -
po/cy.po | 23 -
po/da.po | 21 -
po/de.po | 25 --
po/el.po | 23 -
po/en_GB.po | 23 -
po/es.po | 576 ++++++++++++++++++++++++++-----------------------
po/et.po | 21 -
po/eu_ES.po | 23 -
po/fa.po | 23 -
po/fi.po | 23 -
po/fr.po | 21 -
po/gl.po | 21 -
po/gu.po | 53 ++--
po/he.po | 23 -
po/hi.po | 429 +++++++++++++++++-------------------
po/hr.po | 244 ++++++++++++--------
po/hu.po | 23 -
po/hy.po | 23 -
po/id.po | 21 -
po/is.po | 23 -
po/it.po | 74 ++----
po/ja.po | 23 -
po/ka.po | 23 -
po/ko.po | 194 +++++++++-------
po/ku.po | 23 -
po/lo.po | 23 -
po/lt.po | 23 -
po/lv.po | 23 -
po/mk.po | 23 -
po/ml.po | 24 --
po/mr.po | 23 -
po/ms.po | 25 --
po/my.po | 23 -
po/nb.po | 23 -
po/nl.po | 21 -
po/nn.po | 23 -
po/no.po | 23 -
po/nso.po | 23 -
po/or.po | 50 +---
po/pa.po | 23 -
po/pl.po | 414 +++++++++++++++++++----------------
po/policycoreutils.pot | 23 -
po/pt.po | 23 -
po/pt_BR.po | 21 -
po/ro.po | 23 -
po/ru.po | 120 +++++-----
po/si.po | 23 -
po/sk.po | 23 -
po/sl.po | 23 -
po/sq.po | 23 -
po/sr.po | 23 -
po/sr at Latn.po | 23 -
po/sv.po | 21 -
po/ta.po | 395 +++++++++++++++------------------
po/th.po | 23 -
po/tr.po | 23 -
po/uk.po | 23 -
po/ur.po | 23 -
po/vi.po | 23 -
po/zh_CN.po | 23 -
po/zh_TW.po | 23 -
po/zu.po | 23 -
scripts/genhomedircon | 22 +
semanage/seobject.py | 2
75 files changed, 2067 insertions(+), 2093 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.192 -r 1.193 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- policycoreutils-rhat.patch 10 May 2006 19:16:20 -0000 1.192
+++ policycoreutils-rhat.patch 15 May 2006 14:06:13 -0000 1.193
@@ -1,65 +1,139 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.8/audit2allow/avc.py
+--- nsapolicycoreutils/audit2allow/avc.py 2006-05-15 09:42:57.000000000 -0400
++++ policycoreutils-1.30.8/audit2allow/avc.py 2006-05-13 09:46:09.000000000 -0400
+@@ -331,6 +331,7 @@
+ self.gen_ref_policy = False
+ self.verbose = verbose
+ self.AVCS = []
++ self.INVALID_SIDS = {}
+
+ def initialize(self):
+ self.seRules = {}
+@@ -348,7 +349,11 @@
+ if i == "avc:" or i == "message=avc:" or i == "msg='avc:":
+ found = 1
+ else:
+- dict.append(i)
++ if i == "security_compute_sid:":
++ self.security_compute_sid(rec)
++ found = 1
++ else:
++ dict.append(i)
+ if found:
+ self.translate(dict)
+ found = 0
+@@ -359,9 +364,6 @@
+ def translate(self,dict):
+ AVC = {}
+ AVC["access"] = []
+- if "security_compute_sid" in dict:
+- return
+-
+ if "load_policy" in dict and self.last_reload:
+ self.initialize()
+
+@@ -384,13 +386,31 @@
+ for i in ("scontext", "tcontext", "tclass"):
+ if i not in AVC.keys():
+ return
+-
++ if len(AVC["access"]) == 0:
++ return
++
+ except IndexError, e:
+ warning("Bad AVC Line: %s" % avc)
+ return
+
+ self.add_allow(AVC)
+
++ def security_compute_sid(self, rec):
++ dict={}
++ for i in rec:
++ t = i.split('=')
++ if len(t) < 2:
++ continue
++ dict[t[0]]=t[1]
++ try:
++ r = context(dict["scontext"]).role
++ t = context(dict["tcontext"]).type
++ self.add_type(t)
++ self.add_role(r)
++ self.INVALID_SIDS[(r,t)]=rec
++ except:
++ return
++
+ def add_avc(self, AVC):
+ for a in self.AVCS:
+ if a["tclass"] == AVC["tclass"] and a["access"] == AVC["access"] and a["tcontext"] == AVC["tcontext"] and a["scontext"] == AVC["scontext"] and a["comm"] == AVC["comm"] and a["name"] == AVC["name"]:
+@@ -468,7 +488,8 @@
+ keys = self.classes.keys()
+ keys.sort()
+ rec = "\n\nrequire {\n"
+- for i in keys:
++ if not self.gen_ref_policy:
++ for i in keys:
+ access = self.classes[i]
+ if len(access) > 1:
+ access.sort()
+@@ -479,10 +500,13 @@
+ else:
+ rec += "\tclass %s %s;\n" % (i, access[0])
+
+- rec += "\n"
+-
+ for i in self.types:
+ rec += "\ttype %s; \n" % i
++
++ if not self.gen_ref_policy:
++ for i in self.roles:
++ rec += "\trole %s; \n" % i
++
+ rec += "};\n\n"
+ return rec
+
+@@ -494,7 +518,7 @@
+
+ def out(self, require = 0, module = ""):
+ rec = ""
+- if len(self.seRules.keys()) == 0:
++ if len(self.seRules.keys()) == 0 and len(self.INVALID_SIDS) == 0:
+ raise(ValueError("No AVC messages found."))
+ if module != "":
+ rec += self.gen_module(module)
+@@ -503,6 +527,9 @@
+ if require:
+ rec+=self.gen_requires()
+
++ for i in self.INVALID_SIDS.keys():
++ rec += "role %s types %s;\n" % i
++
+ keys = self.seRules.keys()
+ keys.sort()
+ for i in keys:
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.8/audit2allow/Makefile
+--- nsapolicycoreutils/audit2allow/Makefile 2006-05-15 09:42:57.000000000 -0400
++++ policycoreutils-1.30.8/audit2allow/Makefile 2006-05-08 11:02:47.000000000 -0400
+@@ -1,7 +1,6 @@
+ # Installation directories.
+ PREFIX ?= ${DESTDIR}/usr
+ BINDIR ?= $(PREFIX)/bin
+-LIBDIR ?= $(PREFIX)/lib
+ MANDIR ?= $(PREFIX)/share/man
+ LOCALEDIR ?= /usr/share/locale
+ PYLIBVER ?= python2.4
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.8/po/af.po
---- nsapolicycoreutils/po/af.po 2006-05-08 10:33:18.000000000 -0400
-+++ policycoreutils-1.30.8/po/af.po 2006-05-10 15:14:40.000000000 -0400
-@@ -8,12 +8,12 @@
+--- nsapolicycoreutils/po/af.po 2006-05-15 09:43:12.000000000 -0400
++++ policycoreutils-1.30.8/po/af.po 2006-05-13 09:45:23.000000000 -0400
+@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-02 20:34-0400\n"
+-"POT-Creation-Date: 2006-05-08 11:22-0400\n"
+"POT-Creation-Date: 2006-05-10 08:32-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=CHARSET\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-
- #: ../load_policy/load_policy.c:22
-@@ -355,6 +355,42 @@
- msgid "chcat -l +CompanyConfidential juser"
- msgstr ""
-
-+#: ../semanage/semanage:122
-+msgid "Requires 2 or more arguments"
-+msgstr ""
-+
-+#: ../semanage/semanage:127
-+#, c-format
-+msgid "%s not defined"
-+msgstr ""
-+
-+#: ../semanage/semanage:151
-+#, c-format
-+msgid "%s not valid for %s objects\n"
-+msgstr ""
-+
-+#: ../semanage/semanage:178 ../semanage/semanage:186
-+msgid "range not supported on Non MLS machines"
-+msgstr ""
-+
-+#: ../semanage/semanage:244
-+msgid "You must specify a role"
-+msgstr ""
-+
-+#: ../semanage/semanage:246
-+msgid "You must specify a prefix"
-+msgstr ""
-+
-+#: ../semanage/semanage:295
-+#, c-format
-+msgid "Options Error %s "
-+msgstr ""
-+
-+#: ../semanage/semanage:299
-+#, c-format
-+msgid "Invalid value %s"
-+msgstr ""
-+
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
- msgstr ""
-@@ -441,14 +477,15 @@
+@@ -477,14 +477,15 @@
msgid "Could not set SELinux user for %s"
[...17696 lines suppressed...]
++++ policycoreutils-1.30.8/po/zh_TW.po 2006-05-13 09:45:23.000000000 -0400
+@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-02 20:34-0400\n"
+-"POT-Creation-Date: 2006-05-08 11:22-0400\n"
+"POT-Creation-Date: 2006-05-10 08:32-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=CHARSET\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-
- #: ../load_policy/load_policy.c:22
-@@ -355,6 +355,42 @@
- msgid "chcat -l +CompanyConfidential juser"
- msgstr ""
-
-+#: ../semanage/semanage:122
-+msgid "Requires 2 or more arguments"
-+msgstr ""
-+
-+#: ../semanage/semanage:127
-+#, c-format
-+msgid "%s not defined"
-+msgstr ""
-+
-+#: ../semanage/semanage:151
-+#, c-format
-+msgid "%s not valid for %s objects\n"
-+msgstr ""
-+
-+#: ../semanage/semanage:178 ../semanage/semanage:186
-+msgid "range not supported on Non MLS machines"
-+msgstr ""
-+
-+#: ../semanage/semanage:244
-+msgid "You must specify a role"
-+msgstr ""
-+
-+#: ../semanage/semanage:246
-+msgid "You must specify a prefix"
-+msgstr ""
-+
-+#: ../semanage/semanage:295
-+#, c-format
-+msgid "Options Error %s "
-+msgstr ""
-+
-+#: ../semanage/semanage:299
-+#, c-format
-+msgid "Invalid value %s"
-+msgstr ""
-+
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
- msgstr ""
-@@ -441,14 +477,15 @@
+@@ -477,14 +477,15 @@
msgid "Could not set SELinux user for %s"
msgstr ""
@@ -14415,7 +9491,7 @@
msgid "Could not start semanage transaction"
msgstr ""
-@@ -471,10 +508,6 @@
+@@ -507,10 +508,6 @@
msgid "Could not query seuser for %s"
msgstr ""
@@ -14427,67 +9503,18 @@
#, python-format
msgid "Could not modify login mapping for %s"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.30.8/po/zu.po
---- nsapolicycoreutils/po/zu.po 2006-05-08 10:33:18.000000000 -0400
-+++ policycoreutils-1.30.8/po/zu.po 2006-05-10 15:14:40.000000000 -0400
-@@ -8,12 +8,12 @@
+--- nsapolicycoreutils/po/zu.po 2006-05-15 09:43:12.000000000 -0400
++++ policycoreutils-1.30.8/po/zu.po 2006-05-13 09:45:23.000000000 -0400
+@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-02 20:34-0400\n"
+-"POT-Creation-Date: 2006-05-08 11:22-0400\n"
+"POT-Creation-Date: 2006-05-10 08:32-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=CHARSET\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-
- #: ../load_policy/load_policy.c:22
-@@ -355,6 +355,42 @@
- msgid "chcat -l +CompanyConfidential juser"
- msgstr ""
-
-+#: ../semanage/semanage:122
-+msgid "Requires 2 or more arguments"
-+msgstr ""
-+
-+#: ../semanage/semanage:127
-+#, c-format
-+msgid "%s not defined"
-+msgstr ""
-+
-+#: ../semanage/semanage:151
-+#, c-format
-+msgid "%s not valid for %s objects\n"
-+msgstr ""
-+
-+#: ../semanage/semanage:178 ../semanage/semanage:186
-+msgid "range not supported on Non MLS machines"
-+msgstr ""
-+
-+#: ../semanage/semanage:244
-+msgid "You must specify a role"
-+msgstr ""
-+
-+#: ../semanage/semanage:246
-+msgid "You must specify a prefix"
-+msgstr ""
-+
-+#: ../semanage/semanage:295
-+#, c-format
-+msgid "Options Error %s "
-+msgstr ""
-+
-+#: ../semanage/semanage:299
-+#, c-format
-+msgid "Invalid value %s"
-+msgstr ""
-+
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
- msgstr ""
-@@ -441,14 +477,15 @@
+@@ -477,14 +477,15 @@
msgid "Could not set SELinux user for %s"
msgstr ""
@@ -14511,7 +9538,7 @@
msgid "Could not start semanage transaction"
msgstr ""
-@@ -471,10 +508,6 @@
+@@ -507,10 +508,6 @@
msgid "Could not query seuser for %s"
msgstr ""
@@ -14523,13 +9550,12 @@
#, python-format
msgid "Could not modify login mapping for %s"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.8/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon 2006-05-08 11:01:21.000000000 -0400
+--- nsapolicycoreutils/scripts/genhomedircon 2006-05-15 09:42:56.000000000 -0400
+++ policycoreutils-1.30.8/scripts/genhomedircon 2006-05-10 15:11:42.000000000 -0400
-@@ -283,16 +283,20 @@
- fd = open(self.getFileContextFile())
+@@ -284,15 +284,19 @@
for i in fd.read().split('\n'):
if len(i) == 0:
-- return
+ continue
- regex = i.split()[0]
- #match a trailing .+
- regex = re.sub("\.+$", "", regex)
@@ -14539,7 +9565,6 @@
- regex = regex + "/*$"
- if re.search(home, regex, 0):
- return 1
-+ continue
+ try:
+ regex = i.split()[0]
+ #match a trailing .+
@@ -14556,17 +9581,8 @@
return 0
def getHomeDirs(self):
-@@ -309,7 +313,7 @@
- homedir = u[5][:string.rfind(u[5], "/")]
- if not homedir in homedirs:
- if self.checkExists(homedir) == 1:
-- warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context." % (u[0], u[5], self.getFileContextFile(), sys.argv[0]))
-+ warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context. This usually indicates an incorrectly defined system account. If it is a system account please make sure its login shell is /sbin/nologin." % (u[0], u[5], self.getFileContextFile(), sys.argv[0]))
- else:
- homedirs.append(homedir)
-
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.8/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py 2006-05-08 11:01:22.000000000 -0400
+--- nsapolicycoreutils/semanage/seobject.py 2006-05-15 09:42:56.000000000 -0400
+++ policycoreutils-1.30.8/semanage/seobject.py 2006-05-10 15:11:42.000000000 -0400
@@ -318,7 +318,7 @@
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- policycoreutils.spec 10 May 2006 18:46:34 -0000 1.266
+++ policycoreutils.spec 15 May 2006 14:06:16 -0000 1.267
@@ -4,8 +4,8 @@
%define libselinuxver 1.30.3-1
Summary: SELinux policy core utilities.
Name: policycoreutils
-Version: 1.30.8
-Release: 2
+Version: 1.30.9
+Release: 1
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -110,6 +110,12 @@
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
+* Mon May 15 2006 Dan Walsh <dwalsh at redhat.com> 1.30.9-1
+- Update to upstream
+ * Fixed audit2allow and po Makefiles for DESTDIR= builds.
+ * Merged .po file patch from Dan Walsh.
+ * Merged bug fix for genhomedircon.
+
* Wed May 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30.8-2
- Fix exception on bad file_context
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- sources 8 May 2006 15:24:37 -0000 1.113
+++ sources 15 May 2006 14:06:16 -0000 1.114
@@ -1 +1 @@
-bc77fb13dd088e1bb12461f629e01314 policycoreutils-1.30.8.tgz
+2f37a391b09b6c42e1ddc21f814cac7c policycoreutils-1.30.9.tgz
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.711, 1.712 workspace.vcl59.patch, 1.1, 1.2 openoffice.org-2.0.3.ooo65304.sn.vcl.patch, 1.1, NONE
- Next message (by thread): rpms/dhcp/devel dhcp-3.0.4-libdhcp4client.patch, NONE, 1.1 libdhcp4client.Makefile, NONE, 1.1 libdhcp4client.pc, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list