From b49bb389080dd2a6feba30412263a85ab04b59b4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 31 May 2006 23:50:52 +0000 Subject: [PATCH] * Tue May 30 2006 Dan Walsh 1.30.11-1 - Update to upstream * Merged more translations from Dan Walsh. * Merged patch to relocate setfiles to /sbin for early relabel when /usr might not be mounted from Dan Walsh. * Merged semanage/seobject patch to preserve fcontext ordering in list. * Merged secon patch from James Antill. --- policycoreutils-rhat.patch | 12252 +++++++++++++++++++++-------------- policycoreutils.spec | 4 - 2 files changed, 7544 insertions(+), 4712 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 240ce7b..6c9d855 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ 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.10/audit2allow/Makefile 2006-05-23 06:32:13.000000000 -0400 ++++ policycoreutils-1.30.10/audit2allow/Makefile 2006-05-26 08:49:21.000000000 -0400 @@ -1,7 +1,6 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr @@ -9,1524 +9,1323 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/Makefile pol MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale PYLIBVER ?= python2.4 -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/kn.po policycoreutils-1.30.10/po/kn.po ---- nsapolicycoreutils/po/kn.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.10/po/kn.po 2006-05-23 06:33:17.000000000 -0400 -@@ -0,0 +1,959 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.10/po/af.po +--- nsapolicycoreutils/po/af.po 2006-05-30 09:07:13.000000000 -0400 ++++ policycoreutils-1.30.10/po/af.po 2006-05-23 06:20:03.000000000 -0400 +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-05-26 12:51-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 \n" -+"Language-Team: LANGUAGE \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=CHARSET\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: ../load_policy/load_policy.c:22 -+#, c-format -+msgid "usage: %s [-bq]\n" -+msgstr "" -+ -+#: ../load_policy/load_policy.c:62 -+#, c-format -+msgid "%s: Can't load policy: %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:97 -+#, c-format -+msgid "Out of memory!\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:201 ../run_init/run_init.c:126 -+#, c-format -+msgid "failed to initialize PAM\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:212 -+#, c-format -+msgid "failed to set PAM_TTY\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:250 ../run_init/run_init.c:155 -+msgid "Password:" -+msgstr "" -+ -+#: ../newrole/newrole.c:282 ../run_init/run_init.c:187 -+#, c-format -+msgid "Cannot find your entry in the shadow passwd file.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:288 ../run_init/run_init.c:193 -+#, c-format -+msgid "getpass cannot open /dev/tty\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:354 -+#, c-format -+msgid "Error initing capabilities, aborting.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:367 -+#, c-format -+msgid "Error dropping capabilities, aborting\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:374 -+#, c-format -+msgid "Error changing uid, aborting.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:380 -+#, c-format -+msgid "Error resetting KEEPCAPS, aborting\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:386 -+#, c-format -+msgid "Error dropping SETUID capability, aborting\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:459 -+#, c-format -+msgid "Sorry, newrole may be used only on a SELinux kernel.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:464 -+#, c-format -+msgid "Could not determine enforcing mode.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:481 -+#, c-format -+msgid "Error: multiple roles specified\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:490 -+#, c-format -+msgid "Error: multiple types specified\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:498 -+#, c-format -+msgid "Sorry, -l may be used with SELinux MLS support.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:503 -+#, c-format -+msgid "Error: multiple levels specified\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:527 -+#, c-format -+msgid "Couldn't get default type.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:549 -+#, c-format -+msgid "failed to get old_context.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:563 -+#, c-format -+msgid "failed to get new context.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:586 -+#, c-format -+msgid "cannot find your entry in the passwd file.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:596 -+#, c-format -+msgid "Error! Shell is not valid.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:603 -+#, c-format -+msgid "Error! Could not retrieve tty information.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:607 -+#, c-format -+msgid "Authenticating %s.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:621 -+#, c-format -+msgid "newrole: incorrect password for %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:645 -+#, c-format -+msgid "failed to set new role %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:657 -+#, c-format -+msgid "failed to set new type %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:670 -+#, c-format -+msgid "failed to build new range with level %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:674 -+#, c-format -+msgid "failed to set new range %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:688 -+#, c-format -+msgid "failed to convert new context to string\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:698 -+#, c-format -+msgid "%s is not a valid context\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:711 -+#, c-format -+msgid "Error! Could not open %s.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:717 -+#, c-format -+msgid "%s! Could not get current context for %s, not relabeling tty.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:728 -+#, c-format -+msgid "%s! Could not get new context for %s, not relabeling tty.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:740 -+#, c-format -+msgid "%s! Could not set new context for %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:752 -+#, c-format -+msgid "newrole: failure forking: %s" -+msgstr "" -+ -+#: ../newrole/newrole.c:754 -+#, c-format -+msgid "Warning! Could not restore context for %s\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:774 -+#, c-format -+msgid "%s changed labels.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:798 -+#, c-format -+msgid "Could not close descriptors.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:832 ../run_init/run_init.c:390 -+#, c-format -+msgid "Could not set exec context to %s.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:842 -+#, c-format -+msgid "Error connecting to audit system.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:847 -+#, c-format -+msgid "Error allocating memory.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:853 -+#, c-format -+msgid "Error sending audit message.\n" -+msgstr "" -+ -+#: ../newrole/newrole.c:864 -+msgid "failed to exec shell\n" -+msgstr "" -+ -+#: ../run_init/run_init.c:67 -+msgid "" -+"USAGE: run_init