rpms/policycoreutils/FC-6 .cvsignore, 1.123, 1.124 policycoreutils-po.patch, 1.10, 1.11 policycoreutils-rhat.patch, 1.247, 1.248 policycoreutils.spec, 1.326, 1.327 sources, 1.130, 1.131

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Dec 6 20:56:26 UTC 2006


Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13845

Modified Files:
	.cvsignore policycoreutils-po.patch policycoreutils-rhat.patch 
	policycoreutils.spec sources 
Log Message:
* Wed Dec 6 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-3
- Update po files
Resolves: #216920



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore	29 Nov 2006 20:24:51 -0000	1.123
+++ .cvsignore	6 Dec 2006 20:56:19 -0000	1.124
@@ -119,3 +119,4 @@
 policycoreutils-1.33.2.tgz
 policycoreutils-1.33.4.tgz
 policycoreutils-1.33.5.tgz
+policycoreutils-1.33.6.tgz

policycoreutils-po.patch:
 Makefile            |    2 
 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               |  481 +++++++++++++++-------------
 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            |  539 +++++++++++++++++--------------
 zh_TW.po            |  842 ++++++++++++++++++++++++++-----------------------
 zu.po               |  481 +++++++++++++++-------------
 76 files changed, 21533 insertions(+), 17157 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-po.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policycoreutils-po.patch	29 Nov 2006 20:24:51 -0000	1.10
+++ policycoreutils-po.patch	6 Dec 2006 20:56:19 -0000	1.11
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.5/po/af.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.6/po/af.po
 --- nsapolicycoreutils/po/af.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/af.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/af.po	2006-12-06 15:50:35.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.5/po/am.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.6/po/am.po
 --- nsapolicycoreutils/po/am.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/am.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/am.po	2006-12-06 15:50:35.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.5/po/ar.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.6/po/ar.po
 --- nsapolicycoreutils/po/ar.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/ar.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/ar.po	2006-12-06 15:50:35.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.5/po/as.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.6/po/as.po
 --- nsapolicycoreutils/po/as.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/as.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/as.po	2006-12-06 15:50:35.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.5/po/be.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.6/po/be.po
 --- nsapolicycoreutils/po/be.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/be.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/be.po	2006-12-06 15:50:35.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.5/po/bg.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.6/po/bg.po
 --- nsapolicycoreutils/po/bg.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/bg.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/bg.po	2006-12-06 15:50:35.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.5/po/bn_IN.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.6/po/bn_IN.po
 --- nsapolicycoreutils/po/bn_IN.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/bn_IN.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/bn_IN.po	2006-12-06 15:50:35.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.5/po/bn.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.33.6/po/bn.po
 --- nsapolicycoreutils/po/bn.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/bn.po	2006-11-29 12:46:08.000000000 -0500
++++ policycoreutils-1.33.6/po/bn.po	2006-12-06 15:50:35.000000000 -0500
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
@@ -8930,19 +8930,21 @@
  #, c-format
  msgid "Options Error: %s "
  msgstr ""
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.5/po/ca.po
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.6/po/ca.po
 --- nsapolicycoreutils/po/ca.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/ca.po	2006-11-29 12:46:08.000000000 -0500
-@@ -22,7 +22,7 @@
++++ policycoreutils-1.33.6/po/ca.po	2006-12-06 15:50:35.000000000 -0500
+@@ -22,8 +22,8 @@
  msgstr ""
  "Project-Id-Version: policycoreutils\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-20 09:14-0400\n"
+-"PO-Revision-Date: 2006-08-28 10:34+0200\n"
 +"POT-Creation-Date: 2006-11-21 14:21-0500\n"
- "PO-Revision-Date: 2006-08-28 10:34+0200\n"
++"PO-Revision-Date: 2006-12-03 01:04+0100\n"
  "Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
  "Language-Team: Catalan <tradgnome at softcatala.org>\n"
-@@ -40,236 +40,288 @@
+ "MIME-Version: 1.0\n"
+@@ -40,236 +40,287 @@
  msgid "%s:  Can't load policy:  %s\n"
  msgstr "%s: no es pot carregar la política: %s\n"
  
@@ -8983,7 +8985,7 @@
  
 -#: ../newrole/newrole.c:355
 +#: ../newrole/newrole.c:316
-+#, fuzzy, c-format
++#, c-format
 +msgid "cannot find valid entry in the passwd file.\n"
 +msgstr "no s'ha trobat la vostra entrada en el fitxer de contrasenyes.\n"
 +
@@ -9000,7 +9002,7 @@
 +#: ../newrole/newrole.c:389
 +#, c-format
 +msgid "Unable to clear environment\n"
