rpms/policycoreutils/devel policycoreutils-po.patch, 1.50, 1.51 policycoreutils-rhat.patch, 1.412, 1.413 policycoreutils-sepolgen.patch, 1.21, 1.22 policycoreutils.spec, 1.599, 1.600
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Apr 9 02:05:32 UTC 2009
- Previous message (by thread): rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.26.0-support-touchpads.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.98, 1.99
- Next message (by thread): rpms/rdiff-backup/F-10 rdiff-backup.spec, 1.27, 1.28 sources, 1.14, 1.15 .cvsignore, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26359
Modified Files:
policycoreutils-po.patch policycoreutils-rhat.patch
policycoreutils-sepolgen.patch policycoreutils.spec
Log Message:
* Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-8
- Update po files
- Add --equiv command for semanage
policycoreutils-po.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.50 -r 1.51 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- policycoreutils-po.patch 31 Mar 2009 12:56:45 -0000 1.50
+++ policycoreutils-po.patch 9 Apr 2009 02:05:21 -0000 1.51
@@ -1,6 +1,7 @@
+Binary files nsapolicycoreutils/po/af.mo and policycoreutils-2.0.62/po/af.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.62/po/af.po
--- nsapolicycoreutils/po/af.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/af.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/af.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -1941,9 +1942,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/am.mo and policycoreutils-2.0.62/po/am.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.62/po/am.po
--- nsapolicycoreutils/po/am.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/am.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/am.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -3884,9 +3886,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/ar.mo and policycoreutils-2.0.62/po/ar.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.62/po/ar.po
--- nsapolicycoreutils/po/ar.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/ar.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/ar.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -5827,9 +5830,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/as.mo and policycoreutils-2.0.62/po/as.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.62/po/as.po
--- nsapolicycoreutils/po/as.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/as.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/as.po 2009-04-08 22:03:17.000000000 -0400
@@ -1,4 +1,4 @@
-# translation of as.po to Assamese
+# translation of policycoreutils.HEAD.po to Assamese
@@ -8214,9 +8218,10 @@
-#~ msgstr "সà§à¦¤à§°"
+#~ msgid "translations not supported on non-MLS machines"
+#~ msgstr "MLS-বিহীন যনà§à¦¤à§à§°à¦¤ অনà§à¦¬à¦¾à¦¦ সমৰà§à¦¥à¦¨ কৰা নহয়"
+Binary files nsapolicycoreutils/po/be.mo and policycoreutils-2.0.62/po/be.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.62/po/be.po
--- nsapolicycoreutils/po/be.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/be.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/be.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -10157,9 +10162,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/bg.mo and policycoreutils-2.0.62/po/bg.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.62/po/bg.po
--- nsapolicycoreutils/po/bg.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bg.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bg.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -12209,9 +12215,10 @@
#~ msgid "Requires value"
#~ msgstr "ИзиÑква ÑтойноÑÑ‚"
+Binary files nsapolicycoreutils/po/bn_IN.mo and policycoreutils-2.0.62/po/bn_IN.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.62/po/bn_IN.po
--- nsapolicycoreutils/po/bn_IN.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bn_IN.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bn_IN.po 2009-04-08 22:03:17.000000000 -0400
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: policycoreutils.HEAD\n"
@@ -14236,9 +14243,10 @@
#~ msgid "Requires value"
#~ msgstr "মান আবশà§à¦¯à¦•"
+Binary files nsapolicycoreutils/po/bn.mo and policycoreutils-2.0.62/po/bn.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.62/po/bn.po
--- nsapolicycoreutils/po/bn.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bn.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bn.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -16179,9 +16187,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/bs.mo and policycoreutils-2.0.62/po/bs.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.62/po/bs.po
--- nsapolicycoreutils/po/bs.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/bs.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/bs.po 2009-04-08 22:03:17.000000000 -0400
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: bs\n"
@@ -18161,9 +18170,10 @@
#~ msgid "Requires value"
#~ msgstr "Zahtijeva vrijednost"
+Binary files nsapolicycoreutils/po/ca.mo and policycoreutils-2.0.62/po/ca.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.62/po/ca.po
--- nsapolicycoreutils/po/ca.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/ca.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/ca.po 2009-04-08 22:03:17.000000000 -0400
@@ -22,7 +22,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -20153,9 +20163,10 @@
#~ msgid "Requires value"
#~ msgstr "Requereix un valor"
+Binary files nsapolicycoreutils/po/cs.mo and policycoreutils-2.0.62/po/cs.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.62/po/cs.po
--- nsapolicycoreutils/po/cs.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/cs.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/cs.po 2009-04-08 22:03:17.000000000 -0400
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: cs\n"
@@ -22175,9 +22186,10 @@
#~ msgid "<b>Device number:</b>"
#~ msgstr "<b>ÄŒÃslo zaÅ™ÃzenÃ:</b>"
+Binary files nsapolicycoreutils/po/cy.mo and policycoreutils-2.0.62/po/cy.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.62/po/cy.po
--- nsapolicycoreutils/po/cy.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/cy.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/cy.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -24118,9 +24130,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/da.mo and policycoreutils-2.0.62/po/da.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.62/po/da.po
--- nsapolicycoreutils/po/da.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/da.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/da.po 2009-04-08 22:03:17.000000000 -0400
@@ -2,7 +2,7 @@
# Danish messages for policycoreutils.
# Copyright (C) 2006 Christian Rose.
@@ -26111,9 +26124,10 @@
#~ msgid "Requires value"
#~ msgstr "Kræver værdi"
+Binary files nsapolicycoreutils/po/de.mo and policycoreutils-2.0.62/po/de.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.62/po/de.po
--- nsapolicycoreutils/po/de.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/de.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/de.po 2009-04-08 22:03:17.000000000 -0400
@@ -1,30 +1,26 @@
-# translation of policycoreutils.HEAD.de.po to German
# German translation of policycoreutils.
@@ -29582,9 +29596,10 @@
+#~ "\n"
+#~ "semodule -i %s\n"
+#~ "\n"
+Binary files nsapolicycoreutils/po/el.mo and policycoreutils-2.0.62/po/el.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-2.0.62/po/el.po
--- nsapolicycoreutils/po/el.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/el.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/el.po 2009-04-08 22:03:17.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: el\n"
@@ -31600,9 +31615,10 @@
#~ msgid "Requires value"
#~ msgstr "ΑπόκÏυψη τιμής"
+Binary files nsapolicycoreutils/po/en_GB.mo and policycoreutils-2.0.62/po/en_GB.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-2.0.62/po/en_GB.po
--- nsapolicycoreutils/po/en_GB.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/en_GB.po 2009-03-31 08:54:56.000000000 -0400
++++ policycoreutils-2.0.62/po/en_GB.po 2009-04-08 22:03:17.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -33582,9 +33598,10 @@
#~ msgid "Requires value"
#~ msgstr "Requires value"
[...27705 lines suppressed...]
msgid "Add Translation"
msgstr "à°…à°¨à±à°µà°¾à°¦à°®à±à°¨à± జతచేయà±à°®à±"
@@ -147439,7 +156155,8 @@
-#: ../gui/system-config-selinux.glade:2706
+#: ../gui/system-config-selinux.glade:2711
msgid "label40"
- msgstr ""
+-msgstr ""
++msgstr "label40"
-#: ../gui/system-config-selinux.glade:2743
+#: ../gui/system-config-selinux.glade:2748
@@ -147466,7 +156183,8 @@
-#: ../gui/system-config-selinux.glade:2948
+#: ../gui/system-config-selinux.glade:2954
msgid "label42"
- msgstr ""
+-msgstr ""
++msgstr "label42"
-#: ../gui/system-config-selinux.glade:2985
+#: ../gui/system-config-selinux.glade:2991
@@ -147493,42 +156211,45 @@
-#: ../gui/system-config-selinux.glade:3172
+#: ../gui/system-config-selinux.glade:3179
msgid "label44"
- msgstr ""
-
+-msgstr ""
++msgstr "label44"
++
+#: ../gui/system-config-selinux.glade:3216
+msgid "Change process mode to permissive."
-+msgstr ""
++msgstr "కారà±à°¯à°•à±à°°à°®à°®à± రీతిని à°…à°¨à±à°®à°¤à°¿à°‚చదగà±à°¨à°¦à°¿à°—à°¾ మారà±à°šà±à°®à±."
+
+#: ../gui/system-config-selinux.glade:3234
+msgid "Change process mode to enforcing"
-+msgstr ""
++msgstr "కారà±à°¯à°•à±à°°à°®à°®à± రీతిని బలవంతపెటà±à°Ÿà±à°¨à°¦à°¿à°—à°¾ మారà±à°šà±à°®à±"
+
+#: ../gui/system-config-selinux.glade:3326
+msgid "Process Domain"
-+msgstr ""
++msgstr "డౌమైనౠపà±à°°à±‹à°¸à±†à°¸à± చేయà±à°®à±"
+
+#: ../gui/system-config-selinux.glade:3354
+msgid "label59"
-+msgstr ""
-+
++msgstr "label59"
+
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
- msgstr "మృదà±à°¤à±à°µà°‚ à°¸à±à°¥à°¾à°¯à°¿"
-@@ -3462,8 +3483,8 @@
+@@ -3462,51 +3461,3 @@
msgid "SELinux user '%s' is required"
msgstr "SELinux వినియోగదారి '%s' అవసరమà±"
-#~ msgid "Requires value"
-#~ msgstr "విలà±à°µ అవసరమà±"
-+#~ msgid "Modify SELinux User"
-+#~ msgstr "SELinux వినియోగదారిని సవరించà±à°®à±"
-
- #~ msgid ""
- #~ "\n"
-@@ -3476,37 +3497,12 @@
- #~ "semodule -i %s\n"
- #~ "\n"
-
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "\n"
+-#~ "semodule -i %s\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "\n"
+-#~ "semodule -i %s\n"
+-#~ "\n"
+-
-#~ msgid "Invalid prefix %s"
-#~ msgstr "సరికాని à°ªà±à°°à°¿à°«à°¿à°•à±à°¸à±â€ %s"
-
@@ -147554,24 +156275,19 @@
-
-#~ msgid "Use this checkbutton if your app calls bindresvport with 0."
-#~ msgstr "మీ app కాలà±à°¸à±â€ bindresvport 0 తో ఉంటే à°ˆ చెకà±â€Œà°¬à°Ÿà°¨à±â€Œà°¨à± ఉపయోగించండి."
-+#~ msgid "translations not supported on non-MLS machines"
-+#~ msgstr "non-MLS మిషనà±à°¸à±â€ పైన à°…à°¨à±à°µà°¾à°¦à°®à±à°²à± మదà±à°¦à°¤à±€à°¯à°¬à°¡à°µà±"
-
- #~ msgid ""
+-
+-#~ msgid ""
-#~ "Enforcing\n"
-#~ "Permissive\n"
-#~ "Disabled\n"
-+#~ "tcp\n"
-+#~ "udp"
- #~ msgstr ""
+-#~ msgstr ""
-#~ "బలవంతపà±\n"
-#~ "à°…à°¨à±à°®à°¤à°¿à°—à°²\n"
-#~ "అచేతనమైన\n"
-+#~ "tcp\n"
-+#~ "udp"
+Binary files nsapolicycoreutils/po/th.mo and policycoreutils-2.0.62/po/th.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.62/po/th.po
--- nsapolicycoreutils/po/th.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/th.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/th.po 2009-04-08 22:03:18.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -149512,9 +158228,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/tr.mo and policycoreutils-2.0.62/po/tr.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.62/po/tr.po
--- nsapolicycoreutils/po/tr.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/tr.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/tr.po 2009-04-08 22:03:18.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -151455,9 +160172,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/uk.mo and policycoreutils-2.0.62/po/uk.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.62/po/uk.po
--- nsapolicycoreutils/po/uk.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/uk.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/uk.po 2009-04-08 22:03:18.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -153438,9 +162156,10 @@
#~ msgid "Requires value"
#~ msgstr "Потрібно вказати значеннÑ"
+Binary files nsapolicycoreutils/po/ur.mo and policycoreutils-2.0.62/po/ur.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.62/po/ur.po
--- nsapolicycoreutils/po/ur.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/ur.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/ur.po 2009-04-08 22:03:18.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -155381,9 +164100,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/vi.mo and policycoreutils-2.0.62/po/vi.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.62/po/vi.po
--- nsapolicycoreutils/po/vi.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/vi.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/vi.po 2009-04-08 22:03:18.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -157324,9 +166044,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
msgstr ""
+Binary files nsapolicycoreutils/po/zh_CN.mo and policycoreutils-2.0.62/po/zh_CN.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.62/po/zh_CN.po
--- nsapolicycoreutils/po/zh_CN.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/zh_CN.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/zh_CN.po 2009-04-08 22:03:18.000000000 -0400
@@ -3,13 +3,13 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
#
@@ -159901,9 +168622,10 @@
#: ../gui/translationsPage.py:53
msgid "Sensitvity Level"
+Binary files nsapolicycoreutils/po/zh_TW.mo and policycoreutils-2.0.62/po/zh_TW.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.62/po/zh_TW.po
--- nsapolicycoreutils/po/zh_TW.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/zh_TW.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/zh_TW.po 2009-04-08 22:03:18.000000000 -0400
@@ -1,32 +1,31 @@
-# translation of policycoreutils.HEAD.po to Traditional Chinese
+# translation of policycoreutils.HEAD.po to
@@ -164999,9 +173721,10 @@
+msgid "SELinux user '%s' is required"
+msgstr "éœ€è¦ SELinux 用戶「%sã€"
+Binary files nsapolicycoreutils/po/zu.mo and policycoreutils-2.0.62/po/zu.mo differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.62/po/zu.po
--- nsapolicycoreutils/po/zu.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.62/po/zu.po 2009-03-31 08:54:57.000000000 -0400
++++ policycoreutils-2.0.62/po/zu.po 2009-04-08 22:03:18.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- policycoreutils-rhat.patch 31 Mar 2009 12:56:48 -0000 1.412
+++ policycoreutils-rhat.patch 9 Apr 2009 02:05:28 -0000 1.413
@@ -1,6 +1,108 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-2.0.62/debugfiles.list
+--- nsapolicycoreutils/debugfiles.list 1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.62/debugfiles.list 2009-04-03 14:13:23.000000000 -0400
+@@ -0,0 +1,64 @@
++%dir /usr/lib/debug
++%dir /usr/lib/debug/sbin
++%dir /usr/lib/debug/.build-id
++%dir /usr/lib/debug/.build-id/3d
++%dir /usr/lib/debug/.build-id/ec
++%dir /usr/lib/debug/.build-id/9d
++%dir /usr/lib/debug/.build-id/cb
++%dir /usr/lib/debug/.build-id/bc
++%dir /usr/lib/debug/.build-id/0a
++%dir /usr/lib/debug/.build-id/81
++%dir /usr/lib/debug/.build-id/ad
++%dir /usr/lib/debug/.build-id/7f
++%dir /usr/lib/debug/.build-id/f4
++%dir /usr/lib/debug/.build-id/15
++%dir /usr/lib/debug/.build-id/1d
++%dir /usr/lib/debug/.build-id/a8
++%dir /usr/lib/debug/.build-id/d3
++%dir /usr/lib/debug/usr
++%dir /usr/lib/debug/usr/sbin
++%dir /usr/lib/debug/usr/bin
++/usr/lib/debug/sbin/setfiles.debug
++/usr/lib/debug/sbin/restorecon.debug
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug
++/usr/lib/debug/usr/sbin/load_policy.debug
++/usr/lib/debug/usr/sbin/restorecond.debug
++/usr/lib/debug/usr/sbin/semodule.debug
++/usr/lib/debug/usr/sbin/sestatus.debug
++/usr/lib/debug/usr/sbin/setsebool.debug
++/usr/lib/debug/usr/sbin/open_init_pty.debug
++/usr/lib/debug/usr/sbin/run_init.debug
++/usr/lib/debug/usr/bin/semodule_package.debug
++/usr/lib/debug/usr/bin/newrole.debug
++/usr/lib/debug/usr/bin/semodule_link.debug
++/usr/lib/debug/usr/bin/semodule_deps.debug
++/usr/lib/debug/usr/bin/semodule_expand.debug
++/usr/lib/debug/usr/bin/secon.debug
++/usr/src/debug/policycoreutils-2.0.62
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/debuglinks.list policycoreutils-2.0.62/debuglinks.list
+--- nsapolicycoreutils/debuglinks.list 1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.62/debuglinks.list 2009-04-03 14:13:23.000000000 -0400
+@@ -0,0 +1,29 @@
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7 /sbin/setfiles
++/usr/lib/debug/.build-id/f4/3cc2016abf9b6152b720b604ffc7b05ada92b7.debug /usr/lib/debug/sbin/setfiles.debug
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70 /usr/sbin/open_init_pty
++/usr/lib/debug/.build-id/3d/c26411dac65290297678f68c7d65c43039df70.debug /usr/lib/debug/usr/sbin/open_init_pty.debug
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8 /usr/sbin/sestatus
++/usr/lib/debug/.build-id/15/cbead7609477306808e0d90860e7e0d69ccac8.debug /usr/lib/debug/usr/sbin/sestatus.debug
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401 /usr/sbin/semodule
++/usr/lib/debug/.build-id/81/4a2dc779e8dc03a30550b17393f4bf38cc3401.debug /usr/lib/debug/usr/sbin/semodule.debug
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9 /usr/sbin/load_policy
++/usr/lib/debug/.build-id/d3/a79f853588fb732304975cb781fe37f686e5b9.debug /usr/lib/debug/usr/sbin/load_policy.debug
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b /usr/sbin/run_init
++/usr/lib/debug/.build-id/a8/4bb87bec28cd2e948c72529f4640d56178107b.debug /usr/lib/debug/usr/sbin/run_init.debug
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a /usr/sbin/restorecond
++/usr/lib/debug/.build-id/7f/d8c1148b921ee7ce357dcc4827a35074d8744a.debug /usr/lib/debug/usr/sbin/restorecond.debug
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab /usr/sbin/setsebool
++/usr/lib/debug/.build-id/ec/2012afb3f104620e1d260c932419e6391474ab.debug /usr/lib/debug/usr/sbin/setsebool.debug
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865 /usr/bin/secon
++/usr/lib/debug/.build-id/bc/36b9f43fecf5bdb7cbc3780aea1de9a7192865.debug /usr/lib/debug/usr/bin/secon.debug
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f /usr/bin/newrole
++/usr/lib/debug/.build-id/1d/b4d0c26d77215c7e45aa7da8d6622ec413951f.debug /usr/lib/debug/usr/bin/newrole.debug
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082 /usr/bin/semodule_link
++/usr/lib/debug/.build-id/0a/2965fb8a1c2359677db2cd583f4caa9b79e082.debug /usr/lib/debug/usr/bin/semodule_link.debug
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be /usr/bin/semodule_expand
++/usr/lib/debug/.build-id/ad/d96fe93d52caa86fd8119e3a250b3ff1afc8be.debug /usr/lib/debug/usr/bin/semodule_expand.debug
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce /usr/bin/semodule_package
++/usr/lib/debug/.build-id/cb/29543b91147fcf47889d52fa8375c3a388dcce.debug /usr/lib/debug/usr/bin/semodule_package.debug
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665 /usr/bin/semodule_deps
++/usr/lib/debug/.build-id/9d/511790c5b6141b50c55b8fe8bc032d84827665.debug /usr/lib/debug/usr/bin/semodule_deps.debug
++/usr/lib/debug/sbin/restorecon.debug /usr/lib/debug/sbin/setfiles.debug
+Binary files nsapolicycoreutils/debugsources.list and policycoreutils-2.0.62/debugsources.list differ
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile
--- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.62/Makefile 2009-02-18 16:52:27.000000000 -0500
++++ policycoreutils-2.0.62/Makefile 2009-04-03 14:12:56.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -9,7 +111,7 @@
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf
--- nsapolicycoreutils/restorecond/restorecond.conf 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-02-23 11:32:21.000000000 -0500
++++ policycoreutils-2.0.62/restorecond/restorecond.conf 2009-04-03 14:12:56.000000000 -0400
@@ -5,3 +5,7 @@
/var/run/utmp
/var/log/wtmp
@@ -20,7 +122,7 @@
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/scripts/fixfiles 2009-02-19 10:07:49.000000000 -0500
++++ policycoreutils-2.0.62/scripts/fixfiles 2009-04-03 14:12:56.000000000 -0400
@@ -122,7 +122,7 @@
fi
if [ ! -z "$RPMFILES" ]; then
@@ -32,8 +134,98 @@
fi
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/semanage 2009-03-12 09:22:45.000000000 -0400
-@@ -464,10 +464,10 @@
++++ policycoreutils-2.0.62/semanage/semanage 2009-04-08 21:39:50.000000000 -0400
+@@ -50,7 +50,7 @@
+ semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
+ semanage interface -{a|d|m} [-tr] interface_spec
+ semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
+-semanage fcontext -{a|d|m} [-frst] file_spec
++semanage fcontext -{a|d|m} [-frst] [-e path ] file_spec
+ semanage translation -{a|d|m} [-T] level
+ semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
+ semanage permissive -{d|a} type
+@@ -84,6 +84,7 @@
+ -F, --file Treat target as an input file for command, change multiple settings
+ -p, --proto Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
+ -M, --mask Netmask
++ -e, --equil Make target equil to this paths labeling
+ -P, --prefix Prefix for home directory labeling
+ -L, --level Default SELinux Level (MLS/MCS Systems only)
+ -R, --roles SELinux Roles (ex: "sysadm_r staff_r")
+@@ -115,7 +116,7 @@
+ valid_option["node"] = []
+ valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
+ valid_option["fcontext"] = []
+- valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range']
++ valid_option["fcontext"] += valid_everyone + [ '-e', '--equil', '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range']
+ valid_option["translation"] = []
+ valid_option["translation"] += valid_everyone + [ '-T', '--trans' ]
+ valid_option["boolean"] = []
+@@ -192,6 +193,7 @@
+ locallist = False
+ use_file = False
+ store = ""
++ equil=""
+
+ object = argv[0]
+ option_dict=get_options()
+@@ -201,10 +203,11 @@
+ args = argv[1:]
+
+ gopts, cmds = getopt.getopt(args,
+- '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
++ '01ade:f:i:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
+ ['add',
+ 'delete',
+ 'deleteall',
++ 'equil=',
+ 'ftype=',
+ 'file',
+ 'help',
+@@ -248,6 +251,9 @@
+ if o == "-f" or o == "--ftype":
+ ftype=a
+
++ if o == "-e" or o == "--equil":
++ equil=a
++
+ if o == "-F" or o == "--file":
+ use_file = True
+
+@@ -366,7 +372,10 @@
+ OBJECT.add(target, mask, proto, serange, setype)
+
+ if object == "fcontext":
+- OBJECT.add(target, setype, ftype, serange, seuser)
++ if equil == "":
++ OBJECT.add(target, setype, ftype, serange, seuser)
++ else:
++ OBJECT.add_equil(target, equil)
+ if object == "permissive":
+ OBJECT.add(target)
+
+@@ -396,7 +405,10 @@
+ OBJECT.modify(target, mask, proto, serange, setype)
+
+ if object == "fcontext":
+- OBJECT.modify(target, setype, ftype, serange, seuser)
++ if equil == "":
++ OBJECT.modify(target, setype, ftype, serange, seuser)
++ else:
++ OBJECT.modify_equil(target, equil)
+
+ return
+
+@@ -405,7 +417,7 @@
+ OBJECT.delete(target, proto)
+
+ elif object == "fcontext":
+- OBJECT.delete(target, ftype)
++ OBJECT.delete(target, ftype)
+
+ elif object == "node":
+ OBJECT.delete(target, mask, proto)
+@@ -464,10 +476,10 @@
else:
fd = open(input, 'r')
trans = seobject.semanageRecords(store)
@@ -48,7 +240,91 @@
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2008-11-14 17:10:15.000000000 -0500
-+++ policycoreutils-2.0.62/semanage/seobject.py 2009-03-31 08:54:25.000000000 -0400
++++ policycoreutils-2.0.62/semanage/seobject.py 2009-04-08 22:01:48.000000000 -0400
+@@ -23,14 +23,14 @@
+
+ import pwd, grp, string, selinux, tempfile, os, re, sys
+ from semanage import *;
+-PROGNAME="policycoreutils"
++PROGNAME = "policycoreutils"
+ import sepolgen.module as module
+
+ import gettext
+ gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
+ gettext.textdomain(PROGNAME)
+ try:
+- gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
++ gettext.install(PROGNAME, localedir = "/usr/share/locale", unicode = 1)
+ except IOError:
+ import __builtin__
+ __builtin__.__dict__['_'] = unicode
+@@ -96,7 +96,7 @@
+ self.audit_fd = audit.audit_open()
+
+ def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
+- audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],str(msg), name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
++ audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0], str(msg), name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
+ except:
+ class logger:
+ def log(self, success, msg, name = "", sename = "", serole = "", serange = "", old_sename = "", old_serole = "", old_serange = ""):
+@@ -104,7 +104,7 @@
+ message = "Successful: "
+ else:
+ message = "Failed: "
+- message += " %s name=%s" % (msg,name)
++ message += " %s name=%s" % (msg, name)
+ if sename != "":
+ message += " sename=" + sename
+ if old_sename != "":
+@@ -123,9 +123,9 @@
+
+ import xml.etree.ElementTree
+
+-booleans_dict={}
++booleans_dict = {}
+ try:
+- tree=xml.etree.ElementTree.parse("/usr/share/selinux/devel/policy.xml")
++ tree = xml.etree.ElementTree.parse("/usr/share/selinux/devel/policy.xml")
+ for l in tree.findall("layer"):
+ for m in l.findall("module"):
+ for b in m.findall("tunable"):
+@@ -160,12 +160,12 @@
+ cat_range = category + "(\." + category +")?"
+ categories = cat_range + "(\," + cat_range + ")*"
+ reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?"
+- return re.search("^" + reg +"$",raw)
++ return re.search("^" + reg +"$", raw)
+
+ def translate(raw, prepend = 1):
+- filler="a:b:c:"
++ filler = "a:b:c:"
+ if prepend == 1:
+- context = "%s%s" % (filler,raw)
++ context = "%s%s" % (filler, raw)
+ else:
+ context = raw
+ (rc, trans) = selinux.selinux_raw_to_trans_context(context)
+@@ -179,9 +179,9 @@
+ return trans
+
+ def untranslate(trans, prepend = 1):
+- filler="a:b:c:"
++ filler = "a:b:c:"
+ if prepend == 1:
+- context = "%s%s" % (filler,trans)
++ context = "%s%s" % (filler, trans)
+ else:
+ context = trans
+
+@@ -234,7 +234,7 @@
+ rec += "%s=%s\n" % (k, self.ddict[k])
+ return rec
+
+- def list(self,heading = 1, locallist = 0):
++ def list(self, heading = 1, locallist = 0):
+ if heading:
+ print "\n%-25s %s\n" % (_("Level"), _("Translation"))
+ keys = self.ddict.keys()
@@ -281,15 +281,20 @@
global handle
@@ -56,8 +332,9 @@
- self.transaction = True
self.sh = handle
else:
- self.sh=get_handle(store)
+- self.sh=get_handle(store)
- self.transaction = False
++ self.sh = get_handle(store)
+ self.transaction = False
def deleteall(self):
@@ -85,6 +362,15 @@
class permissiveRecords(semanageRecords):
def __init__(self, store):
semanageRecords.__init__(self, store)
+@@ -320,7 +331,7 @@
+ l.append(name.split("permissive_")[1])
+ return l
+
+- def list(self,heading = 1, locallist = 0):
++ def list(self, heading = 1, locallist = 0):
+ if heading:
+ print "\n%-25s\n" % (_("Permissive Types"))
+ for t in self.get_all():
@@ -328,6 +339,7 @@
@@ -93,6 +379,15 @@
name = "permissive_%s" % type
dirname = "/var/lib/selinux"
os.chdir(dirname)
+@@ -341,7 +353,7 @@
+
+ permissive %s;
+ """ % (name, type, type)
+- fd = open(filename,'w')
++ fd = open(filename, 'w')
+ fd.write(modtxt)
+ fd.close()
+ mc = module.ModuleCompiler()
@@ -351,16 +363,19 @@
fd.close()
@@ -104,7 +399,8 @@
+ if rc >= 0:
+ self.commit()
- for root, dirs, files in os.walk("tmp", topdown=False):
+- for root, dirs, files in os.walk("tmp", topdown=False):
++ for root, dirs, files in os.walk("tmp", topdown = False):
for name in files:
os.remove(os.path.join(root, name))
for name in dirs:
@@ -117,3 +413,577 @@
def delete(self, name):
for n in name.split():
+@@ -390,11 +405,11 @@
+ if sename == "":
+ sename = "user_u"
+
+- (rc,k) = semanage_seuser_key_create(self.sh, name)
++ (rc, k) = semanage_seuser_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+
+- (rc,exists) = semanage_seuser_exists(self.sh, k)
++ (rc, exists) = semanage_seuser_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+ if exists:
+@@ -410,7 +425,7 @@
+ except:
+ raise ValueError(_("Linux User %s does not exist") % name)
+
+- (rc,u) = semanage_seuser_create(self.sh)
++ (rc, u) = semanage_seuser_create(self.sh)
+ if rc < 0:
+ raise ValueError(_("Could not create login mapping for %s") % name)
+
+@@ -450,17 +465,17 @@
+ if sename == "" and serange == "":
+ raise ValueError(_("Requires seuser or serange"))
+
+- (rc,k) = semanage_seuser_key_create(self.sh, name)
++ (rc, k) = semanage_seuser_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+
+- (rc,exists) = semanage_seuser_exists(self.sh, k)
++ (rc, exists) = semanage_seuser_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+ if not exists:
+ raise ValueError(_("Login mapping for %s is not defined") % name)
+
+- (rc,u) = semanage_seuser_query(self.sh, k)
++ (rc, u) = semanage_seuser_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query seuser for %s") % name)
+
+@@ -483,7 +498,7 @@
+ semanage_seuser_key_free(k)
+ semanage_seuser_free(u)
+
+- mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
++ mylog.log(1, "modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange);
+
+ def modify(self, name, sename = "", serange = ""):
+ try:
+@@ -492,21 +507,21 @@
+ self.commit()
+
+ except ValueError, error:
+- mylog.log(0,"modify selinux user mapping", name, sename,"", serange, "", "", "");
++ mylog.log(0, "modify selinux user mapping", name, sename, "", serange, "", "", "");
+ raise error
+
+ def __delete(self, name):
+- (rc,k) = semanage_seuser_key_create(self.sh, name)
++ (rc, k) = semanage_seuser_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+
+- (rc,exists) = semanage_seuser_exists(self.sh, k)
++ (rc, exists) = semanage_seuser_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+ if not exists:
+ raise ValueError(_("Login mapping for %s is not defined") % name)
+
+- (rc,exists) = semanage_seuser_exists_local(self.sh, k)
++ (rc, exists) = semanage_seuser_exists_local(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if login mapping for %s is defined") % name)
+ if not exists:
+@@ -525,10 +540,10 @@
+ self.commit()
+
+ except ValueError, error:
+- mylog.log(0,"delete SELinux user mapping", name);
++ mylog.log(0, "delete SELinux user mapping", name);
+ raise error
+
+- mylog.log(1,"delete SELinux user mapping", name);
++ mylog.log(1, "delete SELinux user mapping", name);
+
+ def get_all(self, locallist = 0):
+ ddict = {}
+@@ -578,17 +593,17 @@
+ if len(roles) < 1:
+ raise ValueError(_("You must add at least one role for %s") % name)
+
+- (rc,k) = semanage_user_key_create(self.sh, name)
++ (rc, k) = semanage_user_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+
+- (rc,exists) = semanage_user_exists(self.sh, k)
++ (rc, exists) = semanage_user_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+ if exists:
+ raise ValueError(_("SELinux user %s is already defined") % name)
+
+- (rc,u) = semanage_user_create(self.sh)
++ (rc, u) = semanage_user_create(self.sh)
+ if rc < 0:
+ raise ValueError(_("Could not create SELinux user for %s") % name)
+
+@@ -612,7 +627,7 @@
+ rc = semanage_user_set_prefix(self.sh, u, prefix)
+ if rc < 0:
+ raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
+- (rc,key) = semanage_user_key_extract(self.sh,u)
++ (rc, key) = semanage_user_key_extract(self.sh,u)
+ if rc < 0:
+ raise ValueError(_("Could not extract key for %s") % name)
+
+@@ -645,17 +660,17 @@
+ else:
+ raise ValueError(_("Requires prefix or roles"))
+
+- (rc,k) = semanage_user_key_create(self.sh, name)
++ (rc, k) = semanage_user_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+
+- (rc,exists) = semanage_user_exists(self.sh, k)
++ (rc, exists) = semanage_user_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+ if not exists:
+ raise ValueError(_("SELinux user %s is not defined") % name)
+
+- (rc,u) = semanage_user_query(self.sh, k)
++ (rc, u) = semanage_user_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query user for %s") % name)
+
+@@ -703,17 +718,17 @@
+ raise error
+
+ def __delete(self, name):
+- (rc,k) = semanage_user_key_create(self.sh, name)
++ (rc, k) = semanage_user_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+
+- (rc,exists) = semanage_user_exists(self.sh, k)
++ (rc, exists) = semanage_user_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+ if not exists:
+ raise ValueError(_("SELinux user %s is not defined") % name)
+
+- (rc,exists) = semanage_user_exists_local(self.sh, k)
++ (rc, exists) = semanage_user_exists_local(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if SELinux user %s is defined") % name)
+ if not exists:
+@@ -795,7 +810,7 @@
+ low = int(ports[0])
+ high = int(ports[1])
+
+- (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d)
++ (rc, k) = semanage_port_key_create(self.sh, low, high, proto_d)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s/%s") % (proto, port))
+ return ( k, proto_d, low, high )
+@@ -812,13 +827,13 @@
+
+ ( k, proto_d, low, high ) = self.__genkey(port, proto)
+
+- (rc,exists) = semanage_port_exists(self.sh, k)
++ (rc, exists) = semanage_port_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ if exists:
+ raise ValueError(_("Port %s/%s already defined") % (proto, port))
+
+- (rc,p) = semanage_port_create(self.sh)
++ (rc, p) = semanage_port_create(self.sh)
+ if rc < 0:
+ raise ValueError(_("Could not create port for %s/%s") % (proto, port))
+
+@@ -871,13 +886,13 @@
+
+ ( k, proto_d, low, high ) = self.__genkey(port, proto)
+
+- (rc,exists) = semanage_port_exists(self.sh, k)
++ (rc, exists) = semanage_port_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ if not exists:
+ raise ValueError(_("Port %s/%s is not defined") % (proto,port))
+
+- (rc,p) = semanage_port_query(self.sh, k)
++ (rc, p) = semanage_port_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query port %s/%s") % (proto, port))
+
+@@ -926,13 +941,13 @@
+
+ def __delete(self, port, proto):
+ ( k, proto_d, low, high ) = self.__genkey(port, proto)
+- (rc,exists) = semanage_port_exists(self.sh, k)
++ (rc, exists) = semanage_port_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ if not exists:
+ raise ValueError(_("Port %s/%s is not defined") % (proto, port))
+
+- (rc,exists) = semanage_port_exists_local(self.sh, k)
++ (rc, exists) = semanage_port_exists_local(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
+ if not exists:
+@@ -1038,17 +1053,17 @@
+ if ctype == "":
+ raise ValueError(_("SELinux Type is required"))
+
+- (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
++ (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % addr)
+ if rc < 0:
+ raise ValueError(_("Could not check if addr %s is defined") % addr)
+
+- (rc,exists) = semanage_node_exists(self.sh, k)
++ (rc, exists) = semanage_node_exists(self.sh, k)
+ if exists:
+ raise ValueError(_("Addr %s already defined") % addr)
+
+- (rc,node) = semanage_node_create(self.sh)
++ (rc, node) = semanage_node_create(self.sh)
+ if rc < 0:
+ raise ValueError(_("Could not create addr for %s") % addr)
+
+@@ -1113,17 +1128,17 @@
+ if serange == "" and setype == "":
+ raise ValueError(_("Requires setype or serange"))
+
+- (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
++ (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % addr)
+
+- (rc,exists) = semanage_node_exists(self.sh, k)
++ (rc, exists) = semanage_node_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if addr %s is defined") % addr)
+ if not exists:
+ raise ValueError(_("Addr %s is not defined") % addr)
+
+- (rc,node) = semanage_node_query(self.sh, k)
++ (rc, node) = semanage_node_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query addr %s") % addr)
+
+@@ -1160,17 +1175,17 @@
+ else:
+ raise ValueError(_("Unknown or missing protocol"))
+
+- (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
++ (rc, k) = semanage_node_key_create(self.sh, addr, mask, proto)
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % addr)
+
+- (rc,exists) = semanage_node_exists(self.sh, k)
++ (rc, exists) = semanage_node_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if addr %s is defined") % addr)
+ if not exists:
+ raise ValueError(_("Addr %s is not defined") % addr)
+
+- (rc,exists) = semanage_node_exists_local(self.sh, k)
++ (rc, exists) = semanage_node_exists_local(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if addr %s is defined") % addr)
+ if not exists:
+@@ -1240,17 +1255,17 @@
+ if ctype == "":
+ raise ValueError(_("SELinux Type is required"))
+
+- (rc,k) = semanage_iface_key_create(self.sh, interface)
++ (rc, k) = semanage_iface_key_create(self.sh, interface)
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % interface)
+
+- (rc,exists) = semanage_iface_exists(self.sh, k)
++ (rc, exists) = semanage_iface_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if interface %s is defined") % interface)
+ if exists:
+ raise ValueError(_("Interface %s already defined") % interface)
+
+- (rc,iface) = semanage_iface_create(self.sh)
++ (rc, iface) = semanage_iface_create(self.sh)
+ if rc < 0:
+ raise ValueError(_("Could not create interface for %s") % interface)
+
+@@ -1301,17 +1316,17 @@
+ if serange == "" and setype == "":
+ raise ValueError(_("Requires setype or serange"))
+
+- (rc,k) = semanage_iface_key_create(self.sh, interface)
++ (rc, k) = semanage_iface_key_create(self.sh, interface)
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % interface)
+
+- (rc,exists) = semanage_iface_exists(self.sh, k)
++ (rc, exists) = semanage_iface_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if interface %s is defined") % interface)
+ if not exists:
+ raise ValueError(_("Interface %s is not defined") % interface)
+
+- (rc,iface) = semanage_iface_query(self.sh, k)
++ (rc, iface) = semanage_iface_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query interface %s") % interface)
+
+@@ -1335,17 +1350,17 @@
+ self.commit()
+
+ def __delete(self, interface):
+- (rc,k) = semanage_iface_key_create(self.sh, interface)
++ (rc, k) = semanage_iface_key_create(self.sh, interface)
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % interface)
+
+- (rc,exists) = semanage_iface_exists(self.sh, k)
++ (rc, exists) = semanage_iface_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if interface %s is defined") % interface)
+ if not exists:
+ raise ValueError(_("Interface %s is not defined") % interface)
+
+- (rc,exists) = semanage_iface_exists_local(self.sh, k)
++ (rc, exists) = semanage_iface_exists_local(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if interface %s is defined") % interface)
+ if not exists:
+@@ -1393,6 +1408,40 @@
+ class fcontextRecords(semanageRecords):
+ def __init__(self, store = ""):
+ semanageRecords.__init__(self, store)
++ self.equiv = {}
++ fd = open(selinux.selinux_file_context_subs_path(), "r")
++ for i in fd.readlines():
++ src, dst = i.split()
++ self.equiv[src] = dst
++ fd.close()
++ self.equil_ind = False
++
++ def commit(self):
++ if self.equil_ind:
++ tmpfile = "%s.tmp" % selinux.selinux_file_context_subs_path()
++ fd = open(tmpfile, "w")
++ for src in self.equiv.keys():
++ fd.write("%s %s\n" % (src, self.equiv[src]))
++ fd.close()
++ os.rename(tmpfile,selinux.selinux_file_context_subs_path())
++ self.equil_ind = False
++ semanageRecords.commit(self)
++
++ def add_equil(self, src, dst):
++ self.begin()
++ if src in self.equiv.keys():
++ raise ValueError(_("Equivalence class for %s already exists") % src)
++ self.equiv[src] = dst
++ self.equil_ind = True
++ self.commit()
++
++ def modify_equil(self, src, dst):
++ self.begin()
++ if src not in self.equiv.keys():
++ raise ValueError(_("Equivalence class for %s does not exists") % src)
++ self.equiv[src] = dst
++ self.equil_ind = True
++ self.commit()
+
+ def createcon(self, target, seuser = "system_u"):
+ (rc, con) = semanage_context_create(self.sh)
+@@ -1429,23 +1478,23 @@
+ if type == "":
+ raise ValueError(_("SELinux Type is required"))
+
+- (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
++ (rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ if rc < 0:
+ raise ValueError(_("Could not create key for %s") % target)
+
+- (rc,exists) = semanage_fcontext_exists(self.sh, k)
++ (rc, exists) = semanage_fcontext_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if file context for %s is defined") % target)
+
+ if not exists:
+- (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++ (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)
+
+ if exists:
+ raise ValueError(_("File context for %s already defined") % target)
+
+- (rc,fcontext) = semanage_fcontext_create(self.sh)
++ (rc, fcontext) = semanage_fcontext_create(self.sh)
+ if rc < 0:
+ raise ValueError(_("Could not create file context for %s") % target)
+
+@@ -1486,21 +1535,21 @@
+ raise ValueError(_("Requires setype, serange or seuser"))
+ self.validate(target)
+
+- (rc,k) = semanage_fcontext_key_create(self.sh, target, 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)
+
+- (rc,exists) = semanage_fcontext_exists(self.sh, k)
++ (rc, exists) = semanage_fcontext_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if file context for %s is defined") % target)
+ if not exists:
+- (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++ (rc, exists) = semanage_fcontext_exists_local(self.sh, k)
+ if not exists:
+ raise ValueError(_("File context for %s is not defined") % target)
+
+- (rc,fcontext) = semanage_fcontext_query_local(self.sh, k)
++ (rc, fcontext) = semanage_fcontext_query_local(self.sh, k)
+ if rc < 0:
+- (rc,fcontext) = semanage_fcontext_query(self.sh, k)
++ (rc, fcontext) = semanage_fcontext_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query file context for %s") % target)
+
+@@ -1550,7 +1599,7 @@
+ target = semanage_fcontext_get_expr(fcontext)
+ ftype = semanage_fcontext_get_type(fcontext)
+ ftype_str = semanage_fcontext_get_type_str(ftype)
+- (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
++ (rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % target)
+
+@@ -1558,19 +1607,26 @@
+ if rc < 0:
+ raise ValueError(_("Could not delete the file context %s") % target)
+ semanage_fcontext_key_free(k)
+-
++
++ self.equiv = {}
++ self.equil_ind = True
+ self.commit()
+
+ def __delete(self, target, ftype):
+- (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
++ if target in self.equiv.keys():
++ self.equiv.pop(target)
++ self.equil_ind = True
++ return
++
++ (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)
+
+- (rc,exists) = semanage_fcontext_exists_local(self.sh, k)
++ (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)
+ if not exists:
+- (rc,exists) = semanage_fcontext_exists(self.sh, k)
++ (rc, exists) = semanage_fcontext_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if file context for %s is defined") % target)
+ if exists:
+@@ -1617,11 +1673,11 @@
+ return ddict
+
+ def list(self, heading = 1, locallist = 0 ):
+- if heading:
+- print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+ fcon_dict = self.get_all(locallist)
+ keys = fcon_dict.keys()
+ keys.sort()
++ if len(keys) > 0 and heading:
++ print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+ for k in keys:
+ if fcon_dict[k]:
+ if is_mls_enabled:
+@@ -1630,11 +1686,17 @@
+ print "%-50s %-18s %s:%s:%s " % (k[0], k[1], fcon_dict[k][0], fcon_dict[k][1],fcon_dict[k][2])
+ else:
+ print "%-50s %-18s <<None>>" % (k[0], k[1])
++ if len(self.equiv.keys()) > 0:
++ if heading:
++ print _("\nSELinux fcontext Equivalence \n")
++
++ for src in self.equiv.keys():
++ print "%s == %s" % (src, self.equiv[src])
+
+ class booleanRecords(semanageRecords):
+ def __init__(self, store = ""):
+ semanageRecords.__init__(self, store)
+- self.dict={}
++ self.dict = {}
+ self.dict["TRUE"] = 1
+ self.dict["FALSE"] = 0
+ self.dict["ON"] = 1
+@@ -1643,16 +1705,16 @@
+ self.dict["0"] = 0
+
+ def __mod(self, name, value):
+- (rc,k) = semanage_bool_key_create(self.sh, name)
++ (rc, k) = semanage_bool_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+- (rc,exists) = semanage_bool_exists(self.sh, k)
++ (rc, exists) = semanage_bool_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if boolean %s is defined") % name)
+ if not exists:
+ raise ValueError(_("Boolean %s is not defined") % name)
+
+- (rc,b) = semanage_bool_query(self.sh, k)
++ (rc, b) = semanage_bool_query(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not query file context %s") % name)
+
+@@ -1670,7 +1732,7 @@
+ semanage_bool_key_free(k)
+ semanage_bool_free(b)
+
+- def modify(self, name, value=None, use_file=False):
++ def modify(self, name, value = None, use_file = False):
+
+ self.begin()
+
+@@ -1694,16 +1756,16 @@
+
+ def __delete(self, name):
+
+- (rc,k) = semanage_bool_key_create(self.sh, name)
++ (rc, k) = semanage_bool_key_create(self.sh, name)
+ if rc < 0:
+ raise ValueError(_("Could not create a key for %s") % name)
+- (rc,exists) = semanage_bool_exists(self.sh, k)
++ (rc, exists) = semanage_bool_exists(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if boolean %s is defined") % name)
+ if not exists:
+ raise ValueError(_("Boolean %s is not defined") % name)
+
+- (rc,exists) = semanage_bool_exists_local(self.sh, k)
++ (rc, exists) = semanage_bool_exists_local(self.sh, k)
+ if rc < 0:
+ raise ValueError(_("Could not check if boolean %s is defined") % name)
+ if not exists:
+@@ -1762,7 +1824,7 @@
+ return _("unknown")
+
+ def list(self, heading = True, locallist = False, use_file = False):
+- on_off = (_("off"),_("on"))
++ on_off = (_("off"), _("on"))
+ if use_file:
+ ddict = self.get_all(locallist)
+ keys = ddict.keys()
policycoreutils-sepolgen.patch:
Index: policycoreutils-sepolgen.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-sepolgen.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policycoreutils-sepolgen.patch 18 Feb 2009 21:54:39 -0000 1.21
+++ policycoreutils-sepolgen.patch 9 Apr 2009 02:05:30 -0000 1.22
@@ -1,3 +1,15 @@
+diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/access.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py
+--- nsasepolgen/src/sepolgen/access.py 2009-01-13 08:45:35.000000000 -0500
++++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/access.py 2009-04-01 10:03:43.000000000 -0400
+@@ -313,7 +313,7 @@
+
+ def __len__(self):
+ """Return the unique number of role allow statements."""
+- return len(self.role_type.keys())
++ return len(self.role_types.keys())
+
+ def add(self, role, type):
+ if self.role_types.has_key(role):
diff --exclude-from=exclude -N -u -r nsasepolgen/src/sepolgen/refparser.py policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py
--- nsasepolgen/src/sepolgen/refparser.py 2008-08-28 09:34:24.000000000 -0400
+++ policycoreutils-2.0.62/sepolgen-1.0.16/src/sepolgen/refparser.py 2009-02-18 16:52:27.000000000 -0500
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -r1.599 -r1.600
--- policycoreutils.spec 31 Mar 2009 12:56:49 -0000 1.599
+++ policycoreutils.spec 9 Apr 2009 02:05:30 -0000 1.600
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.62
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,10 @@
fi
%changelog
+* Wed Apr 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-8
+- Update po files
+- Add --equiv command for semanage
+
* Tue Mar 31 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-7
- Cleanup creation of permissive domains
- Update po files
- Previous message (by thread): rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.26.0-support-touchpads.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.98, 1.99
- Next message (by thread): rpms/rdiff-backup/F-10 rdiff-backup.spec, 1.27, 1.28 sources, 1.14, 1.15 .cvsignore, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list