diff --git a/.cvsignore b/.cvsignore index 6d81d4c..183809b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -186,3 +186,4 @@ policycoreutils-2.0.52.tgz sepolgen-1.0.13.tgz policycoreutils-2.0.53.tgz policycoreutils-2.0.54.tgz +policycoreutils-2.0.55.tgz diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch index 600f822..604fdc6 100644 --- a/policycoreutils-gui.patch +++ b/policycoreutils-gui.patch @@ -1,7 +1,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.54/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.54/gui/Makefile 2008-08-06 18:05:28.000000000 -0400 -@@ -0,0 +1,36 @@ ++++ policycoreutils-2.0.54/gui/Makefile 2008-08-11 12:20:26.000000000 -0400 +@@ -0,0 +1,37 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr +SHAREDIR ?= $(PREFIX)/share/system-config-selinux @@ -9,6 +9,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreu +TARGETS= \ +booleansPage.py \ +fcontextPage.py \ ++html_util.py \ +loginsPage.py \ +mappingsPage.py \ +modulesPage.py \ diff --git a/policycoreutils-po.patch b/policycoreutils-po.patch index 5c13061..0e9abcc 100644 --- a/policycoreutils-po.patch +++ b/policycoreutils-po.patch @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.52/po/.cvsignore +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.54/po/.cvsignore --- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-2.0.52/po/.cvsignore 2008-07-29 09:06:29.000000000 -0400 ++++ policycoreutils-2.0.54/po/.cvsignore 2008-08-06 18:05:28.000000000 -0400 @@ -0,0 +1,16 @@ +*.gmo +*.mo @@ -18,9 +18,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycore +po2tbl.sed.in +stamp-cat-id +stamp-it -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.52/po/Makefile ---- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/Makefile 2008-07-29 09:06:29.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.54/po/Makefile +--- nsapolicycoreutils/po/Makefile 2008-08-05 09:58:34.000000000 -0400 ++++ policycoreutils-2.0.54/po/Makefile 2008-08-06 18:05:28.000000000 -0400 @@ -23,20 +23,61 @@ POFILES = $(wildcard *.po) MOFILES = $(patsubst %.po,%.mo,$(POFILES)) @@ -100,9 +100,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreut install: $(MOFILES) @for n in $(MOFILES); do \ l=`basename $$n .mo`; \ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.52/po/POTFILES ---- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 -+++ policycoreutils-2.0.52/po/POTFILES 2008-07-29 09:06:29.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.54/po/POTFILES +--- nsapolicycoreutils/po/POTFILES 2008-08-05 09:58:34.000000000 -0400 ++++ policycoreutils-2.0.54/po/POTFILES 2008-08-06 18:05:28.000000000 -0400 @@ -1,10 +1,54 @@ - ../load_policy/load_policy.c \ - ../newrole/newrole.c \ @@ -166,9 +166,9 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreut + ../gui/templates/var_spool.py \ + ../secon/secon.c \ + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.52/po/POTFILES.in ---- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/POTFILES.in 2008-07-29 09:06:29.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.54/po/POTFILES.in +--- nsapolicycoreutils/po/POTFILES.in 2008-08-05 09:58:34.000000000 -0400 ++++ policycoreutils-2.0.54/po/POTFILES.in 2008-08-06 18:05:28.000000000 -0400 @@ -2,9 +2,7 @@ run_init/run_init.c semodule_link/semodule_link.c @@ -228,19 +228,19 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycor +gui/templates/var_run.py +gui/templates/var_spool.py secon/secon.c -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.52/po/af.po ---- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 -+++ policycoreutils-2.0.52/po/af.po 2008-07-29 09:29:36.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.54/po/af.po +--- nsapolicycoreutils/po/af.po 2008-08-05 09:58:34.000000000 -0400 ++++ policycoreutils-2.0.54/po/af.po 2008-08-11 12:04:05.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-06-30 11:47-0400\n" ++"POT-Creation-Date: 2008-08-08 13:53-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -@@ -16,1013 +16,3176 @@ +@@ -16,1013 +16,3198 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -344,229 +344,219 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:464 ../newrole/newrole.c:562 -#, c-format -msgid "Error changing uid, aborting.\n" -+#: ../semanage/seobject.py:113 ../semanage/seobject.py:117 -+msgid "global" ++#: ../semanage/seobject.py:49 ++msgid "Could not create semanage handle" msgstr "" -#: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557 -#, c-format -msgid "Error resetting KEEPCAPS, aborting\n" -+#: ../semanage/seobject.py:172 -+msgid "translations not supported on non-MLS machines" ++#: ../semanage/seobject.py:56 ++msgid "SELinux policy is not managed or store cannot be accessed." msgstr "" -#: ../newrole/newrole.c:477 -#, c-format -msgid "Error dropping SETUID capability, aborting\n" -+#: ../semanage/seobject.py:179 -+#, python-format -+msgid "Unable to open %s: translations not supported on non-MLS machines: %s" ++#: ../semanage/seobject.py:61 ++msgid "Cannot read policy store." msgstr "" -#: ../newrole/newrole.c:482 ../newrole/newrole.c:536 -#, c-format -msgid "Error freeing caps\n" -+#: ../semanage/seobject.py:212 -+msgid "Level" ++#: ../semanage/seobject.py:66 ++msgid "Could not establish semanage connection" msgstr "" -#: ../newrole/newrole.c:580 -#, c-format -msgid "Error connecting to audit system.\n" -+#: ../semanage/seobject.py:212 ../gui/system-config-selinux.glade:651 -+#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59 -+msgid "Translation" ++#: ../semanage/seobject.py:137 ../semanage/seobject.py:141 ++msgid "global" msgstr "" -#: ../newrole/newrole.c:586 -#, c-format -msgid "Error allocating memory.\n" -+#: ../semanage/seobject.py:220 ../semanage/seobject.py:234 -+#, python-format -+msgid "Translations can not contain spaces '%s' " ++#: ../semanage/seobject.py:196 ++msgid "translations not supported on non-MLS machines" msgstr "" -#: ../newrole/newrole.c:593 -#, c-format -msgid "Error sending audit message.\n" -+#: ../semanage/seobject.py:223 ++#: ../semanage/seobject.py:203 +#, python-format -+msgid "Invalid Level '%s' " ++msgid "Unable to open %s: translations not supported on non-MLS machines: %s" msgstr "" -#: ../newrole/newrole.c:634 ../newrole/newrole.c:978 -#, c-format -msgid "Could not determine enforcing mode.\n" -+#: ../semanage/seobject.py:226 -+#, python-format -+msgid "%s already defined in translations" ++#: ../semanage/seobject.py:236 ++msgid "Level" msgstr "" -#: ../newrole/newrole.c:641 -#, c-format -msgid "Error! Could not open %s.\n" -+#: ../semanage/seobject.py:238 -+#, python-format -+msgid "%s not defined in translations" ++#: ../semanage/seobject.py:236 ../gui/system-config-selinux.glade:651 ++#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59 ++msgid "Translation" msgstr "" -#: ../newrole/newrole.c:646 -#, c-format -msgid "%s! Could not get current context for %s, not relabeling tty.\n" -+#: ../semanage/seobject.py:266 -+msgid "Permissive Types" ++#: ../semanage/seobject.py:244 ../semanage/seobject.py:258 ++#, python-format ++msgid "Translations can not contain spaces '%s' " msgstr "" -#: ../newrole/newrole.c:656 -#, c-format -msgid "%s! Could not get new context for %s, not relabeling tty.\n" -+#: ../semanage/seobject.py:316 -+msgid "Could not create semanage handle" ++#: ../semanage/seobject.py:247 ++#, python-format ++msgid "Invalid Level '%s' " msgstr "" -#: ../newrole/newrole.c:666 -#, c-format -msgid "%s! Could not set new context for %s\n" -+#: ../semanage/seobject.py:325 -+msgid "SELinux policy is not managed or store cannot be accessed." ++#: ../semanage/seobject.py:250 ++#, python-format ++msgid "%s already defined in translations" msgstr "" -#: ../newrole/newrole.c:710 -#, c-format -msgid "%s changed labels.\n" -+#: ../semanage/seobject.py:330 -+msgid "Cannot read policy store." ++#: ../semanage/seobject.py:262 ++#, python-format ++msgid "%s not defined in translations" msgstr "" -#: ../newrole/newrole.c:716 -#, c-format -msgid "Warning! Could not restore context for %s\n" -+#: ../semanage/seobject.py:335 -+msgid "Could not establish semanage connection" ++#: ../semanage/seobject.py:288 ++msgid "Not yet implemented" msgstr "" -#: ../newrole/newrole.c:772 -#, c-format -msgid "Error: multiple roles specified\n" -+#: ../semanage/seobject.py:337 -+msgid "Not yet implemented" ++#: ../semanage/seobject.py:295 ++msgid "Could not start semanage transaction" msgstr "" -#: ../newrole/newrole.c:780 -#, c-format -msgid "Error: multiple types specified\n" -+#: ../semanage/seobject.py:357 ../semanage/seobject.py:415 -+#: ../semanage/seobject.py:462 ../semanage/seobject.py:545 -+#: ../semanage/seobject.py:614 ../semanage/seobject.py:674 -+#: ../semanage/seobject.py:892 ../semanage/seobject.py:1260 -+#: ../semanage/seobject.py:1324 ../semanage/seobject.py:1338 -+#: ../semanage/seobject.py:1416 ../semanage/seobject.py:1455 -+#: ../semanage/seobject.py:1495 -+#, python-format -+msgid "Could not create a key for %s" ++#: ../semanage/seobject.py:301 ++msgid "Could not commit semanage transaction" msgstr "" -#: ../newrole/newrole.c:787 -#, c-format -msgid "Sorry, -l may be used with SELinux MLS support.\n" -+#: ../semanage/seobject.py:361 ../semanage/seobject.py:419 -+#: ../semanage/seobject.py:466 ../semanage/seobject.py:472 -+#, python-format -+msgid "Could not check if login mapping for %s is defined" ++#: ../semanage/seobject.py:311 ++msgid "Could not list SELinux modules" msgstr "" -#: ../newrole/newrole.c:792 -#, c-format -msgid "Error: multiple levels specified\n" -+#: ../semanage/seobject.py:363 -+#, python-format -+msgid "Login mapping for %s is already defined" ++#: ../semanage/seobject.py:322 ++msgid "Permissive Types" msgstr "" -#: ../newrole/newrole.c:814 -#, c-format -msgid "Couldn't get default type.\n" -+#: ../semanage/seobject.py:367 ++#: ../semanage/seobject.py:352 +#, python-format -+msgid "Linux User %s does not exist" ++msgid "Could not set permissive domain %s (module installation failed)" msgstr "" -#: ../newrole/newrole.c:824 -#, c-format -msgid "failed to get new context.\n" -+#: ../semanage/seobject.py:371 ++#: ../semanage/seobject.py:366 +#, python-format -+msgid "Could not create login mapping for %s" ++msgid "Could not remove permissive domain %s (remove failed)" msgstr "" -#: ../newrole/newrole.c:831 -#, c-format -msgid "failed to set new role %s\n" -+#: ../semanage/seobject.py:375 ../semanage/seobject.py:559 ++#: ../semanage/seobject.py:392 ../semanage/seobject.py:452 ++#: ../semanage/seobject.py:498 ../semanage/seobject.py:580 ++#: ../semanage/seobject.py:647 ../semanage/seobject.py:705 ++#: ../semanage/seobject.py:915 ../semanage/seobject.py:1267 ++#: ../semanage/seobject.py:1327 ../semanage/seobject.py:1339 ++#: ../semanage/seobject.py:1418 ../semanage/seobject.py:1469 +#, python-format -+msgid "Could not set name for %s" ++msgid "Could not create a key for %s" msgstr "" -#: ../newrole/newrole.c:838 -#, c-format -msgid "failed to set new type %s\n" -+#: ../semanage/seobject.py:380 ../semanage/seobject.py:569 ++#: ../semanage/seobject.py:396 ../semanage/seobject.py:456 ++#: ../semanage/seobject.py:502 ../semanage/seobject.py:508 +#, python-format -+msgid "Could not set MLS range for %s" ++msgid "Could not check if login mapping for %s is defined" msgstr "" -#: ../newrole/newrole.c:847 -#, c-format -msgid "failed to build new range with level %s\n" -+#: ../semanage/seobject.py:384 ++#: ../semanage/seobject.py:398 +#, python-format -+msgid "Could not set SELinux user for %s" ++msgid "Login mapping for %s is already defined" msgstr "" -#: ../newrole/newrole.c:852 -#, c-format -msgid "failed to set new range %s\n" -+#: ../semanage/seobject.py:388 ../semanage/seobject.py:440 -+#: ../semanage/seobject.py:478 ../semanage/seobject.py:583 -+#: ../semanage/seobject.py:651 ../semanage/seobject.py:690 -+#: ../semanage/seobject.py:820 ../semanage/seobject.py:862 -+#: ../semanage/seobject.py:882 ../semanage/seobject.py:919 -+#: ../semanage/seobject.py:1052 ../semanage/seobject.py:1093 -+#: ../semanage/seobject.py:1125 ../semanage/seobject.py:1238 -+#: ../semanage/seobject.py:1296 ../semanage/seobject.py:1316 -+#: ../semanage/seobject.py:1354 ../semanage/seobject.py:1436 -+#: ../semanage/seobject.py:1471 ../semanage/seobject.py:1489 -+msgid "Could not start semanage transaction" ++#: ../semanage/seobject.py:403 ++#, python-format ++msgid "Linux Group %s does not exist" msgstr "" -#: ../newrole/newrole.c:860 -#, c-format -msgid "failed to convert new context to string\n" -+#: ../semanage/seobject.py:392 ../semanage/seobject.py:396 ++#: ../semanage/seobject.py:408 +#, python-format -+msgid "Could not add login mapping for %s" ++msgid "Linux User %s does not exist" msgstr "" -#: ../newrole/newrole.c:865 -#, c-format -msgid "%s is not a valid context\n" -+#: ../semanage/seobject.py:399 ../semanage/seobject.py:402 -+msgid "add SELinux user mapping" ++#: ../semanage/seobject.py:412 ++#, python-format ++msgid "Could not create login mapping for %s" msgstr "" -#: ../newrole/newrole.c:872 -#, c-format -msgid "Unable to allocate memory for new_context" -+#: ../semanage/seobject.py:411 -+msgid "Requires seuser or serange" ++#: ../semanage/seobject.py:416 ../semanage/seobject.py:594 ++#, python-format ++msgid "Could not set name for %s" msgstr "" -#: ../newrole/newrole.c:898 -#, c-format -msgid "Unable to obtain empty signal set\n" -+#: ../semanage/seobject.py:421 ../semanage/seobject.py:468 ++#: ../semanage/seobject.py:421 ../semanage/seobject.py:604 +#, python-format -+msgid "Login mapping for %s is not defined" ++msgid "Could not set MLS range for %s" msgstr "" -#: ../newrole/newrole.c:906 @@ -574,105 +564,102 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -msgid "Unable to set SIGHUP handler\n" +#: ../semanage/seobject.py:425 +#, python-format -+msgid "Could not query seuser for %s" ++msgid "Could not set SELinux user for %s" msgstr "" -#: ../newrole/newrole.c:972 -#, c-format -msgid "Sorry, newrole may be used only on a SELinux kernel.\n" -+#: ../semanage/seobject.py:444 ../semanage/seobject.py:448 ++#: ../semanage/seobject.py:429 +#, python-format -+msgid "Could not modify login mapping for %s" ++msgid "Could not add login mapping for %s" msgstr "" -#: ../newrole/newrole.c:989 -#, c-format -msgid "failed to get old_context.\n" -+#: ../semanage/seobject.py:474 -+#, python-format -+msgid "Login mapping for %s is defined in policy, cannot be deleted" ++#: ../semanage/seobject.py:441 ../semanage/seobject.py:444 ++msgid "add SELinux user mapping" msgstr "" -#: ../newrole/newrole.c:996 -#, c-format -msgid "Error! Could not retrieve tty information.\n" -+#: ../semanage/seobject.py:483 ../semanage/seobject.py:487 -+#, python-format -+msgid "Could not delete login mapping for %s" ++#: ../semanage/seobject.py:448 ++msgid "Requires seuser or serange" msgstr "" -#: ../newrole/newrole.c:1015 -#, c-format -msgid "Authenticating %s.\n" -+#: ../semanage/seobject.py:503 -+msgid "Could not list login mappings" ++#: ../semanage/seobject.py:458 ../semanage/seobject.py:504 ++#, python-format ++msgid "Login mapping for %s is not defined" msgstr "" -#: ../newrole/newrole.c:1020 ../run_init/run_init.c:126 -#, c-format -msgid "failed to initialize PAM\n" -+#: ../semanage/seobject.py:516 ../semanage/seobject.py:521 -+#: ../gui/system-config-selinux.glade:100 -+msgid "Login Name" ++#: ../semanage/seobject.py:462 ++#, python-format ++msgid "Could not query seuser for %s" msgstr "" -#: ../newrole/newrole.c:1029 -#, c-format -msgid "newrole: incorrect password for %s\n" -+#: ../semanage/seobject.py:516 ../semanage/seobject.py:521 -+#: ../semanage/seobject.py:733 ../semanage/seobject.py:738 -+#: ../gui/system-config-selinux.glade:128 -+#: ../gui/system-config-selinux.glade:1107 -+msgid "SELinux User" ++#: ../semanage/seobject.py:478 ++#, python-format ++msgid "Could not modify login mapping for %s" msgstr "" -#: ../newrole/newrole.c:1056 -#, c-format -msgid "newrole: failure forking: %s" -+#: ../semanage/seobject.py:516 ../gui/system-config-selinux.glade:156 -+#: ../gui/system-config-selinux.glade:1135 -+msgid "MLS/MCS Range" ++#: ../semanage/seobject.py:510 ++#, python-format ++msgid "Login mapping for %s is defined in policy, cannot be deleted" msgstr "" -#: ../newrole/newrole.c:1059 ../newrole/newrole.c:1082 -#, c-format -msgid "Unable to restore tty label...\n" -+#: ../semanage/seobject.py:549 ../semanage/seobject.py:618 -+#: ../semanage/seobject.py:678 ../semanage/seobject.py:684 ++#: ../semanage/seobject.py:514 +#, python-format -+msgid "Could not check if SELinux user %s is defined" ++msgid "Could not delete login mapping for %s" msgstr "" -#: ../newrole/newrole.c:1061 ../newrole/newrole.c:1088 -#, c-format -msgid "Failed to close tty properly\n" -+#: ../semanage/seobject.py:551 -+#, python-format -+msgid "SELinux user %s is already defined" ++#: ../semanage/seobject.py:537 ++msgid "Could not list login mappings" msgstr "" -#: ../newrole/newrole.c:1117 -#, c-format -msgid "Could not close descriptors.\n" -+#: ../semanage/seobject.py:555 -+#, python-format -+msgid "Could not create SELinux user for %s" ++#: ../semanage/seobject.py:550 ../semanage/seobject.py:555 ++#: ../gui/system-config-selinux.glade:100 ++msgid "Login Name" msgstr "" -#: ../newrole/newrole.c:1140 -#, c-format -msgid "Error allocating shell's argv0.\n" -+#: ../semanage/seobject.py:564 -+#, python-format -+msgid "Could not add role %s for %s" ++#: ../semanage/seobject.py:550 ../semanage/seobject.py:555 ++#: ../semanage/seobject.py:764 ../semanage/seobject.py:769 ++#: ../gui/system-config-selinux.glade:128 ++#: ../gui/system-config-selinux.glade:1107 ++msgid "SELinux User" msgstr "" -#: ../newrole/newrole.c:1147 ../run_init/run_init.c:405 -#, c-format -msgid "Could not set exec context to %s.\n" -+#: ../semanage/seobject.py:573 -+#, python-format -+msgid "Could not set MLS level for %s" ++#: ../semanage/seobject.py:550 ../gui/system-config-selinux.glade:156 ++#: ../gui/system-config-selinux.glade:1135 ++msgid "MLS/MCS Range" msgstr "" -#: ../newrole/newrole.c:1173 @@ -680,14 +667,15 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -msgid "Unable to restore the environment, aborting\n" +#: ../semanage/seobject.py:576 +#, python-format -+msgid "Could not add prefix %s for %s" ++msgid "You must add at least one role for %s" msgstr "" -#: ../newrole/newrole.c:1184 -msgid "failed to exec shell\n" -+#: ../semanage/seobject.py:579 ++#: ../semanage/seobject.py:584 ../semanage/seobject.py:651 ++#: ../semanage/seobject.py:709 ../semanage/seobject.py:715 +#, python-format -+msgid "Could not extract key for %s" ++msgid "Could not check if SELinux user %s is defined" msgstr "" -#: ../run_init/run_init.c:67 @@ -695,498 +683,527 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -"USAGE: run_init