-+msgstr ""
++msgstr "No es pot buidar l'entorn\n"
 +
 +#: ../newrole/newrole.c:436 ../newrole/newrole.c:513
  #, c-format
@@ -9009,16 +9011,14 @@
  
 -#: ../newrole/newrole.c:369
 +#: ../newrole/newrole.c:444 ../newrole/newrole.c:519
-+#, fuzzy, c-format
++#, c-format
 +msgid "Error setting capabilities, aborting\n"
-+msgstr "S'ha produït un error en iniciar les capacitats, s'està anul·lant.\n"
++msgstr "S'ha produït un error en establir les capacitats, s'està anul·lant\n"
 +
 +#: ../newrole/newrole.c:450
-+#, fuzzy, c-format
++#, c-format
 +msgid "Error setting KEEPCAPS, aborting\n"
-+msgstr ""
-+"S'ha produït un error en tornar a establir el valor de KEEPCAPS, s'està "
-+"anul·lant.\n"
++msgstr "S'ha produït un error en establir KEEPCAPS, s'està anul·lant.\n"
 +
 +#: ../newrole/newrole.c:458 ../newrole/newrole.c:531
  #, c-format
@@ -9051,7 +9051,7 @@
 +#: ../newrole/newrole.c:482 ../newrole/newrole.c:536
 +#, c-format
 +msgid "Error freeing caps\n"
-+msgstr ""
++msgstr "S'ha produït un error en eliminar les capacitats\n"
 +
 +#: ../newrole/newrole.c:580
  #, c-format
@@ -9076,6 +9076,7 @@
 -msgstr "El newrole només es pot fer servir amb un nucli amb SELinux.\n"
 -
 -#: ../newrole/newrole.c:516
++# FIXME: enforce -> fer cumplir (josep)
 +#: ../newrole/newrole.c:634 ../newrole/newrole.c:978
  #, c-format
  msgid "Could not determine enforcing mode.\n"
@@ -9083,104 +9084,104 @@
  
 -#: ../newrole/newrole.c:536
 +#: ../newrole/newrole.c:641
-+#, c-format
+ #, c-format
+-msgid "Error: multiple roles specified\n"
+-msgstr "S'ha produït un error: s'han especificat múltiples rols\n"
 +msgid "Error!  Could not open %s.\n"
 +msgstr "S'ha produït un error: no s'ha pogut obrir %s.\n"
-+
+ 
+-#: ../newrole/newrole.c:546
 +#: ../newrole/newrole.c:646
-+#, c-format
+ #, c-format
[...5489 lines suppressed...]
++#, python-format
  msgid "Invalid prefix %s"
- msgstr "无效的值 %s"
+-msgstr "无效的值 %s"
++msgstr "无效的前缀 %s"
  
 -#: ../semanage/seobject.py:463
 +#: ../semanage/seobject.py:466
@@ -80783,10 +82177,11 @@
  msgstr "无法列出文件 context"
  
 -#: ../semanage/seobject.py:1165
+-#, fuzzy
 +#: ../semanage/seobject.py:1168
- #, fuzzy
  msgid "Could not list local file contexts"
- msgstr "无法列出文件 context"
+-msgstr "无法列出文件 context"
++msgstr "无法列出本地文件上下文"
  
 -#: ../semanage/seobject.py:1200
 +#: ../semanage/seobject.py:1203
@@ -80836,7 +82231,7 @@
  msgid "Could not list booleans"
  msgstr "无法列出布尔值"
  
-@@ -956,11 +1011,11 @@
+@@ -956,11 +1012,11 @@
  msgid "Generating type enforcment file: %s.te"
  msgstr "产生类型强制文件:%s.te"
  
@@ -80850,7 +82245,7 @@
  msgid ""
  "\n"
  "******************** IMPORTANT ***********************\n"
-@@ -968,7 +1023,7 @@
+@@ -968,7 +1024,7 @@
  "\n"
  "********************重要 ***********************\n"
  
@@ -80859,7 +82254,7 @@
  #, c-format
  msgid ""
  "In order to load this newly created policy package into the kernel,\n"
-@@ -983,7 +1038,7 @@
+@@ -983,7 +1039,8 @@
  "semodule -i %s.pp\n"
  "\n"
  
@@ -80868,40 +82263,31 @@
  #, c-format
  msgid "Options Error: %s "
  msgstr "选项错误: %s "
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.5/po/zh_TW.po
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.6/po/zh_TW.po
 --- nsapolicycoreutils/po/zh_TW.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/zh_TW.po	2006-11-29 12:46:09.000000000 -0500
