rpms/policycoreutils/devel .cvsignore, 1.110, 1.111 policycoreutils-rhat.patch, 1.194, 1.195 policycoreutils.spec, 1.271, 1.272 sources, 1.114, 1.115
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 23 10:40:41 UTC 2006
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18356
Modified Files:
.cvsignore policycoreutils-rhat.patch policycoreutils.spec
sources
Log Message:
* Tue May 24 2006 Dan Walsh <dwalsh at redhat.com> 1.30.10-1
- Update to upstream
* Merged patch with updates to audit2allow, secon, genhomedircon,
and semanage from Dan Walsh.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- .cvsignore 15 May 2006 14:06:13 -0000 1.110
+++ .cvsignore 23 May 2006 10:40:36 -0000 1.111
@@ -102,3 +102,4 @@
policycoreutils-1.30.7.tgz
policycoreutils-1.30.8.tgz
policycoreutils-1.30.9.tgz
+policycoreutils-1.30.10.tgz
policycoreutils-rhat.patch:
audit2allow/Makefile | 1
po/kn.po | 959 +++++++++++++++++++++++++++++++++++++++++++++++++++
po/pt.po | 28 -
po/pt_BR.po | 606 ++++++++++++++++++--------------
po/sr.po | 610 ++++++++++++++++++--------------
po/sr at Latn.po | 610 ++++++++++++++++++--------------
po/te.po | 959 +++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 2969 insertions(+), 804 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.194 -r 1.195 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- policycoreutils-rhat.patch 20 May 2006 10:28:05 -0000 1.194
+++ policycoreutils-rhat.patch 23 May 2006 10:40:36 -0000 1.195
@@ -1,118 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.9/audit2allow/avc.py
---- nsapolicycoreutils/audit2allow/avc.py 2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.9/audit2allow/avc.py 2006-05-16 21:43:37.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.9/audit2allow/Makefile
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.30.10/audit2allow/Makefile
--- nsapolicycoreutils/audit2allow/Makefile 2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.9/audit2allow/Makefile 2006-05-16 21:43:37.000000000 -0400
++++ policycoreutils-1.30.10/audit2allow/Makefile 2006-05-23 06:32:13.000000000 -0400
@@ -1,7 +1,6 @@
# Installation directories.
PREFIX ?= ${DESTDIR}/usr
@@ -121,8343 +9,4085 @@
MANDIR ?= $(PREFIX)/share/man
LOCALEDIR ?= /usr/share/locale
PYLIBVER ?= python2.4
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/ChangeLog policycoreutils-1.30.9/ChangeLog
---- nsapolicycoreutils/ChangeLog 2006-05-15 09:43:12.000000000 -0400
-+++ policycoreutils-1.30.9/ChangeLog 2006-05-16 21:43:37.000000000 -0400
-@@ -1,3 +1,10 @@
-+1.30.9 2006-05-15
-+ * secon/secon.c (get_scon): Output blank instead of context, when
-+ requested exec or fscreate context.
-+ (cmd_line): Added --prompt option.
-+ (usage): Use sensitivity level and clearance wording.
-+ * secon/secon.1: Added man page.
-+
- 1.30.9 2006-05-08
- * Fixed audit2allow and po Makefiles for DESTDIR= builds.
- * Merged .po file patch from Dan Walsh.
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.9/po/af.po
---- nsapolicycoreutils/po/af.po 2006-05-15 09:43:12.000000000 -0400
-+++ policycoreutils-1.30.9/po/af.po 2006-05-16 21:43:37.000000000 -0400
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \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"
-@@ -477,14 +477,15 @@
- msgid "Could not set SELinux user for %s"
- msgstr ""
-
--#: ../semanage/seobject.py:269 ../semanage/seobject.py:359
--#: ../semanage/seobject.py:463 ../semanage/seobject.py:526
--#: ../semanage/seobject.py:565 ../semanage/seobject.py:692
--#: ../semanage/seobject.py:734 ../semanage/seobject.py:763
--#: ../semanage/seobject.py:890 ../semanage/seobject.py:931
--#: ../semanage/seobject.py:963 ../semanage/seobject.py:1060
--#: ../semanage/seobject.py:1103 ../semanage/seobject.py:1135
--#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1243
-+#: ../semanage/seobject.py:269 ../semanage/seobject.py:321
-+#: ../semanage/seobject.py:359 ../semanage/seobject.py:463
-+#: ../semanage/seobject.py:526 ../semanage/seobject.py:565
-+#: ../semanage/seobject.py:692 ../semanage/seobject.py:734
-+#: ../semanage/seobject.py:763 ../semanage/seobject.py:890
-+#: ../semanage/seobject.py:931 ../semanage/seobject.py:963
-+#: ../semanage/seobject.py:1060 ../semanage/seobject.py:1103
-+#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1211
-+#: ../semanage/seobject.py:1243
- msgid "Could not start semanage transaction"
- msgstr ""
-
-@@ -507,10 +508,6 @@
- msgid "Could not query seuser for %s"
- msgstr ""
-
--#: ../semanage/seobject.py:321
--msgid "Could not srart semanage transaction"
--msgstr ""
--
- #: ../semanage/seobject.py:325 ../semanage/seobject.py:329
- #, python-format
- msgid "Could not modify login mapping for %s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.30.9/po/am.po
---- nsapolicycoreutils/po/am.po 2006-05-15 09:43:12.000000000 -0400
-+++ policycoreutils-1.30.9/po/am.po 2006-05-16 21:43:37.000000000 -0400
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
[...13592 lines suppressed...]
-+James Antill (james.antill at redhat.com)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/secon/secon.c policycoreutils-1.30.9/secon/secon.c
---- nsapolicycoreutils/secon/secon.c 2006-05-15 09:42:58.000000000 -0400
-+++ policycoreutils-1.30.9/secon/secon.c 2006-05-16 21:43:37.000000000 -0400
-@@ -19,8 +19,8 @@
- #define FALSE 0
-
- #define SECON_CONF_PROG_NAME "secon" /* default program name */
--#define SECON_OPTS_SM "hVurtlmRfLp" /* small options available, printing */
--#define SECON_OPTS_GO "hVurtlmRf:L:p:" /* small options available, getopt */
-+#define SECON_OPTS_SM "hVurtlmPRfLp" /* small options available, printing */
-+#define SECON_OPTS_GO "hVurtlmPRf:L:p:" /* small options available, getopt */
-
- #define OPTS_FROM_ARG 0
- #define OPTS_FROM_FILE 1
-@@ -43,7 +43,9 @@
-
- unsigned int disp_raw : 1;
-
-- unsigned int from_type : 10; /* 16 bits */
-+ unsigned int disp_prompt : 1; /* no return, use : to sep */
-+
-+ unsigned int from_type : 9; /* 16 bits */
-
- union
- {
-@@ -53,7 +55,7 @@
- const char *arg;
- } f;
- } opts[1] = {{FALSE, FALSE, FALSE, FALSE, FALSE,
-- FALSE, OPTS_FROM_ARG, {0}}};
-+ FALSE, FALSE, OPTS_FROM_ARG, {0}}};
-
-
- static void usage(const char *name, int exit_code)
-@@ -62,11 +64,13 @@
- " Usage: %s [-%s] [ context | - ]\n"
- " --help -h Show this message.\n"
- " --version -V Show the version.\n"
--" --user -u Show the user part of the context.\n"
--" --role -r Show the role part of the context.\n"
--" --type -t Show the type part of the context.\n"
--" --level -l Show the default level part of the context.\n"
--" --mls-range -m Show the level range part of the context.\n"
-+" --prompt -P Output in a format good for a prompt.\n"
-+" --user -u Show the user of the context.\n"
-+" --role -r Show the role of the context.\n"
-+" --type -t Show the type of the context.\n"
-+" --level -l Show the sensitivity level of the context.\n"
-+" --mls-range -m Show the sensitivity level and clearance of \n"
-+" the context.\n"
- " --raw -R Show the context in \"raw\" format.\n"
- " --current Get the context for the current process.\n"
- " --self Get the context for the current process.\n"
-@@ -134,10 +138,13 @@
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
-
-+ {"prompt", no_argument, NULL, 'P'},
-+
- {"user", no_argument, NULL, 'u'},
- {"role", no_argument, NULL, 'r'},
- {"type", no_argument, NULL, 't'},
- {"level", no_argument, NULL, 'l'},
-+ {"range", no_argument, NULL, 'm'},
- {"mls-range", no_argument, NULL, 'm'},
-
- {"raw", no_argument, NULL, 'R'},
-@@ -183,6 +190,8 @@
- case 'l': done = TRUE; opts->disp_level = !opts->disp_level; break;
- case 'm': done = TRUE; opts->disp_mlsr = !opts->disp_mlsr; break;
-
-+ case 'P': opts->disp_prompt = !opts->disp_prompt; break;
-+
- case 'R': opts->disp_raw = !opts->disp_raw; break;
- case 1: opts->from_type = OPTS_FROM_CUR; break;
- case 2: opts->from_type = OPTS_FROM_CUREXE; break;
-@@ -226,7 +235,9 @@
- opts->disp_user = TRUE;
- opts->disp_role = TRUE;
- opts->disp_type = TRUE;
-- opts->disp_level = TRUE;
-+ if (!opts->disp_prompt) /* when displaying prompt,
-+ just output "normal" by default */
-+ opts->disp_level = TRUE;
- opts->disp_mlsr = TRUE;
- }
-
-@@ -236,6 +247,8 @@
- argc -= optind;
- argv += optind;
-
-+ if (!argc && (opts->from_type == OPTS_FROM_ARG) && !isatty(STDIN_FILENO))
-+ opts->from_type = OPTS_FROM_STDIN;
- if (!argc && (opts->from_type == OPTS_FROM_ARG))
- opts->from_type = OPTS_FROM_CUR;
-
-@@ -290,6 +303,7 @@
-
- static security_context_t get_scon(void)
- {
-+ static char dummy_NIL[1] = "";
- security_context_t con = NULL;
- int ret = -1;
- int raw = TRUE;
-@@ -336,10 +350,7 @@
- err(EXIT_FAILURE, " Couldn't get current exec security context");
-
- if (!con)
-- {
-- opts->from_type = OPTS_FROM_CUR;
-- return (get_scon());
-- }
-+ con = dummy_NIL;
- break;
- case OPTS_FROM_CURFS:
- ret = getfscreatecon_raw(&con);
-@@ -348,10 +359,7 @@
- err(EXIT_FAILURE, " Couldn't get current fs security context");
-
- if (!con)
-- {
-- opts->from_type = OPTS_FROM_CUR;
-- return (get_scon());
-- }
-+ con = dummy_NIL;
- break;
-
- case OPTS_FROM_PROC:
-@@ -369,10 +377,7 @@
- (unsigned long)opts->f.pid);
-
- if (!con)
-- {
-- opts->from_type = OPTS_FROM_PROC;
-- return (get_scon());
-- }
-+ con = dummy_NIL;
- break;
- case OPTS_FROM_PROCFS:
- ret = my_getpidfscreatecon_raw(opts->f.pid, &con);
-@@ -382,10 +387,12 @@
- (unsigned long)opts->f.pid);
-
- if (!con)
-+ con = dummy_NIL;
-+ /* disabled -- override with normal context ...
- {
- opts->from_type = OPTS_FROM_PROC;
- return (get_scon());
-- }
-+ } */
- break;
-
- case OPTS_FROM_FILE:
-@@ -426,15 +433,26 @@
-
- static void disp__con_val(const char *name, const char *val)
- {
-+ static int done = FALSE;
-+
- assert(name);
-
- if (!val) val = ""; /* targeted has no "level" etc.,
- any errors should happen at context_new() time */
--
-- if (disp_multi())
-+
-+ if (opts->disp_prompt)
-+ {
-+ if (xstreq("mls-range", name) && !*val)
-+ return; /* skip, mls-range if it's empty */
-+
-+ fprintf(stdout, "%s%s", done ? ":" : "", val);
-+ }
-+ else if (disp_multi())
- fprintf(stdout, "%s: %s\n", name, val);
- else
- fprintf(stdout, "%s\n", val);
-+
-+ done = TRUE;
- }
-
- static void disp_con(security_context_t scon)
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.9/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py 2006-05-15 09:42:56.000000000 -0400
-+++ policycoreutils-1.30.9/semanage/seobject.py 2006-05-16 21:43:37.000000000 -0400
-@@ -318,7 +318,7 @@
-
- rc = semanage_begin_transaction(self.sh)
- if rc < 0:
-- raise ValueError(_("Could not srart semanage transaction"))
-+ raise ValueError(_("Could not start semanage transaction"))
-
- rc = semanage_seuser_modify_local(self.sh, k, u)
- if rc < 0:
++#: ../audit2allow/audit2allow:203
++#, c-format
++msgid "Options Error: %s "
++msgstr ""
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- policycoreutils.spec 20 May 2006 10:34:27 -0000 1.271
+++ policycoreutils.spec 23 May 2006 10:40:38 -0000 1.272
@@ -1,11 +1,11 @@
%define libauditver 1.1.4-3
-%define libsepolver 1.12.5-1
+%define libsepolver 1.12.11-1
%define libsemanagever 1.6.5-1
-%define libselinuxver 1.30.3-1
+%define libselinuxver 1.30.8-1
Summary: SELinux policy core utilities.
Name: policycoreutils
-Version: 1.30.9
-Release: 4
+Version: 1.30.10
+Release: 1
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -110,6 +110,11 @@
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
+* Tue May 24 2006 Dan Walsh <dwalsh at redhat.com> 1.30.10-1
+- Update to upstream
+ * Merged patch with updates to audit2allow, secon, genhomedircon,
+ and semanage from Dan Walsh.
+
* Sat May 20 2006 Dan Walsh <dwalsh at redhat.com> 1.30.9-4
- Fix exception in genhomedircon
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- sources 15 May 2006 14:06:16 -0000 1.114
+++ sources 23 May 2006 10:40:38 -0000 1.115
@@ -1 +1 @@
-2f37a391b09b6c42e1ddc21f814cac7c policycoreutils-1.30.9.tgz
+648cbbb5cae02a28c648d1b7078c1cf0 policycoreutils-1.30.10.tgz
More information about the fedora-cvs-commits
mailing list