rpms/policycoreutils/devel .cvsignore, 1.131, 1.132 policycoreutils-po.patch, 1.17, 1.18 policycoreutils-rhat.patch, 1.271, 1.272 policycoreutils.spec, 1.358, 1.359 sources, 1.135, 1.136
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 11 20:19:40 UTC 2007
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13555
Modified Files:
.cvsignore policycoreutils-po.patch policycoreutils-rhat.patch
policycoreutils.spec sources
Log Message:
* Tue Jan 9 2007 Dan Walsh <dwalsh at redhat.com> 1.33.12-1
- Want to update to match api
- Update to upstream
* Merged newrole securetty check from Dan Walsh.
* Merged semodule patch to generalize list support from Karl MacMillan.
Resolves: #200110
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore 9 Jan 2007 15:19:22 -0000 1.131
+++ .cvsignore 11 Jan 2007 20:19:37 -0000 1.132
@@ -123,3 +123,5 @@
policycoreutils-1.33.7.tgz
policycoreutils-1.33.8.tgz
policycoreutils-1.33.10.tgz
+policycoreutils-1.33.11.tgz
+policycoreutils-1.33.12.tgz
policycoreutils-po.patch:
POTFILES.in | 46 ++
af.po | 481 +++++++++++++++-------------
am.po | 481 +++++++++++++++-------------
ar.po | 481 +++++++++++++++-------------
as.po | 481 +++++++++++++++-------------
be.po | 481 +++++++++++++++-------------
bg.po | 481 +++++++++++++++-------------
bn.po | 481 +++++++++++++++-------------
bn_IN.po | 545 +++++++++++++++++--------------
ca.po | 554 +++++++++++++++++---------------
cs.po | 481 +++++++++++++++-------------
cy.po | 481 +++++++++++++++-------------
da.po | 525 ++++++++++++++++--------------
de.po | 543 +++++++++++++++++--------------
el.po | 527 +++++++++++++++++-------------
en_GB.po | 481 +++++++++++++++-------------
es.po | 538 +++++++++++++++++--------------
et.po | 479 +++++++++++++++-------------
eu_ES.po | 481 +++++++++++++++-------------
fa.po | 481 +++++++++++++++-------------
fi.po | 481 +++++++++++++++-------------
fr.po | 799 +++++++++++++++++++++++++---------------------
gl.po | 479 +++++++++++++++-------------
gu.po | 535 +++++++++++++++++--------------
he.po | 481 +++++++++++++++-------------
hi.po | 538 +++++++++++++++++--------------
hr.po | 627 ++++++++++++++++++++++--------------
hu.po | 527 +++++++++++++++++-------------
hy.po | 481 +++++++++++++++-------------
id.po | 479 +++++++++++++++-------------
is.po | 481 +++++++++++++++-------------
it.po | 555 ++++++++++++++++++--------------
ja.po | 889 ++++++++++++++++++++++++++++------------------------
ka.po | 481 +++++++++++++++-------------
kn.po | 334 +++++++++----------
ko.po | 552 +++++++++++++++++---------------
ku.po | 481 +++++++++++++++-------------
lo.po | 481 +++++++++++++++-------------
lt.po | 481 +++++++++++++++-------------
lv.po | 481 +++++++++++++++-------------
mk.po | 481 +++++++++++++++-------------
ml.po | 539 +++++++++++++++++--------------
mr.po | 497 ++++++++++++++++-------------
ms.po | 537 +++++++++++++++++--------------
my.po | 481 +++++++++++++++-------------
nb.po | 481 +++++++++++++++-------------
nl.po | 546 +++++++++++++++++--------------
nn.po | 481 +++++++++++++++-------------
no.po | 481 +++++++++++++++-------------
nso.po | 481 +++++++++++++++-------------
or.po | 561 ++++++++++++++++++--------------
pa.po | 516 ++++++++++++++++--------------
pl.po | 544 +++++++++++++++++--------------
policycoreutils.pot | 481 +++++++++++++++-------------
pt.po | 543 +++++++++++++++++--------------
pt_BR.po | 576 +++++++++++++++++++--------------
ro.po | 481 +++++++++++++++-------------
ru.po | 592 ++++++++++++++++++----------------
si.po | 481 +++++++++++++++-------------
sk.po | 523 ++++++++++++++++--------------
sl.po | 481 +++++++++++++++-------------
sq.po | 481 +++++++++++++++-------------
sr.po | 625 ++++++++++++++++++++++--------------
sr at Latn.po | 625 ++++++++++++++++++++++--------------
sv.po | 525 ++++++++++++++++--------------
ta.po | 535 +++++++++++++++++--------------
te.po | 481 +++++++++++++++-------------
th.po | 481 +++++++++++++++-------------
tr.po | 481 +++++++++++++++-------------
uk.po | 527 +++++++++++++++++-------------
ur.po | 481 +++++++++++++++-------------
vi.po | 481 +++++++++++++++-------------
zh_CN.po | 538 +++++++++++++++++--------------
zh_TW.po | 841 ++++++++++++++++++++++++++-----------------------
zu.po | 481 +++++++++++++++-------------
75 files changed, 21426 insertions(+), 17113 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.17 -r 1.18 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policycoreutils-po.patch 18 Dec 2006 19:00:41 -0000 1.17
+++ policycoreutils-po.patch 11 Jan 2007 20:19:37 -0000 1.18
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.6/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.10/po/af.po
--- nsapolicycoreutils/po/af.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/af.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/af.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -1108,9 +1108,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.6/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.10/po/am.po
--- nsapolicycoreutils/po/am.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/am.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/am.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -2218,9 +2218,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.6/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.10/po/ar.po
--- nsapolicycoreutils/po/ar.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/ar.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/ar.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -3328,9 +3328,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.6/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.10/po/as.po
--- nsapolicycoreutils/po/as.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/as.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/as.po 2007-01-09 10:09:19.000000000 -0500
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: as\n"
@@ -4438,9 +4438,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.6/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.10/po/be.po
--- nsapolicycoreutils/po/be.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/be.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/be.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -5548,9 +5548,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.6/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.10/po/bg.po
--- nsapolicycoreutils/po/bg.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/bg.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/bg.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -6658,9 +6658,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.6/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.10/po/bn_IN.po
--- nsapolicycoreutils/po/bn_IN.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/bn_IN.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/bn_IN.po 2007-01-09 10:09:19.000000000 -0500
@@ -36,8 +36,8 @@
msgstr ""
"Project-Id-Version: bn_IN\n"
@@ -7820,9 +7820,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "বিকলà§à¦ª সংকà§à¦°à¦¾à¦¨à§à¦¤ তà§à¦°à§à¦Ÿà¦¿: %s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.33.6/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.33.10/po/bn.po
--- nsapolicycoreutils/po/bn.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/bn.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/bn.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -8930,9 +8930,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.6/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.10/po/ca.po
--- nsapolicycoreutils/po/ca.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/ca.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/ca.po 2007-01-09 10:09:19.000000000 -0500
@@ -22,8 +22,8 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -10105,9 +10105,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "Error en les opcions: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.33.6/po/cs.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.33.10/po/cs.po
--- nsapolicycoreutils/po/cs.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/cs.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/cs.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -11215,9 +11215,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.33.6/po/cy.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.33.10/po/cy.po
--- nsapolicycoreutils/po/cy.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/cy.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/cy.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -12325,9 +12325,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.33.6/po/da.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.33.10/po/da.po
--- nsapolicycoreutils/po/da.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/da.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/da.po 2007-01-09 10:09:19.000000000 -0500
@@ -3,13 +3,13 @@
# Christian Rose <menthos at menthos.com>, 2006.
# Keld Simonsen <keld at dkuug.dk>, 2006.
@@ -13468,9 +13468,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "Flagfejl: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.33.6/po/de.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.33.10/po/de.po
--- nsapolicycoreutils/po/de.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/de.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/de.po 2007-01-09 10:09:19.000000000 -0500
@@ -1,4 +1,5 @@
# translation of de.po to
+# translation of de.po to
@@ -14641,9 +14641,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "Options Fehler: %s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.33.6/po/el.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.33.10/po/el.po
--- nsapolicycoreutils/po/el.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/el.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/el.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: el\n"
@@ -15806,9 +15806,9 @@
#, fuzzy, c-format
msgid "Options Error: %s "
msgstr "Σφάλμα πιστοποίησης: %s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.33.6/po/en_GB.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.33.10/po/en_GB.po
--- nsapolicycoreutils/po/en_GB.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/en_GB.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/en_GB.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -16916,9 +16916,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.33.6/po/es.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.33.10/po/es.po
--- nsapolicycoreutils/po/es.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/es.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/es.po 2007-01-09 10:09:19.000000000 -0500
@@ -5,8 +5,8 @@
msgstr ""
"Project-Id-Version: \n"
@@ -18066,9 +18066,9 @@
#, c-format
msgid "Options Error: %s "
[...1818 lines suppressed...]
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.33.6/po/si.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.33.10/po/si.po
--- nsapolicycoreutils/po/si.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/si.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/si.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -66249,9 +66025,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.33.6/po/sk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.33.10/po/sk.po
--- nsapolicycoreutils/po/sk.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/sk.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/sk.po 2007-01-09 10:09:19.000000000 -0500
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -67385,9 +67161,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "Chyba volieb: %s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.33.6/po/sl.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.33.10/po/sl.po
--- nsapolicycoreutils/po/sl.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/sl.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/sl.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -68495,9 +68271,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.33.6/po/sq.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.33.10/po/sq.po
--- nsapolicycoreutils/po/sq.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/sq.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/sq.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -69605,9 +69381,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.33.6/po/sr at Latn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.33.10/po/sr at Latn.po
--- nsapolicycoreutils/po/sr at Latn.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/sr at Latn.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/sr at Latn.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -70861,9 +70637,9 @@
msgid "Options Error: %s "
msgstr "Greška opcija: %s "
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.33.6/po/sr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.33.10/po/sr.po
--- nsapolicycoreutils/po/sr.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/sr.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/sr.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -72117,9 +71893,9 @@
msgid "Options Error: %s "
msgstr "Грешка опција: %s "
+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.33.6/po/sv.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.33.10/po/sv.po
--- nsapolicycoreutils/po/sv.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/sv.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/sv.po 2007-01-09 10:09:19.000000000 -0500
@@ -2,13 +2,13 @@
# Copyright (C) 2006 Christian Rose.
# Christian Rose <menthos at menthos.com>, 2006.
@@ -73260,9 +73036,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "Flaggfel: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.33.6/po/ta.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.33.10/po/ta.po
--- nsapolicycoreutils/po/ta.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/ta.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/ta.po 2007-01-09 10:09:19.000000000 -0500
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: ta\n"
@@ -74409,9 +74185,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ பிழை: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.33.6/po/te.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.33.10/po/te.po
--- nsapolicycoreutils/po/te.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/te.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/te.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -75519,9 +75295,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.33.6/po/th.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.33.10/po/th.po
--- nsapolicycoreutils/po/th.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/th.po 2006-12-08 09:11:53.000000000 -0500
++++ policycoreutils-1.33.10/po/th.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -76629,9 +76405,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.33.6/po/tr.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.33.10/po/tr.po
--- nsapolicycoreutils/po/tr.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/tr.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/tr.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -77739,9 +77515,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.33.6/po/uk.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.33.10/po/uk.po
--- nsapolicycoreutils/po/uk.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/uk.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/uk.po 2007-01-09 10:09:19.000000000 -0500
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: policycoreutils\n"
@@ -78880,9 +78656,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "Помилка у аргументах: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.33.6/po/ur.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.33.10/po/ur.po
--- nsapolicycoreutils/po/ur.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/ur.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/ur.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -79990,9 +79766,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.33.6/po/vi.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.33.10/po/vi.po
--- nsapolicycoreutils/po/vi.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/vi.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/vi.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -81100,9 +80876,9 @@
#, c-format
msgid "Options Error: %s "
msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.33.6/po/zh_CN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.33.10/po/zh_CN.po
--- nsapolicycoreutils/po/zh_CN.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/zh_CN.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/zh_CN.po 2007-01-09 10:09:19.000000000 -0500
@@ -5,16 +5,18 @@
# translation of zh_CN.po to
# translation of zh_CN.po to
@@ -82251,9 +82027,9 @@
#, c-format
msgid "Options Error: %s "
msgstr "选项错误： %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.6/po/zh_TW.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.10/po/zh_TW.po
--- nsapolicycoreutils/po/zh_TW.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/zh_TW.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/zh_TW.po 2007-01-09 10:09:19.000000000 -0500
@@ -1,15 +1,16 @@
# translation of zh_TW.po to Chinese, Traditional
-# translation of policycoreutils.po to Chinese, Traditional
@@ -83671,9 +83447,9 @@
msgid "Options Error: %s "
-msgstr ""
+msgstr "é¸é …錯誤：%s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.6/po/zu.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.10/po/zu.po
--- nsapolicycoreutils/po/zu.po 2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.6/po/zu.po 2006-12-08 09:11:54.000000000 -0500
++++ policycoreutils-1.33.10/po/zu.po 2007-01-09 10:09:19.000000000 -0500
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
policycoreutils-rhat.patch:
Makefile | 2
gui/Makefile | 30
gui/booleansPage.py | 199 ++
gui/fcontextPage.py | 158 ++
gui/loginsPage.py | 161 ++
gui/mappingsPage.py | 54
gui/modulesPage.py | 161 ++
gui/portsPage.py | 214 +++
gui/selinux.tbl | 265 +++
gui/semanagePage.py | 109 +
gui/statusPage.py | 213 +++
gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++
gui/system-config-selinux.py | 156 ++
gui/translationsPage.py | 109 +
gui/usersPage.py | 155 ++
restorecond/restorecond.c | 12
restorecond/restorecond.conf | 1
semanage/semanage | 15
semanage/seobject.py | 50
19 files changed, 4836 insertions(+), 31 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- policycoreutils-rhat.patch 9 Jan 2007 15:19:22 -0000 1.271
+++ policycoreutils-rhat.patch 11 Jan 2007 20:19:38 -0000 1.272
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.10/gui/booleansPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.12/gui/booleansPage.py
--- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/booleansPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/booleansPage.py 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,199 @@
+#
+# booleansPage.py - GUI for Booleans page in system-config-securitylevel
@@ -201,9 +201,9 @@
+
+ setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val)
+ commands.getstatusoutput(setsebool)
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.10/gui/fcontextPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.12/gui/fcontextPage.py
--- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/fcontextPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/fcontextPage.py 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,158 @@
+## fcontextPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -363,9 +363,9 @@
+ self.store.set_value(iter, 0, fspec)
+ self.store.set_value(iter, 2, ftype)
+ self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls))
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.10/gui/loginsPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.12/gui/loginsPage.py
--- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/loginsPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/loginsPage.py 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,161 @@
+## loginsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -528,9 +528,9 @@
+ self.store.set_value(iter, 1, seuser)
+ self.store.set_value(iter, 2, seobject.translate(serange))
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.10/gui/Makefile
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.12/gui/Makefile
--- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/Makefile 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/Makefile 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,30 @@
+# Installation directories.
+PREFIX ?= ${DESTDIR}/usr
@@ -562,9 +562,9 @@
+indent:
+
+relabel:
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.10/gui/mappingsPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.12/gui/mappingsPage.py
--- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/mappingsPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/mappingsPage.py 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,54 @@
+## mappingsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -620,9 +620,9 @@
+ for k in keys:
+ print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1]))
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.10/gui/modulesPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.12/gui/modulesPage.py
--- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/modulesPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/modulesPage.py 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,161 @@
+## modulesPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -785,9 +785,9 @@
+
+
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.10/gui/portsPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.12/gui/portsPage.py
--- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/portsPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/portsPage.py 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,214 @@
+## portsPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -1003,9 +1003,9 @@
+ self.store.set_value(iter, MLS_COL, mls)
+
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.10/gui/selinux.tbl
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.12/gui/selinux.tbl
--- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/selinux.tbl 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/selinux.tbl 2007-01-11 14:12:49.000000000 -0500
@@ -0,0 +1,265 @@
+acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon")
+allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow")
@@ -1272,9 +1272,9 @@
+ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon")
+ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon")
+zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon")
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.10/gui/semanagePage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.12/gui/semanagePage.py
--- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/semanagePage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/semanagePage.py 2007-01-11 14:12:50.000000000 -0500
@@ -0,0 +1,109 @@
+## semanagePage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -1385,9 +1385,9 @@
+ self.dialog.hide()
+
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.10/gui/statusPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.12/gui/statusPage.py
--- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/statusPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/statusPage.py 2007-01-11 14:12:50.000000000 -0500
@@ -0,0 +1,213 @@
+## statusPage.py - show selinux status
+## Copyright (C) 2006 Red Hat, Inc.
@@ -1602,9 +1602,9 @@
+ return self.types[self.selinuxTypeOptionMenu.get_active()]
+
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.10/gui/system-config-selinux.glade
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.12/gui/system-config-selinux.glade
--- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/system-config-selinux.glade 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/system-config-selinux.glade 2007-01-11 14:12:50.000000000 -0500
@@ -0,0 +1,2803 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -4409,9 +4409,9 @@
+</widget>
+
+</glade-interface>
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.10/gui/system-config-selinux.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.12/gui/system-config-selinux.py
--- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/system-config-selinux.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/system-config-selinux.py 2007-01-11 14:12:50.000000000 -0500
@@ -0,0 +1,156 @@
+#!/usr/bin/python
+#
@@ -4569,9 +4569,9 @@
+
+ app = childWindow()
+ app.stand_alone()
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.10/gui/translationsPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.12/gui/translationsPage.py
--- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/translationsPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/translationsPage.py 2007-01-11 14:12:50.000000000 -0500
@@ -0,0 +1,109 @@
+## translationsPage.py - show selinux translations
+## Copyright (C) 2006 Red Hat, Inc.
@@ -4682,9 +4682,9 @@
+ store, iter = self.view.get_selection().get_selected()
+ self.store.set_value(iter, 0, level)
+ self.store.set_value(iter, 1, translation)
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.10/gui/usersPage.py
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.12/gui/usersPage.py
--- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.33.10/gui/usersPage.py 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/gui/usersPage.py 2007-01-11 14:12:50.000000000 -0500
@@ -0,0 +1,155 @@
+## usersPage.py - show selinux mappings
+## Copyright (C) 2006 Red Hat, Inc.
@@ -4841,45 +4841,18 @@
+ except ValueError, e:
+ self.error(e.args[0])
+
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.10/Makefile
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.12/Makefile
--- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500
-+++ policycoreutils-1.33.10/Makefile 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/Makefile 2007-01-11 14:12:50.000000000 -0500
@@ -1,4 +1,4 @@
-SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
+SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
all install relabel clean indent:
@for subdir in $(SUBDIRS); do \
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.10/newrole/newrole.c
---- nsapolicycoreutils/newrole/newrole.c 2007-01-04 17:01:41.000000000 -0500
-+++ policycoreutils-1.33.10/newrole/newrole.c 2007-01-09 09:13:43.000000000 -0500
-@@ -741,6 +741,7 @@
- char *level_s = NULL; /* level spec'd by user in argv[] */
- char *range_ptr = NULL;
- security_context_t new_con = NULL;
-+ security_context_t tty_con = NULL;
- context_t context = NULL; /* manipulatable form of new_context */
- const struct option long_options[] = {
- {"role", 1, 0, 'r'},
-@@ -793,6 +794,15 @@
- "specified\n"));
- return -1;
- }
-+ if (fgetfilecon(0,&tty_con) >= 0) {
-+ if (selinux_check_securetty_context(tty_con) != 1) {
-+ fprintf(stderr, "Error: you are not allowed to change levels on a non secure terminal\n");
-+ freecon(tty_con);
-+ return -1;
-+ }
-+ freecon(tty_con);
-+ }
-+
- level_s = optarg;
- break;
- default:
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.10/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.12/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500
-+++ policycoreutils-1.33.10/restorecond/restorecond.c 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/restorecond/restorecond.c 2007-01-11 14:12:50.000000000 -0500
@@ -210,9 +210,10 @@
}
@@ -4906,80 +4879,78 @@
}
free(scontext);
close(fd);
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.10/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.12/restorecond/restorecond.conf
--- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-1.33.10/restorecond/restorecond.conf 2007-01-09 09:13:43.000000000 -0500
++++ policycoreutils-1.33.12/restorecond/restorecond.conf 2007-01-11 14:12:50.000000000 -0500
@@ -1,4 +1,5 @@
/etc/resolv.conf
+/etc/localtime
/etc/samba/secrets.tdb
/etc/mtab
/var/run/utmp
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.10/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles 2006-11-16 17:14:27.000000000 -0500
-+++ policycoreutils-1.33.10/scripts/fixfiles 2007-01-09 09:13:43.000000000 -0500
-@@ -29,6 +29,9 @@
- RPMILES=""
- OUTFILES=""
- LOGFILE=`tty`
-+if [ $? != 0 ]; then
-+ LOGFILE="/dev/null"
-+fi
- SYSLOGFLAG="-l"
- LOGGER=/usr/sbin/logger
- SETFILES=/sbin/setfiles
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.10/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py 2007-01-09 09:06:59.000000000 -0500
-+++ policycoreutils-1.33.10/semanage/seobject.py 2007-01-09 09:21:32.000000000 -0500
-@@ -94,23 +94,25 @@
- return re.search("^" + reg +"$",raw)
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.33.12/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage 2006-11-16 17:14:26.000000000 -0500
++++ policycoreutils-1.33.12/semanage/semanage 2007-01-11 14:12:50.000000000 -0500
+@@ -23,12 +23,21 @@
+ import os, sys, getopt
+ import seobject
+ import selinux
++PROGNAME="policycoreutils"
++
+ import gettext
++gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
++gettext.textdomain(PROGNAME)
++import codecs
++import locale
++sys.stderr = codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__, 'replace')
++sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace')
- def translate(raw, prepend = 1):
-- if prepend == 1:
-- context = "a:b:c:%s" % raw
-+ filler="a:b:c:"
-+ if prepend == 1:
-+ context = "%s%s" % (filler,raw)
- else:
- context = raw
- (rc, trans) = selinux.selinux_raw_to_trans_context(context)
- if rc != 0:
- return raw
- if prepend:
-- trans = trans.strip("a:b:c")
-+ trans = trans[len(filler):]
- if trans == "":
- return raw
- else:
- return trans
-
- def untranslate(trans, prepend = 1):
-+ filler="a:b:c:"
- if prepend == 1:
-- context = "a:b:c:%s" % trans
-+ context = "%s%s" % (filler,trans)
- else:
- context = trans
+ try:
+- gettext.install('policycoreutils')
+-except:
+- pass
++ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
++except IOError:
++ import __builtin__
++ __builtin__.__dict__['_'] = unicode
+
+ is_mls_enabled=selinux.is_selinux_mls_enabled()
-@@ -118,7 +120,7 @@
- if rc != 0:
- return trans
- if prepend:
-- raw = raw.strip("a:b:c")
-+ raw = raw[len(filler):]
- if raw == "":
- return trans
- else:
-@@ -157,7 +159,7 @@
- def out(self):
- rec = ""
- for c in self.comments:
-- rec += c +"\n"
-+ rec += c
+diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.12/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py 2007-01-11 08:56:30.000000000 -0500
++++ policycoreutils-1.33.12/semanage/seobject.py 2007-01-11 14:14:19.000000000 -0500
+@@ -23,13 +23,16 @@
+
+ import pwd, string, selinux, tempfile, os, re, sys
+ from semanage import *;
+-import gettext
++PROGNAME="policycoreutils"
+
++import gettext
++gettext.bindtextdomain(PROGNAME, "/usr/share/locale")
++gettext.textdomain(PROGNAME)
+ try:
+- t = gettext.translation('policycoreutils', '/usr/share/locale')
+- _ = t.ugettext
+-except:
+- pass
++ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1)
++except IOError:
++ import __builtin__
++ __builtin__.__dict__['_'] = unicode
+
+ is_mls_enabled = selinux.is_selinux_mls_enabled()
+
+@@ -168,7 +171,7 @@
+
+ def list(self,heading = 1):
+ if heading:
+- print "\n%-25s %s\n" % ("Level", "Translation")
++ print "\n%-25s %s\n" % (_("Level"), _("Translation"))
keys = self.ddict.keys()
keys.sort()
for k in keys:
-@@ -204,7 +206,8 @@
+@@ -206,14 +209,14 @@
os.write(fd, self.out())
os.close(fd)
os.rename(newfilename, self.filename)
@@ -4989,7 +4960,43 @@
class semanageRecords:
def __init__(self):
self.sh = semanage_handle_create()
-@@ -459,7 +462,8 @@
++ self.semanaged = semanage_is_managed(self.sh)
+ if not self.sh:
+ raise ValueError(_("Could not create semanage handle"))
+-
+- self.semanaged = semanage_is_managed(self.sh)
+
+ if not self.semanaged:
+ semanage_handle_destroy(self.sh)
+@@ -288,10 +291,10 @@
+ raise ValueError(_("Could not add login mapping for %s") % name)
+
+ except ValueError, error:
+- mylog.log(0, "add SELinux user mapping", name, sename, "", serange);
++ mylog.log(0, _("add SELinux user mapping"), name, sename, "", serange);
+ raise error
+
+- mylog.log(1, "add SELinux user mapping", name, sename, "", serange);
++ mylog.log(1, _("add SELinux user mapping"), name, sename, "", serange);
+ semanage_seuser_key_free(k)
+ semanage_seuser_free(u)
+
+@@ -403,12 +406,12 @@
+ keys.sort()
+ if is_mls_enabled == 1:
+ if heading:
+- print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range")
++ print "\n%-25s %-25s %-25s\n" % (_("Login Name"), _("SELinux User"), _("MLS/MCS Range"))
+ for k in keys:
+ print "%-25s %-25s %-25s" % (k, ddict[k][0], translate(ddict[k][1]))
+ else:
+ if heading:
+- print "\n%-25s %-25s\n" % ("Login Name", "SELinux User")
++ print "\n%-25s %-25s\n" % (_("Login Name"), _("SELinux User"))
+ for k in keys:
+ print "%-25s %-25s" % (k, ddict[k][0])
+
+@@ -461,7 +464,8 @@
rc = semanage_user_set_mlslevel(self.sh, u, selevel)
if rc < 0:
raise ValueError(_("Could not set MLS level for %s") % name)
@@ -4999,7 +5006,7 @@
rc = semanage_user_set_prefix(self.sh, u, prefix)
if rc < 0:
raise ValueError(_("Could not add prefix %s for %s") % (r, prefix))
-@@ -525,7 +529,9 @@
+@@ -527,7 +531,9 @@
semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
if prefix != "":
@@ -5010,3 +5017,56 @@
if len(roles) != 0:
for r in rlist:
+@@ -617,13 +623,13 @@
+ keys.sort()
+ if is_mls_enabled == 1:
+ if heading:
+- print "\n%-15s %-10s %-10s %-30s" % ("", "Labeling", "MLS/", "MLS/")
+- print "%-15s %-10s %-10s %-30s %s\n" % ("SELinux User", "Prefix", "MCS Level", "MCS Range", "SELinux Roles")
++ print "\n%-15s %-10s %-10s %-30s" % ("", _("Labeling"), _("MLS/"), _("MLS/"))
++ print "%-15s %-10s %-10s %-30s %s\n" % (_("SELinux User"), _("Prefix"), _("MCS Level"), _("MCS Range"), _("SELinux Roles"))
+ for k in keys:
+ print "%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3])
+ else:
+ if heading:
+- print "%-15s %s\n" % ("SELinux User", "SELinux Roles")
++ print "%-15s %s\n" % (_("SELinux User"), _("SELinux Roles"))
+ for k in keys:
+ print "%-15s %s" % (k, ddict[k][3])
+
+@@ -832,7 +838,7 @@
+
+ def list(self, heading = 1):
+ if heading:
+- print "%-30s %-8s %s\n" % ("SELinux Port Type", "Proto", "Port Number")
++ print "%-30s %-8s %s\n" % (_("SELinux Port Type"), _("Proto"), _("Port Number"))
+ ddict = self.get_all_by_type()
+ keys = ddict.keys()
+ keys.sort()
+@@ -1002,7 +1008,7 @@
+
+ def list(self, heading = 1):
+ if heading:
+- print "%-30s %s\n" % ("SELinux Interface", "Context")
++ print "%-30s %s\n" % (_("SELinux Interface"), _("Context"))
+ ddict = self.get_all()
+ keys = ddict.keys()
+ keys.sort()
+@@ -1186,7 +1192,7 @@
+
+ def list(self, heading = 1):
+ if heading:
+- print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context")
++ print "%-50s %-18s %s\n" % (_("SELinux fcontext"), _("type"), _("Context"))
+ fcon_list = self.get_all()
+ for fcon in fcon_list:
+ if len(fcon) > 3:
+@@ -1284,7 +1290,7 @@
+
+ def list(self, heading = 1):
+ if heading:
+- print "%-50s %-18s\n" % ("SELinux boolean", "value")
++ print "%-50s %-18s\n" % (_("SELinux boolean"), _("value"))
+ ddict = self.get_all()
+ keys = ddict.keys()
+ for k in keys:
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- policycoreutils.spec 9 Jan 2007 15:19:23 -0000 1.358
+++ policycoreutils.spec 11 Jan 2007 20:19:38 -0000 1.359
@@ -1,10 +1,10 @@
%define libauditver 1.1.4-3
%define libsepolver 1.12.27-1
%define libsemanagever 1.6.17-1
-%define libselinuxver 1.33.3-2
+%define libselinuxver 1.33.4-1
Summary: SELinux policy core utilities.
Name: policycoreutils
-Version: 1.33.10
+Version: 1.33.12
Release: 1%{?dist}
License: GPL
Group: System Environment/Base
@@ -168,6 +168,18 @@
[ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null
%changelog
+* Tue Jan 9 2007 Dan Walsh <dwalsh at redhat.com> 1.33.12-1
+- Want to update to match api
+- Update to upstream
+ * Merged newrole securetty check from Dan Walsh.
+ * Merged semodule patch to generalize list support from Karl MacMillan.
+Resolves: #200110
+
+* Tue Jan 9 2007 Dan Walsh <dwalsh at redhat.com> 1.33.11-1
+- Update to upstream
+ * Merged fixfiles and seobject fixes from Dan Walsh.
+ * Merged semodule support for list of modules after -i from Karl MacMillan.
+
* Tue Jan 9 2007 Dan Walsh <dwalsh at redhat.com> 1.33.10-1
- Update to upstream
* Merged patch to correctly handle a failure during semanage handle
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources 9 Jan 2007 15:19:23 -0000 1.135
+++ sources 11 Jan 2007 20:19:38 -0000 1.136
@@ -1 +1 @@
-131eadefb07d3e320d860136177578e4 policycoreutils-1.33.10.tgz
+9ee1abc2e930c675359c169771cff773 policycoreutils-1.33.12.tgz
More information about the fedora-cvs-commits
mailing list