-@@ -1,21 +1,21 @@
--# translation of zh_TW.po to Chinese, Traditional
++++ policycoreutils-1.33.6/po/zh_TW.po	2006-12-06 15:50:36.000000000 -0500
+@@ -1,15 +1,16 @@
+ # translation of zh_TW.po to Chinese, Traditional
 -# translation of policycoreutils.po to Chinese, Traditional
 +# translation of zh_TW.po to
  # This file is distributed under the same license as the PACKAGE package.
  # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
--# Chester Cheng <ccheng at redhat.com>, 2006.
- #
-+# Chester Cheng <ccheng at redhat.com>, 2006.
+ # Chester Cheng <ccheng at redhat.com>, 2006.
 +# Chester Cheng <ccheng at brisbane.redhat.com>, 2006.
+ #
  msgid ""
  msgstr ""
  "Project-Id-Version: zh_TW\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-20 09:14-0400\n"
 -"PO-Revision-Date: 2006-08-30 00:19+1000\n"
--"Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
--"Language-Team: Chinese, Traditional <zh_TW at li.org>\n"
 +"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"PO-Revision-Date: 2006-11-28 00:29+1000\n"
-+"Last-Translator: Chester Cheng <ccheng at brisbane.redhat.com>\n"
-+"Language-Team:  <zh at li.org>\n"
++"PO-Revision-Date: 2006-11-29 15:00+1000\n"
+ "Last-Translator: Chester Cheng <ccheng at redhat.com>\n"
+ "Language-Team: Chinese, Traditional <zh_TW at li.org>\n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.9.1\n"
-+"X-Generator: KBabel 1.11.4\n"
- 
- #: ../load_policy/load_policy.c:22
- #, c-format
-@@ -27,228 +27,278 @@
+@@ -27,228 +28,278 @@
  msgid "%s:  Can't load policy:  %s\n"
  msgstr "%s:無法載入政策:%s\n"
  
@@ -81002,7 +82388,7 @@
 +#: ../newrole/newrole.c:482 ../newrole/newrole.c:536
 +#, c-format
 +msgid "Error freeing caps\n"
-+msgstr "釋放 caps 時發生錯誤\n"
++msgstr "釋放功能時發生錯誤\n"
  
 -#: ../newrole/newrole.c:410
 +#: ../newrole/newrole.c:580
@@ -81219,13 +82605,13 @@
 +#, c-format
 +msgid "Authenticating %s.\n"
 +msgstr "認證 %s。\n"
-+
+ 
+-#: ../newrole/newrole.c:834
 +#: ../newrole/newrole.c:1020 ../run_init/run_init.c:126
 +#, c-format
 +msgid "failed to initialize PAM\n"
 +msgstr "初始化 PAM 失敗\n"
- 
--#: ../newrole/newrole.c:834
++
 +#: ../newrole/newrole.c:1029
 +#, c-format
 +msgid "newrole: incorrect password for %s\n"
@@ -81274,13 +82660,13 @@
  msgid "Could not set exec context to %s.\n"
 -msgstr ""
 +msgstr "無法將 exec 內文設定至 %s。\n"
-+
+ 
+-#: ../newrole/newrole.c:932
 +#: ../newrole/newrole.c:1173
 +#, c-format
 +msgid "Unable to restore the environment, aborting\n"
 +msgstr "無法復原環境;放棄\n"
- 
--#: ../newrole/newrole.c:932
++
 +#: ../newrole/newrole.c:1184
  msgid "failed to exec shell\n"
 -msgstr ""
@@ -81288,20 +82674,20 @@
  
  #: ../run_init/run_init.c:67
  msgid ""
-@@ -256,31 +306,39 @@
+@@ -256,31 +307,39 @@
  "  where: <script> is the name of the init script to run,\n"
  "         <args ...> are the arguments to that script."
  msgstr ""
 +"USAGE: run_init <script> <args ...>\n"
 +"  其中:<script> 是要執行的 init 程序檔,\n"
 +"         <args ...> 是程序檔的參數。"
-+
+ 
+-#: ../run_init/run_init.c:267
 +#: ../run_init/run_init.c:139
 +#, c-format
 +msgid "failed to get account information\n"
 +msgstr "取得帳號資訊時失敗\n"
- 
--#: ../run_init/run_init.c:267
++
 +#: ../run_init/run_init.c:275
  #, c-format
  msgid "run_init: incorrect password for %s\n"
@@ -81337,7 +82723,7 @@
  
  #: ../scripts/chcat:75 ../scripts/chcat:145
  msgid "Requires at least one category"
