rpms/policycoreutils/devel policycoreutils-po.patch, 1.55, 1.56 policycoreutils-rhat.patch, 1.440, 1.441 policycoreutils.spec, 1.639, 1.640
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Sep 14 19:39:20 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14819
Modified Files:
policycoreutils-po.patch policycoreutils-rhat.patch
policycoreutils.spec
Log Message:
* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-3
- Fix restorecond script to use force-reload
policycoreutils-po.patch:
Makefile | 28
POTFILES | 28
POTFILES.in | 1
af.po | 2449 +++++++++++++++++++++++--
am.po | 2449 +++++++++++++++++++++++--
ar.po | 2449 +++++++++++++++++++++++--
as.po | 3499 ++++++++++++++++++++++--------------
be.po | 2449 +++++++++++++++++++++++--
bg.po | 3605 ++++++++++++++++++++++---------------
bn.po | 2449 +++++++++++++++++++++++--
bn_IN.po | 4066 ++++++++++++++++++++++++------------------
bs.po | 2505 +++++++++++++++++++++++---
ca.po | 2906 +++++++++++++++++++++++++-----
cs.po | 2841 ++++++++++++++++++++++++-----
cy.po | 2449 +++++++++++++++++++++++--
da.po | 3128 +++++++++++++++++++++++++++-----
de.po | 4298 +++++++++++++++++++++++++-------------------
el.po | 2512 +++++++++++++++++++++++---
en_GB.po | 2505 +++++++++++++++++++++++---
es.po | 4575 ++++++++++++++++++++++++++---------------------
et.po | 2447 +++++++++++++++++++++++--
eu_ES.po | 2449 +++++++++++++++++++++++--
fa.po | 2449 +++++++++++++++++++++++--
fi.po | 3158 ++++++++++++++++++++++++++++----
fr.po | 3856 +++++++++++++++++++++++-----------------
gl.po | 2447 +++++++++++++++++++++++--
gu.po | 4130 ++++++++++++++++++++++++------------------
he.po | 2449 +++++++++++++++++++++++--
hi.po | 4117 ++++++++++++++++++++++++------------------
hr.po | 2997 ++++++++++++++++++++-----------
hu.po | 3071 +++++++++++++++++++++++++++----
hy.po | 2449 +++++++++++++++++++++++--
id.po | 2447 +++++++++++++++++++++++--
is.po | 2449 +++++++++++++++++++++++--
it.po | 4531 ++++++++++++++++++++++++++---------------------
ja.po | 4183 ++++++++++++++++++++++++-------------------
ka.po | 2449 +++++++++++++++++++++++--
kn.po | 3841 ++++++++++-----------------------------
ko.po | 2793 ++++++++++++++++++++++++-----
ku.po | 2449 +++++++++++++++++++++++--
lo.po | 2449 +++++++++++++++++++++++--
lt.po | 2449 +++++++++++++++++++++++--
lv.po | 2449 +++++++++++++++++++++++--
mai.po | 3462 ++++++++++++++++++++++++++++++++++++
mk.po | 2505 +++++++++++++++++++++++---
ml.po | 4274 ++++++++++++++++++++++++--------------------
mr.po | 4156 ++++++++++++++++++++++++-------------------
ms.po | 2498 +++++++++++++++++++++++--
my.po | 2449 +++++++++++++++++++++++--
nb.po | 2485 +++++++++++++++++++++++--
nl.po | 2920 ++++++++++++++++++++++++------
nn.po | 2449 +++++++++++++++++++++++--
no.po | 1272 -------------
nso.po | 2449 +++++++++++++++++++++++--
or.po | 3984 +++++++++++++++++++++++------------------
pa.po | 4075 +++++++++++++++++++++++-------------------
pl.po | 4014 +++++++++++++++++++++++------------------
policycoreutils.pot | 2431 +++++++++++++++++++++++--
pt.po | 4999 ++++++++++++++++++++++++++++------------------------
pt_BR.po | 4979 ++++++++++++++++++++++++++++-----------------------
ro.po | 2449 +++++++++++++++++++++++--
ru.po | 3468 +++++++++++++++++++++++-------------
si.po | 2449 +++++++++++++++++++++++--
sk.po | 2505 +++++++++++++++++++++++---
sl.po | 2449 +++++++++++++++++++++++--
sq.po | 2449 +++++++++++++++++++++++--
sr.po | 4125 ++++++++++++++++++++++++------------------
sr at latin.po | 4135 ++++++++++++++++++++++++-------------------
sv.po | 3165 ++++++++++++++++++++++----------
ta.po | 3935 ++++++++++++++++++++++++++--------------
te.po | 4069 +++++++++++++++++++++++-------------------
th.po | 2449 +++++++++++++++++++++++--
tr.po | 2449 +++++++++++++++++++++++--
uk.po | 2505 +++++++++++++++++++++++---
ur.po | 2449 +++++++++++++++++++++++--
vi.po | 2449 +++++++++++++++++++++++--
zh_CN.po | 3887 +++++++++++++++++++++++-----------------
zh_TW.po | 4174 ++++++++++++++++++++++++-------------------
zu.po | 2449 +++++++++++++++++++++++--
79 files changed, 173328 insertions(+), 59781 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.55 -r 1.56 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- policycoreutils-po.patch 8 Sep 2009 14:15:50 -0000 1.55
+++ policycoreutils-po.patch 14 Sep 2009 19:39:09 -0000 1.56
@@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.73/po/af.po
--- nsapolicycoreutils/po/af.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/af.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/af.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -3047,7 +3047,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-2.0.73/po/am.po
--- nsapolicycoreutils/po/am.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/am.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/am.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -6094,7 +6094,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-2.0.73/po/ar.po
--- nsapolicycoreutils/po/ar.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ar.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/ar.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -9141,7 +9141,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-2.0.73/po/as.po
--- nsapolicycoreutils/po/as.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/as.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/as.po 2009-09-14 15:37:43.000000000 -0400
@@ -1,23 +1,23 @@
-# translation of as.po to Assamese
+# translation of policycoreutils.HEAD.po to Assamese
@@ -13728,7 +13728,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ msgstr "সà§à¦¤à§°"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-2.0.73/po/be.po
--- nsapolicycoreutils/po/be.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/be.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/be.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -16775,7 +16775,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-2.0.73/po/bg.po
--- nsapolicycoreutils/po/bg.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bg.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bg.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -21344,7 +21344,7 @@ diff --exclude-from=exclude -N -u -r nsa
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-2.0.73/po/bn_IN.po
--- nsapolicycoreutils/po/bn_IN.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn_IN.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bn_IN.po 2009-09-14 15:37:43.000000000 -0400
@@ -9,10 +9,10 @@
msgstr ""
"Project-Id-Version: policycoreutils.HEAD\n"
@@ -26105,7 +26105,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ "Disabled\n"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-2.0.73/po/bn.po
--- nsapolicycoreutils/po/bn.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bn.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bn.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -29152,7 +29152,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-2.0.73/po/bs.po
--- nsapolicycoreutils/po/bs.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/bs.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/bs.po 2009-09-14 15:37:43.000000000 -0400
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: bs\n"
@@ -32289,7 +32289,7 @@ diff --exclude-from=exclude -N -u -r nsa
#~ msgstr "Zahtijeva vrijednost"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-2.0.73/po/ca.po
--- nsapolicycoreutils/po/ca.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ca.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/ca.po 2009-09-14 15:37:43.000000000 -0400
@@ -5,6 +5,8 @@
#
# Josep Puigdemont Casamajó <josep.puigdemont at gmail.com>, 2006.
@@ -35813,7 +35813,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ msgstr "Error en les opcions: %s "
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-2.0.73/po/cs.po
--- nsapolicycoreutils/po/cs.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cs.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/cs.po 2009-09-14 15:37:43.000000000 -0400
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: cs\n"
@@ -39435,7 +39435,7 @@ diff --exclude-from=exclude -N -u -r nsa
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-2.0.73/po/cy.po
--- nsapolicycoreutils/po/cy.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/cy.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/cy.po 2009-09-14 15:37:43.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -42482,7 +42482,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-2.0.73/po/da.po
--- nsapolicycoreutils/po/da.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/da.po 2009-09-08 09:38:58.000000000 -0400
++++ policycoreutils-2.0.73/po/da.po 2009-09-14 15:37:43.000000000 -0400
@@ -1,24 +1,25 @@
-# translation of da.po to
-# Danish messages for policycoreutils.
@@ -46378,13 +46378,15 @@ diff --exclude-from=exclude -N -u -r nsa
#~ "semodule -i %s.pp\n"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-2.0.73/po/de.po
--- nsapolicycoreutils/po/de.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/de.po 2009-09-08 09:38:58.000000000 -0400
-@@ -1,4 +1,3 @@
++++ policycoreutils-2.0.73/po/de.po 2009-09-14 15:37:43.000000000 -0400
+@@ -1,28 +1,30 @@
-# translation of policycoreutils.HEAD.de.po to German
++# translation of policycoreutils.HEAD.de.po to
# German translation of policycoreutils.
- # Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+-# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ #
#
-@@ -6,23 +5,24 @@
# Holger Wansing <linux at wansing-online.de>, 2006.
# Timo Trinks <ttrinks at redhat.com>, 2006, 2007.
# Michael Schönitzer <michael at schoenitzer.de>, 2007.
@@ -46393,6 +46395,7 @@ diff --exclude-from=exclude -N -u -r nsa
# Timo Trinks <ttrinks at redhat.com>, 2008.
# Daniela Kugelmann <dkugelma at redhat.com >, 2008.
+# Michael Münch <micm at fedoraproject.org.org>, 2009.
++# Hedda Peters <hpeters at redhat.com>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: policycoreutils.HEAD.de\n"
@@ -46402,20 +46405,20 @@ diff --exclude-from=exclude -N -u -r nsa
-"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
-"Language-Team: German <i18 at redhat.com>\n"
+"POT-Creation-Date: 2008-09-09 13:24-0400\n"
-+"PO-Revision-Date: 2009-07-11 10:02+0200\n"
-+"Last-Translator: Michael Münch <micm at fedoraproject.org>\n"
-+"Language-Team: German <fedora-trans-de at redhat.com>\n"
++"PO-Revision-Date: 2009-09-14 17:02+1000\n"
++"Last-Translator: Hedda Peters <hpeters at redhat.com>\n"
++"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: German\n"
-+"X-Generator: Lokalize 1.0\n"
++"X-Generator: KBabel 1.11.4\n"
#: ../run_init/run_init.c:67
msgid ""
-@@ -31,11 +31,11 @@
+@@ -31,11 +33,11 @@
" <args ...> are the arguments to that script."
msgstr ""
"VERWENDUNG: run_init <script> <args ...>\n"
@@ -46430,7 +46433,7 @@ diff --exclude-from=exclude -N -u -r nsa
#, c-format
msgid "failed to initialize PAM\n"
msgstr "Initialisieren von PAM fehlgeschlagen\n"
-@@ -45,16 +45,19 @@
+@@ -45,16 +47,19 @@
msgid "failed to get account information\n"
msgstr "Konnte keine Account-Informationen abrufen\n"
@@ -46453,14 +46456,14 @@ diff --exclude-from=exclude -N -u -r nsa
#, c-format
msgid "getpass cannot open /dev/tty\n"
msgstr "getpass kann /dev/tty nicht öffnen\n"
-@@ -77,16 +80,15 @@
+@@ -77,16 +82,15 @@
#: ../run_init/run_init.c:361
#, c-format
msgid "Sorry, run_init may be used only on a SELinux kernel.\n"
-msgstr ""
-"Entschuldigung, run_init sollte nur auf einem SELinux-Kernel benutzt "
-"werden.\n"
-+msgstr "Entschuldigung, run_init sollte nur auf einem SELinux-Kernel benutzt werden.\n"
[...6388 lines suppressed...]
-#~ msgid "Disable SELinux protection for squid daemon"
@@ -220071,7 +220297,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
+#: ../gui/selinux.tbl:173
+msgid "Disable SELinux protection for setroubleshoot daemon"
-+msgstr "ïÔËÌÀÞÉÔØ ÚÁÝÉÝÔÕ SELinux ÄÌÑ ÄÅÍÏÎÁ setroubleshoot"
++msgstr "ïÔËÌÀÞÉÔØ ÚÁÝÉÔÕ SELinux ÄÌÑ ÄÅÍÏÎÁ setroubleshoot"
+
+#: ../gui/selinux.tbl:174
+msgid "Disable SELinux protection for slapd daemon"
@@ -220167,7 +220393,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
+#: ../gui/selinux.tbl:192
+msgid "Disable SELinux protection for swat daemon"
-+msgstr "ïÔËÀÞÉÔØ ÚÁÝÉÔÕ SELinux ÄÌÑ ÄÅÍÏÎÁ swat"
++msgstr "ïÔËÌÀÞÉÔØ ÚÁÝÉÔÕ SELinux ÄÌÑ ÄÅÍÏÎÁ swat"
+
+#: ../gui/selinux.tbl:193
+msgid "Disable SELinux protection for sxid daemon"
@@ -220397,7 +220623,7 @@ diff --exclude-from=exclude -N -u -r nsa
+#: ../gui/selinux.tbl:233
+msgid "Allow SELinux webadm user to read unprivileged users home directories"
+msgstr ""
-+"òÁÚÒÅÛÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑÀ webadm ÏÓÕÝÅÓÔ×ÌÑÔØ ÞÔÅÎÉÅ ÄÏÍÁÛÎÉÈ ËÁÔÁÌÏÇÏ× "
++"òÁÚÒÅÛÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÀ webadm ÏÓÕÝÅÓÔ×ÌÑÔØ ÞÔÅÎÉÅ ÄÏÍÁÛÎÉÈ ËÁÔÁÌÏÇÏ× "
+"ÎÅÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
-#~ msgid "Delete %s"
@@ -220419,7 +220645,7 @@ diff --exclude-from=exclude -N -u -r nsa
+#: ../gui/semanagePage.py:134
+#, python-format
+msgid "Add %s"
-+msgstr "äÏÂÁÉÔØ %s"
++msgstr "äÏÂÁ×ÉÔØ %s"
-#, fuzzy
-#~ msgid "Disabled"
@@ -220771,7 +220997,7 @@ diff --exclude-from=exclude -N -u -r nsa
+
+#: ../gui/system-config-selinux.glade:2991
+msgid "Generate new policy module"
-+msgstr "çÅÒÅÎÉÒÏ×ÁÔØ ÍÏÄÕÌØ ÎÏ×ÏÊ ÐÏÌÉÔÉËÉ"
++msgstr "çÅÎÅÒÉÒÏ×ÁÔØ ÍÏÄÕÌØ ÎÏ×ÏÊ ÐÏÌÉÔÉËÉ"
+
+#: ../gui/system-config-selinux.glade:3007
+msgid "Load policy module"
@@ -220849,7 +221075,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ msgstr "ÎÅÏÂÈÏÄÉÍ SELinux ÐÏÌØÚÏ×ÁÔÅÌØ '%s' "
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-2.0.73/po/si.po
--- nsapolicycoreutils/po/si.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/si.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/si.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -223896,7 +224122,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-2.0.73/po/sk.po
--- nsapolicycoreutils/po/sk.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sk.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sk.po 2009-09-14 15:37:44.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -227033,7 +227259,7 @@ diff --exclude-from=exclude -N -u -r nsa
#~ msgstr "Požaduje hodnotu"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-2.0.73/po/sl.po
--- nsapolicycoreutils/po/sl.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sl.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sl.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -230080,7 +230306,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-2.0.73/po/sq.po
--- nsapolicycoreutils/po/sq.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sq.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sq.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -233127,7 +233353,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at latin.po policycoreutils-2.0.73/po/sr at latin.po
--- nsapolicycoreutils/po/sr at latin.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr at latin.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sr at latin.po 2009-09-14 15:37:44.000000000 -0400
@@ -1,26 +1,24 @@
-# translation of policycoreutils.HEAD.sr.po to Serbian
# Serbian(Latin) translations for policycoreutils
@@ -238000,7 +238226,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr "SELinux korisnik „%s“ je neophodan"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-2.0.73/po/sr.po
--- nsapolicycoreutils/po/sr.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sr.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sr.po 2009-09-14 15:37:44.000000000 -0400
@@ -1,26 +1,24 @@
-# translation of policycoreutils.HEAD.sr.po to Serbian
# Serbian translations for policycoreutils
@@ -242865,7 +243091,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr "SELinux кориÑник „%s“ је неопходан"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-2.0.73/po/sv.po
--- nsapolicycoreutils/po/sv.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/sv.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/sv.po 2009-09-14 15:37:44.000000000 -0400
@@ -1,16 +1,18 @@
# Swedish messages for policycoreutils.
-# Copyright © 2001-2008 Free Software Foundation, Inc.
@@ -246953,7 +247179,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr "SELinux-användare \"%s\" krävs"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-2.0.73/po/ta.po
--- nsapolicycoreutils/po/ta.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ta.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/ta.po 2009-09-14 15:37:44.000000000 -0400
@@ -1,28 +1,23 @@
-# translation of ta.po to Tamil
+# translation of policycoreutils.HEAD.ta.po to Tamil
@@ -251644,7 +251870,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ "MCS நிலை"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-2.0.73/po/te.po
--- nsapolicycoreutils/po/te.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/te.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/te.po 2009-09-14 15:37:44.000000000 -0400
@@ -1,21 +1,23 @@
-# translation of new_policycoreutils.HEAD.te.po to Telugu
+# translation of policycoreutils.HEAD.te.po to Telugu
@@ -256425,7 +256651,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ "అచేతనమైన\n"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-2.0.73/po/th.po
--- nsapolicycoreutils/po/th.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/th.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/th.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -259472,7 +259698,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-2.0.73/po/tr.po
--- nsapolicycoreutils/po/tr.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/tr.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/tr.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -262519,7 +262745,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-2.0.73/po/uk.po
--- nsapolicycoreutils/po/uk.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/uk.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/uk.po 2009-09-14 15:37:44.000000000 -0400
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -265656,7 +265882,7 @@ diff --exclude-from=exclude -N -u -r nsa
#~ msgstr "Потрібно вказати значеннÑ"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-2.0.73/po/ur.po
--- nsapolicycoreutils/po/ur.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/ur.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/ur.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -268703,7 +268929,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-2.0.73/po/vi.po
--- nsapolicycoreutils/po/vi.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/vi.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/vi.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -271750,7 +271976,7 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-2.0.73/po/zh_CN.po
--- nsapolicycoreutils/po/zh_CN.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_CN.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/zh_CN.po 2009-09-14 15:37:44.000000000 -0400
@@ -3,13 +3,13 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
#
@@ -276371,7 +276597,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ msgstr "SELinux 用户 '%s' 是必需的"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-2.0.73/po/zh_TW.po
--- nsapolicycoreutils/po/zh_TW.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zh_TW.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/zh_TW.po 2009-09-14 15:37:44.000000000 -0400
@@ -1,19 +1,19 @@
-# translation of policycoreutils.HEAD.po to Traditional Chinese
+# translation of policycoreutils.HEAD.po to
@@ -281289,7 +281515,7 @@ diff --exclude-from=exclude -N -u -r nsa
-#~ "udp"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-2.0.73/po/zu.po
--- nsapolicycoreutils/po/zu.po 2009-06-30 07:56:04.000000000 -0400
-+++ policycoreutils-2.0.73/po/zu.po 2009-09-08 09:38:59.000000000 -0400
++++ policycoreutils-2.0.73/po/zu.po 2009-09-14 15:37:44.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
policycoreutils-rhat.patch:
Makefile | 2
audit2allow/audit2allow | 14
load_policy/Makefile | 2
restorecond/Makefile | 24 -
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond.c | 422 +++---------------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 18
restorecond/restorecond.init | 5
restorecond/restorecond_user.conf | 2
restorecond/user.c | 237 ++++++++++
restorecond/watch.c | 254 +++++++++++
sandbox/Makefile | 31 +
sandbox/sandbox | 200 ++++++++
sandbox/sandbox.8 | 26 +
sandbox/sandboxX.sh | 16
sandbox/seunshare.c | 203 ++++++++
scripts/Makefile | 2
scripts/chcat | 2
semanage/semanage | 27 +
semanage/seobject.py | 11
semodule/semodule.8 | 6
semodule/semodule.c | 51 +-
setfiles/Makefile | 4
setfiles/restore.c | 519 ++++++++++++++++++++++
setfiles/restore.h | 49 ++
setfiles/setfiles.c | 643 +++-------------------------
28 files changed, 1834 insertions(+), 951 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -p -r1.440 -r1.441
--- policycoreutils-rhat.patch 9 Sep 2009 21:07:24 -0000 1.440
+++ policycoreutils-rhat.patch 14 Sep 2009 19:39:17 -0000 1.441
@@ -1,6 +1,6 @@
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.73/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.73/audit2allow/audit2allow 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/audit2allow/audit2allow 2009-09-09 17:05:42.000000000 -0400
@@ -42,6 +42,8 @@
from optparse import OptionParser
@@ -40,7 +40,7 @@ diff --exclude-from=exclude --exclude=se
f = sys.stdin
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/load_policy/Makefile policycoreutils-2.0.73/load_policy/Makefile
--- nsapolicycoreutils/load_policy/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/load_policy/Makefile 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/load_policy/Makefile 2009-09-09 17:05:42.000000000 -0400
@@ -1,6 +1,6 @@
# Installation directories.
PREFIX ?= ${DESTDIR}/usr
@@ -51,7 +51,7 @@ diff --exclude-from=exclude --exclude=se
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.73/Makefile
--- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/Makefile 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/Makefile 2009-09-09 17:05:42.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 sandbox secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
@@ -60,7 +60,7 @@ diff --exclude-from=exclude --exclude=se
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.73/restorecond/Makefile
--- nsapolicycoreutils/restorecond/Makefile 2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/Makefile 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/Makefile 2009-09-09 17:05:42.000000000 -0400
@@ -1,17 +1,28 @@
# Installation directories.
PREFIX ?= ${DESTDIR}/usr
@@ -109,14 +109,14 @@ diff --exclude-from=exclude --exclude=se
/sbin/restorecon $(SBINDIR)/restorecond
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service
--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/org.selinux.Restorecond.service 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.selinux.Restorecond
+Exec=/usr/sbin/restorecond -u
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.73/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.c 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.c 2009-09-09 17:05:42.000000000 -0400
@@ -48,294 +48,38 @@
#include <signal.h>
#include <string.h>
@@ -609,7 +609,7 @@ diff --exclude-from=exclude --exclude=se
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.73/restorecond/restorecond.conf
--- nsapolicycoreutils/restorecond/restorecond.conf 2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.conf 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.conf 2009-09-09 17:05:42.000000000 -0400
@@ -4,8 +4,5 @@
/etc/mtab
/var/run/utmp
@@ -622,7 +622,7 @@ diff --exclude-from=exclude --exclude=se
-
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.73/restorecond/restorecond.desktop
--- nsapolicycoreutils/restorecond/restorecond.desktop 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond.desktop 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.desktop 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=File Context maintainer
@@ -633,7 +633,7 @@ diff --exclude-from=exclude --exclude=se
+StartupNotify=false
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.73/restorecond/restorecond.h
--- nsapolicycoreutils/restorecond/restorecond.h 2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.h 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond.h 2009-09-09 17:05:42.000000000 -0400
@@ -24,7 +24,21 @@
#ifndef RESTORED_CONFIG_H
#define RESTORED_CONFIG_H
@@ -660,13 +660,21 @@ diff --exclude-from=exclude --exclude=se
#endif
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-2.0.73/restorecond/restorecond.init
--- nsapolicycoreutils/restorecond/restorecond.init 2009-08-20 15:49:21.000000000 -0400
-+++ policycoreutils-2.0.73/restorecond/restorecond.init 2009-09-09 16:27:14.000000000 -0400
-@@ -82,9 +82,8 @@
++++ policycoreutils-2.0.73/restorecond/restorecond.init 2009-09-14 15:32:27.000000000 -0400
+@@ -75,16 +75,15 @@
+ status restorecond
+ RETVAL=$?
+ ;;
+- restart|reload)
++ force-reload|restart|reload)
+ restart
+ ;;
+ condrestart)
[ -e /var/lock/subsys/restorecond ] && restart || :
;;
*)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
-+ echo $"Usage: $0 {start|stop|restart|reload|status|condrestart}"
++ echo $"Usage: $0 {start|stop|restart|force-reload|status|condrestart}"
RETVAL=3
esac
@@ -674,13 +682,13 @@ diff --exclude-from=exclude --exclude=se
-
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.73/restorecond/restorecond_user.conf
--- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/restorecond_user.conf 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/restorecond_user.conf 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,2 @@
+~/*
+~/public_html/*
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.73/restorecond/user.c
--- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/user.c 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/user.c 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,237 @@
+/*
+ * restorecond
@@ -921,7 +929,7 @@ diff --exclude-from=exclude --exclude=se
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.73/restorecond/watch.c
--- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/restorecond/watch.c 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/restorecond/watch.c 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,254 @@
+#define _GNU_SOURCE
+#include <sys/inotify.h>
@@ -1179,7 +1187,7 @@ diff --exclude-from=exclude --exclude=se
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/Makefile policycoreutils-2.0.73/sandbox/Makefile
--- nsapolicycoreutils/sandbox/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/Makefile 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/Makefile 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,31 @@
+# Installation directories.
+PREFIX ?= ${DESTDIR}/usr
@@ -1214,7 +1222,7 @@ diff --exclude-from=exclude --exclude=se
+relabel:
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.73/sandbox/sandbox
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,200 @@
+#!/usr/bin/python -E
+import os, sys, getopt, socket, random, fcntl, shutil
@@ -1418,7 +1426,7 @@ diff --exclude-from=exclude --exclude=se
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.8 policycoreutils-2.0.73/sandbox/sandbox.8
--- nsapolicycoreutils/sandbox/sandbox.8 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandbox.8 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandbox.8 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,26 @@
+.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
+.SH NAME
@@ -1448,7 +1456,7 @@ diff --exclude-from=exclude --exclude=se
+.PP
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandboxX.sh policycoreutils-2.0.73/sandbox/sandboxX.sh
--- nsapolicycoreutils/sandbox/sandboxX.sh 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/sandboxX.sh 2009-09-09 17:01:54.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/sandboxX.sh 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,16 @@
+#!/bin/bash
+export TITLE="Sandbox: `/usr/bin/tail -1 ~/.sandboxrc | /usr/bin/cut -b1-70`"
@@ -1468,7 +1476,7 @@ diff --exclude-from=exclude --exclude=se
+done
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/seunshare.c policycoreutils-2.0.73/sandbox/seunshare.c
--- nsapolicycoreutils/sandbox/seunshare.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/sandbox/seunshare.c 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/sandbox/seunshare.c 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,203 @@
+#include <signal.h>
+#include <sys/types.h>
@@ -1675,7 +1683,7 @@ diff --exclude-from=exclude --exclude=se
+}
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-2.0.73/scripts/chcat
--- nsapolicycoreutils/scripts/chcat 2009-06-23 15:36:07.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/chcat 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/scripts/chcat 2009-09-09 17:05:42.000000000 -0400
@@ -435,6 +435,8 @@
continue
except ValueError, e:
@@ -1687,7 +1695,7 @@ diff --exclude-from=exclude --exclude=se
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.73/scripts/Makefile
--- nsapolicycoreutils/scripts/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/scripts/Makefile 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/scripts/Makefile 2009-09-09 17:05:42.000000000 -0400
@@ -5,7 +5,7 @@
MANDIR ?= $(PREFIX)/share/man
LOCALEDIR ?= /usr/share/locale
@@ -1699,7 +1707,7 @@ diff --exclude-from=exclude --exclude=se
-mkdir -p $(BINDIR)
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.73/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/semanage 2009-09-09 16:28:00.000000000 -0400
++++ policycoreutils-2.0.73/semanage/semanage 2009-09-09 17:05:42.000000000 -0400
@@ -85,6 +85,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)
@@ -1792,7 +1800,7 @@ diff --exclude-from=exclude --exclude=se
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.73/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2009-09-08 09:03:10.000000000 -0400
-+++ policycoreutils-2.0.73/semanage/seobject.py 2009-09-09 16:29:52.000000000 -0400
++++ policycoreutils-2.0.73/semanage/seobject.py 2009-09-09 17:05:42.000000000 -0400
@@ -1586,9 +1586,16 @@
raise ValueError(_("Could not delete the file context %s") % target)
semanage_fcontext_key_free(k)
@@ -1826,7 +1834,7 @@ diff --exclude-from=exclude --exclude=se
if is_mls_enabled:
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.8 policycoreutils-2.0.73/semodule/semodule.8
--- nsapolicycoreutils/semodule/semodule.8 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.8 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.8 2009-09-09 17:05:42.000000000 -0400
@@ -35,6 +35,12 @@
.B \-b,\-\-base=MODULE_PKG
install/replace base module package
@@ -1842,7 +1850,7 @@ diff --exclude-from=exclude --exclude=se
.TP
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.73/semodule/semodule.c
--- nsapolicycoreutils/semodule/semodule.c 2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/semodule/semodule.c 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/semodule/semodule.c 2009-09-09 17:05:42.000000000 -0400
@@ -22,12 +22,12 @@
#include <semanage/modules.h>
@@ -1959,7 +1967,7 @@ diff --exclude-from=exclude --exclude=se
}
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/Makefile policycoreutils-2.0.73/setfiles/Makefile
--- nsapolicycoreutils/setfiles/Makefile 2009-07-07 15:32:32.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/Makefile 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/Makefile 2009-09-09 17:05:42.000000000 -0400
@@ -5,7 +5,7 @@
LIBDIR ?= $(PREFIX)/lib
AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
@@ -1980,7 +1988,7 @@ diff --exclude-from=exclude --exclude=se
ln -sf setfiles restorecon
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.c policycoreutils-2.0.73/setfiles/restore.c
--- nsapolicycoreutils/setfiles/restore.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.c 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.c 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,519 @@
+#include "restore.h"
+
@@ -2503,7 +2511,7 @@ diff --exclude-from=exclude --exclude=se
+
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/restore.h policycoreutils-2.0.73/setfiles/restore.h
--- nsapolicycoreutils/setfiles/restore.h 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.73/setfiles/restore.h 2009-09-09 16:27:14.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/restore.h 2009-09-09 17:05:42.000000000 -0400
@@ -0,0 +1,49 @@
+#ifndef RESTORE_H
+#define RESTORE_H
@@ -2555,8 +2563,8 @@ diff --exclude-from=exclude --exclude=se
+
+#endif
diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.73/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c 2009-09-08 19:09:27.000000000 -0400
-+++ policycoreutils-2.0.73/setfiles/setfiles.c 2009-09-09 16:27:14.000000000 -0400
+--- nsapolicycoreutils/setfiles/setfiles.c 2009-09-14 15:36:23.000000000 -0400
++++ policycoreutils-2.0.73/setfiles/setfiles.c 2009-09-09 17:05:42.000000000 -0400
@@ -1,26 +1,12 @@
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
@@ -3083,7 +3091,7 @@ diff --exclude-from=exclude --exclude=se
}
int canoncon(char **contextp)
-@@ -584,77 +152,6 @@
+@@ -585,77 +152,6 @@
return 0;
}
@@ -3161,7 +3169,7 @@ diff --exclude-from=exclude --exclude=se
static int process_one_realpath(char *name)
{
int rc = 0;
-@@ -667,7 +164,7 @@
+@@ -668,7 +164,7 @@
rc = lstat(name, &sb);
if (rc < 0) {
fprintf(stderr, "%s: lstat(%s) failed: %s\n",
@@ -3170,7 +3178,7 @@ diff --exclude-from=exclude --exclude=se
return -1;
}
-@@ -801,20 +298,30 @@
+@@ -802,20 +298,30 @@
char *buf = NULL;
size_t buf_len;
char *base;
@@ -3209,7 +3217,7 @@ diff --exclude-from=exclude --exclude=se
if (!strcmp(base, SETFILES)) {
/*
-@@ -829,28 +336,28 @@
+@@ -830,28 +336,28 @@
iamrestorecon = 0;
recurse = 1;
expand_realpath = 0;
@@ -3246,7 +3254,7 @@ diff --exclude-from=exclude --exclude=se
ctx_validate = 0;
/* restorecon only: silent exit if no SELinux.
-@@ -912,37 +419,37 @@
+@@ -913,37 +419,37 @@
input_filename = optarg;
break;
case 'd':
@@ -3293,7 +3301,7 @@ diff --exclude-from=exclude --exclude=se
break;
case 'R':
case 'r':
-@@ -955,7 +462,7 @@
+@@ -956,7 +462,7 @@
argv[0]);
exit(1);
}
@@ -3302,7 +3310,7 @@ diff --exclude-from=exclude --exclude=se
fprintf(stderr,
"%s: only one -r can be specified\n",
argv[0]);
-@@ -966,23 +473,23 @@
+@@ -967,23 +473,23 @@
case 's':
use_input_file = 1;
input_filename = "-";
@@ -3331,7 +3339,7 @@ diff --exclude-from=exclude --exclude=se
break;
case 'W':
warn_no_match = 1;
-@@ -1030,18 +537,13 @@
+@@ -1031,18 +537,13 @@
}
/* Load the file contexts configuration and check it. */
@@ -3353,7 +3361,7 @@ diff --exclude-from=exclude --exclude=se
if (use_input_file) {
FILE *f = stdin;
ssize_t len;
-@@ -1058,6 +560,9 @@
+@@ -1059,6 +560,9 @@
delim = (null_terminated != 0) ? '\0' : '\n';
while ((len = getdelim(&buf, &buf_len, delim, f)) > 0) {
buf[len - 1] = 0;
@@ -3363,7 +3371,7 @@ diff --exclude-from=exclude --exclude=se
errors |= process_one_realpath(buf);
}
if (strcmp(input_filename, "-") != 0)
-@@ -1067,22 +572,21 @@
+@@ -1068,22 +572,21 @@
errors |= process_one_realpath(argv[i]);
}
}
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.639
retrieving revision 1.640
diff -u -p -r1.639 -r1.640
--- policycoreutils.spec 9 Sep 2009 17:04:52 -0000 1.639
+++ policycoreutils.spec 14 Sep 2009 19:39:18 -0000 1.640
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.73
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -295,6 +295,9 @@ fi
exit 0
%changelog
+* Mon Sep 14 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-3
+- Fix restorecond script to use force-reload
+
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> 2.0.73-2
- Fix init script to show status in usage message
More information about the fedora-extras-commits
mailing list