-@@ -289,677 +347,678 @@
+@@ -289,677 +348,678 @@
  #: ../scripts/chcat:89 ../scripts/chcat:159
  #, c-format
  msgid "Can not modify sensitivity levels using '+' on %s"
@@ -82282,7 +83668,7 @@
  #, c-format
  msgid ""
  "In order to load this newly created policy package into the kernel,\n"
-@@ -968,8 +1027,13 @@
+@@ -968,8 +1028,14 @@
  "semodule -i %s.pp\n"
  "\n"
  msgstr ""
@@ -82298,9 +83684,10 @@
  msgid "Options Error: %s "
 -msgstr ""
 +msgstr "選項錯誤:%s"
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.5/po/zu.po
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.6/po/zu.po
 --- nsapolicycoreutils/po/zu.po	2006-11-22 13:53:51.000000000 -0500
-+++ policycoreutils-1.33.5/po/zu.po	2006-11-29 12:46:09.000000000 -0500
++++ policycoreutils-1.33.6/po/zu.po	2006-12-06 15:50:36.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 ++
 load_policy/load_policy.c       |   10 
 restorecond/restorecond.c       |   12 
 semanage/seobject.py            |   26 
 18 files changed, 4816 insertions(+), 21 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- policycoreutils-rhat.patch	29 Nov 2006 20:24:52 -0000	1.247
+++ policycoreutils-rhat.patch	6 Dec 2006 20:56:19 -0000	1.248
@@ -1,80 +1,3 @@
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.33.5/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow	2006-11-16 17:14:29.000000000 -0500
-+++ policycoreutils-1.33.5/audit2allow/audit2allow	2006-11-28 10:44:03.000000000 -0500
-@@ -29,6 +29,7 @@
- if __name__ == '__main__':
- 	import commands, sys, os, getopt, selinux
-         import gettext
-+	import re
-         try:
-                 gettext.install('policycoreutils')
-         except:
-@@ -59,6 +60,11 @@
- 			print msg
- 		sys.exit(1)
- 		
-+	def verify_module(module):
-+		m = re.findall("[^a-zA-Z0-9]", module)
-+		if len(m) != 0:
-+			usage(_("Alphanumeric Charaters Only"))
-+		
- 	def errorExit(error):
- 		sys.stderr.write("%s: " % sys.argv[0])
- 		sys.stderr.write("%s\n" % error)
-@@ -125,10 +131,12 @@
- 				if module != "" or a[0] == "-":
- 					usage()
- 				module = a
-+				verify_module(module)
- 			if o == "-M":
- 				if module != "" or output_ind  or a[0] == "-":
- 					usage()
- 				module = a
-+				verify_module(module)
- 				outfile = a+".te"
- 				buildPP = 1
- 				if not os.path.exists("/usr/bin/checkmodule"):
-@@ -184,22 +192,27 @@
- 		output.write(serules.out(requires, module))
- 		output.flush()
- 		if buildPP:
--			cmd = "checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
--			print _("Compiling policy")
--			print cmd
--			rc = commands.getstatusoutput(cmd)
--			if rc[0] == 0:
--				cmd = "semodule_package -o %s.pp -m %s.mod" % (module, module)
--				if fc_file != "":
--					cmd = "%s -f %s" % (cmd, fc_file)
--					
-+			if ref_ind:
-+				status, type = selinux.selinux_getpolicytype()
-+				cmd = "make -f /usr/share/selinux/%s/include/Makefile %s.pp" % (type, module)
-+				print _("Compiling policy")
-+				print cmd
-+				rc = commands.getstatusoutput(cmd)
-+			else:
-+				cmd = "checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
-+				print _("Compiling policy")
- 				print cmd
- 				rc = commands.getstatusoutput(cmd)
- 				if rc[0] == 0:
--					print _("\n******************** IMPORTANT ***********************\n")
--					print (_("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n") % module)
--				else:
--					errorExit(rc[1])
-+					cmd = "semodule_package -o %s.pp -m %s.mod" % (module, module)
-+					if fc_file != "":
-+						cmd = "%s -f %s" % (cmd, fc_file)
-+					
-+					print cmd
-+					rc = commands.getstatusoutput(cmd)
-+			if rc[0] == 0:
-+				print _("\n******************** IMPORTANT ***********************\n")
-+				print (_("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n") % module)
- 			else:
- 				errorExit(rc[1])
- 
 diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.5/gui/booleansPage.py
 --- nsapolicycoreutils/gui/booleansPage.py	1969-12-31 19:00:00.000000000 -0500
 +++ policycoreutils-1.33.5/gui/booleansPage.py	2006-11-28 10:44:03.000000000 -0500
@@ -4948,27 +4871,6 @@
  
  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.5/newrole/newrole.c
---- nsapolicycoreutils/newrole/newrole.c	2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-1.33.5/newrole/newrole.c	2006-11-28 10:44:03.000000000 -0500
-@@ -1068,11 +1068,16 @@
- 		 */
- 		int rc;
- 		int exit_code = 0;
-+		int status;
- 
- 		do {
--			rc = wait(NULL);
-+			rc = wait(&status);
- 		} while (rc < 0 && errno == EINTR);
- 
-+		/* Preserve child exit status, unless there is another error. */
-+		if (WIFEXITED(status))
-+			exit_code = WEXITSTATUS(status);
-+
- 		if (restore_tty_label(fd, ttyn, tty_context, new_tty_context)) {
- 			fprintf(stderr, _("Unable to restore tty label...\n"));
- 			exit_code = -1;
 diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.5/restorecond/restorecond.c
 --- nsapolicycoreutils/restorecond/restorecond.c	2006-11-16 17:14:28.000000000 -0500
 +++ policycoreutils-1.33.5/restorecond/restorecond.c	2006-11-29 12:44:06.000000000 -0500
@@ -4998,37 +4900,6 @@
  	}
  	free(scontext);
  	close(fd);
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/run_init/run_init.c policycoreutils-1.33.5/run_init/run_init.c
---- nsapolicycoreutils/run_init/run_init.c	2006-11-16 17:14:27.000000000 -0500
-+++ policycoreutils-1.33.5/run_init/run_init.c	2006-11-28 10:44:03.000000000 -0500
-@@ -132,6 +132,14 @@
- 		result = 1;	/* user authenticated OK! */
- 	}
- 
-+	/* If we were successful, call pam_acct_mgmt() to reset the
-+         * pam_tally failcount.
-+         */
-+	if (result && (PAM_SUCCESS != pam_acct_mgmt(pam_handle, 0)) ) {
-+		fprintf(stderr, _("failed to get account information\n"));
-+		exit(-1);
-+	}	
-+
- 	/* We're done with PAM.  Free `pam_handle'. */
- 	pam_end(pam_handle, PAM_SUCCESS);
- 
-diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.33.5/semanage/semanage.8
---- nsapolicycoreutils/semanage/semanage.8	2006-11-20 12:19:55.000000000 -0500
-+++ policycoreutils-1.33.5/semanage/semanage.8	2006-11-28 10:44:03.000000000 -0500
-@@ -82,9 +82,6 @@
- .TP
- .I                \-T, \-\-trans
- SELinux Translation
--.TP
--.I                \-v, \-\-verbose    
--verbose output
- 
- .SH EXAMPLE
- .nf
 diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.5/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-11-16 17:14:26.000000000 -0500
 +++ policycoreutils-1.33.5/semanage/seobject.py	2006-11-28 10:44:03.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- policycoreutils.spec	29 Nov 2006 20:24:52 -0000	1.326
+++ policycoreutils.spec	6 Dec 2006 20:56:19 -0000	1.327
@@ -4,8 +4,8 @@
 %define libselinuxver 1.30.29-2
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.33.5
-Release: 4%{?dist}
+Version: 1.33.6
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -168,6 +168,22 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Dec 6 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-3
+- Update po files
+Resolves: #216920
+
+* Fri Dec 1 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-2
+- Update po files
+Resolves: #216920
+
+* Wed Nov 29 2006 Dan Walsh <dwalsh at redhat.com> 1.33.6-1
+- Update to upstream
+	* Patch from Dan Walsh to add an pam_acct_msg call to run_init
+	* Patch from Dan Walsh to fix error code returns in newrole
+	* Patch from Dan Walsh to remove verbose flag from semanage man page
+	* Patch from Dan Walsh to make audit2allow use refpolicy Makefile
+	  in /usr/share/selinux/<SELINUXTYPE>
+	
 * Wed Nov 29 2006 Dan Walsh <dwalsh at redhat.com> 1.33.5-4
 - Fixing the Makefile line again to build with LSPP support
 Resolves: #208838


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/FC-6/sources,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- sources	29 Nov 2006 20:24:52 -0000	1.130
+++ sources	6 Dec 2006 20:56:19 -0000	1.131
@@ -1 +1 @@
-cbeefd069f3b9985849a00ea2335feae  policycoreutils-1.33.5.tgz
+1608bac92b9b014500defff770ea1691  policycoreutils-1.33.6.tgz




More information about the fedora-cvs-commits mailing list