diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.14/audit2allow/audit2allow.1 --- nsapolicycoreutils/audit2allow/audit2allow.1 2006-05-15 09:42:57.000000000 -0400 +++ policycoreutils-1.30.14/audit2allow/audit2allow.1 2006-06-20 09:11:30.000000000 -0400 @@ -66,7 +66,7 @@ Generate require output syntax for loadable modules. .TP .B "\-R" | "\-\-reference" -Generate reference policy using installed macros +Generate reference policy using installed macros. Requires the selinux-policy-devel package. .TP .B "\-t " | "\-\-tefile" Indicates input file is a te (type enforcement) file. This can be used to translate old te format to new policy format. diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.14/audit2allow/avc.py --- nsapolicycoreutils/audit2allow/avc.py 2006-05-23 06:19:30.000000000 -0400 +++ policycoreutils-1.30.14/audit2allow/avc.py 2006-06-20 09:12:47.000000000 -0400 @@ -66,7 +66,7 @@ try: fd = open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") except IOError, error: - raise IOError("Reference policy generation requires the policy development package.\n%s" % error) + raise IOError("Reference policy generation requires the policy development package selinux-policy-devel.\n%s" % error) records = fd.read().split("\n") regexp = "^define *\(`([^']*)' *, *` *\{([^}]*)}'" for r in records: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.14/po/hi.po --- nsapolicycoreutils/po/hi.po 2006-06-16 15:08:24.000000000 -0400 +++ policycoreutils-1.30.14/po/hi.po 2006-06-19 10:34:57.000000000 -0400 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: hi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-16 09:51-0400\n" -"PO-Revision-Date: 2006-05-09 15:25+0530\n" +"POT-Creation-Date: 2006-05-26 13:48-0400\n" +"PO-Revision-Date: 2006-06-19 11:09+0530\n" "Last-Translator: Rajesh Ranjan \n" "Language-Team: Hindi \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" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n\n" "\n" #: ../load_policy/load_policy.c:22 @@ -361,42 +361,40 @@ msgstr "chcat -l +CompanyConfidential juser" #: ../semanage/semanage:122 -#, fuzzy msgid "Requires 2 or more arguments" -msgstr "उपसर्ग या भूमिका जरूरी" +msgstr "2 ज्यादा तर्क जरूरी" #: ../semanage/semanage:127 -#, fuzzy, c-format +#, c-format msgid "%s not defined" -msgstr "पोर्ट %s/%s परिभाषित नहीं है" +msgstr "%s परिभाषित नहीं" #: ../semanage/semanage:151 -#, fuzzy, c-format +#, c-format msgid "%s not valid for %s objects\n" -msgstr "%s एक वैध संदर्भ नहीं है\n" +msgstr "%s वैध नहीं है %s वस्तु के लिये\n" #: ../semanage/semanage:178 ../semanage/semanage:186 -#, fuzzy msgid "range not supported on Non MLS machines" -msgstr "गैर-MLS मशीन पर अनुवाद समर्थित नहीं" +msgstr "गैर-MLS मशीन पर परिसर समर्थित नहीं" #: ../semanage/semanage:244 msgid "You must specify a role" -msgstr "" +msgstr "आप जरूर एक भूमिका निर्दिष्ट करें" #: ../semanage/semanage:246 msgid "You must specify a prefix" -msgstr "" +msgstr "आप जरूर एक उपसर्ग निर्दिष्ट करें" #: ../semanage/semanage:295 -#, fuzzy, c-format +#, c-format msgid "Options Error %s " -msgstr "विकल्प त्रुटि: %s " +msgstr "विकल्प त्रुटि %s" #: ../semanage/semanage:299 -#, fuzzy, c-format +#, c-format msgid "Invalid value %s" -msgstr "अवैध स्तर '%s' " +msgstr "अवैध मान %s" #: ../semanage/seobject.py:124 msgid "translations not supported on non-MLS machines" @@ -971,3 +969,4 @@ #, c-format msgid "Options Error: %s " msgstr "विकल्प त्रुटि: %s " + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.30.14/po/mr.po --- nsapolicycoreutils/po/mr.po 2006-06-16 15:08:24.000000000 -0400 +++ policycoreutils-1.30.14/po/mr.po 2006-06-19 10:31:00.000000000 -0400 @@ -1,20 +1,21 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# translation of mr.po to Marathi # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Rahul Bhalerao , 2006. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: mr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-16 09:51-0400\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2006-05-26 13:48-0400\n" +"PO-Revision-Date: 2006-06-13 14:36+0530\n" +"Last-Translator: Rahul Bhalerao \n" +"Language-Team: Marathi\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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../load_policy/load_policy.c:22 #, c-format @@ -42,8 +43,9 @@ msgstr "" #: ../newrole/newrole.c:250 ../run_init/run_init.c:155 +#, fuzzy msgid "Password:" -msgstr "" +msgstr "गुप्तशब्द:" #: ../newrole/newrole.c:282 ../run_init/run_init.c:187 #, c-format @@ -57,28 +59,33 @@ #: ../newrole/newrole.c:354 #, c-format +#, fuzzy msgid "Error initing capabilities, aborting.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:367 #, c-format +#, fuzzy msgid "Error dropping capabilities, aborting\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:374 #, c-format +#, fuzzy msgid "Error changing uid, aborting.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:380 #, c-format +#, fuzzy msgid "Error resetting KEEPCAPS, aborting\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:386 #, c-format +#, fuzzy msgid "Error dropping SETUID capability, aborting\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:459 #, c-format @@ -92,13 +99,15 @@ #: ../newrole/newrole.c:481 #, c-format +#, fuzzy msgid "Error: multiple roles specified\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:490 #, c-format +#, fuzzy msgid "Error: multiple types specified\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:498 #, c-format @@ -107,8 +116,9 @@ #: ../newrole/newrole.c:503 #, c-format +#, fuzzy msgid "Error: multiple levels specified\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:527 #, c-format @@ -132,13 +142,15 @@ #: ../newrole/newrole.c:596 #, c-format +#, fuzzy msgid "Error! Shell is not valid.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:603 #, c-format +#, fuzzy msgid "Error! Could not retrieve tty information.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:607 #, c-format @@ -182,8 +194,9 @@ #: ../newrole/newrole.c:711 #, c-format +#, fuzzy msgid "Error! Could not open %s.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:717 #, c-format @@ -207,8 +220,9 @@ #: ../newrole/newrole.c:754 #, c-format +#, fuzzy msgid "Warning! Could not restore context for %s\n" -msgstr "" +msgstr "ताकीद" #: ../newrole/newrole.c:774 #, c-format @@ -222,23 +236,27 @@ #: ../newrole/newrole.c:832 ../run_init/run_init.c:390 #, c-format +#, fuzzy msgid "Could not set exec context to %s.\n" -msgstr "" +msgstr "exec संदर्भ %s वर निर्धारित करता आला नाही.\n" #: ../newrole/newrole.c:842 #, c-format +#, fuzzy msgid "Error connecting to audit system.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:847 #, c-format +#, fuzzy msgid "Error allocating memory.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:853 #, c-format +#, fuzzy msgid "Error sending audit message.\n" -msgstr "" +msgstr "चूक" #: ../newrole/newrole.c:864 msgid "failed to exec shell\n" @@ -263,8 +281,9 @@ #: ../run_init/run_init.c:322 #, c-format +#, fuzzy msgid "No context in file %s\n" -msgstr "" +msgstr "नाही" #: ../run_init/run_init.c:345 #, c-format @@ -383,8 +402,9 @@ #: ../semanage/semanage:295 #, c-format +#, fuzzy msgid "Options Error %s " -msgstr "" +msgstr "चूक " #: ../semanage/semanage:299 #, c-format @@ -624,8 +644,9 @@ msgstr "" #: ../semanage/seobject.py:649 +#, fuzzy msgid "Type is required" -msgstr "" +msgstr "प्रकार" #: ../semanage/seobject.py:655 ../semanage/seobject.py:717 #: ../semanage/seobject.py:751 ../semanage/seobject.py:757 @@ -716,8 +737,9 @@ msgstr "" #: ../semanage/seobject.py:842 ../semanage/seobject.py:1014 +#, fuzzy msgid "SELinux Type is required" -msgstr "" +msgstr "प्रकार" #: ../semanage/seobject.py:846 ../semanage/seobject.py:910 #: ../semanage/seobject.py:947 ../semanage/seobject.py:1018 @@ -955,5 +977,7 @@ #: ../audit2allow/audit2allow:203 #, c-format +#, fuzzy msgid "Options Error: %s " -msgstr "" +msgstr "चूक " + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.14/po/ms.po --- nsapolicycoreutils/po/ms.po 2006-06-16 15:08:24.000000000 -0400 +++ policycoreutils-1.30.14/po/ms.po 2006-06-19 10:31:00.000000000 -0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-16 09:51-0400\n" -"PO-Revision-Date: 2006-06-11 18:36+0800\n" +"POT-Creation-Date: 2006-05-26 13:48-0400\n" +"PO-Revision-Date: 2006-06-17 00:00+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -30,7 +30,8 @@ msgid "Out of memory!\n" msgstr "Memori tidak cukup." -#: ../newrole/newrole.c:201 ../run_init/run_init.c:126 +#: ../newrole/newrole.c:201 +#: ../run_init/run_init.c:126 #, fuzzy, c-format msgid "failed to initialize PAM\n" msgstr "Gagal untuk melekapkan partisyen." @@ -40,16 +41,19 @@ msgid "failed to set PAM_TTY\n" msgstr "Gagal untuk menetapkan katalaluan bagi kumpulan %s: %s\n" -#: ../newrole/newrole.c:250 ../run_init/run_init.c:155 +#: ../newrole/newrole.c:250 +#: ../run_init/run_init.c:155 msgid "Password:" msgstr "Katalaluan:" -#: ../newrole/newrole.c:282 ../run_init/run_init.c:187 +#: ../newrole/newrole.c:282 +#: ../run_init/run_init.c:187 #, c-format msgid "Cannot find your entry in the shadow passwd file.\n" msgstr "" -#: ../newrole/newrole.c:288 ../run_init/run_init.c:193 +#: ../newrole/newrole.c:288 +#: ../run_init/run_init.c:193 #, c-format msgid "getpass cannot open /dev/tty\n" msgstr "" @@ -223,7 +227,8 @@ msgid "Could not close descriptors.\n" msgstr "Tidak dapat memperuntukkan partisyen" -#: ../newrole/newrole.c:832 ../run_init/run_init.c:390 +#: ../newrole/newrole.c:832 +#: ../run_init/run_init.c:390 #, fuzzy, c-format msgid "Could not set exec context to %s.\n" msgstr "Tidak dapat menetapkan konteks exec ke %s.\n" @@ -280,12 +285,14 @@ msgid "authentication failed.\n" msgstr "Pengesahan gagal" -#: ../scripts/chcat:70 ../scripts/chcat:140 +#: ../scripts/chcat:70 +#: ../scripts/chcat:140 #, fuzzy msgid "Requires at least one category" msgstr "Peranti RAID jenis %s memerlukan sekurang-kurangnya %s ahli." -#: ../scripts/chcat:84 ../scripts/chcat:154 +#: ../scripts/chcat:84 +#: ../scripts/chcat:154 #, c-format msgid "Can not modify sensitivity levels using '+' on %s" msgstr "" @@ -295,12 +302,14 @@ msgid "%s is already in %s" msgstr "gid %s telah digunakan." -#: ../scripts/chcat:159 ../scripts/chcat:169 +#: ../scripts/chcat:159 +#: ../scripts/chcat:169 #, fuzzy, c-format msgid "%s is not in %s" msgstr "%s tidak dilaksanakan.\n" -#: ../scripts/chcat:232 ../scripts/chcat:237 +#: ../scripts/chcat:232 +#: ../scripts/chcat:237 msgid "Can not combine +/- with other types of categories" msgstr "" @@ -376,7 +385,8 @@ msgid "%s not valid for %s objects\n" msgstr "$0: konfigurasi bagi ${1} tidak dijumpai." -#: ../semanage/semanage:178 ../semanage/semanage:186 +#: ../semanage/semanage:178 +#: ../semanage/semanage:186 msgid "range not supported on Non MLS machines" msgstr "" @@ -393,7 +403,7 @@ #: ../semanage/semanage:295 #, fuzzy, c-format msgid "Options Error %s " -msgstr "Ralat Tidak Diketahui" +msgstr "Ralat Pilihan: %s" #: ../semanage/semanage:299 #, fuzzy, c-format @@ -409,7 +419,8 @@ msgid "Unable to open %s: translations not supported on non-MLS machines" msgstr "" -#: ../semanage/seobject.py:171 ../semanage/seobject.py:185 +#: ../semanage/seobject.py:171 +#: ../semanage/seobject.py:185 #, fuzzy, python-format msgid "Translations can not contain spaces '%s' " msgstr "Nama Perkongsian tidak boleh mengandungi ruang" @@ -443,17 +454,24 @@ msgid "Could not establish semanage connection" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:238 ../semanage/seobject.py:296 -#: ../semanage/seobject.py:343 ../semanage/seobject.py:424 -#: ../semanage/seobject.py:493 ../semanage/seobject.py:549 -#: ../semanage/seobject.py:1080 ../semanage/seobject.py:1119 -#: ../semanage/seobject.py:1188 ../semanage/seobject.py:1222 +#: ../semanage/seobject.py:238 +#: ../semanage/seobject.py:296 +#: ../semanage/seobject.py:343 +#: ../semanage/seobject.py:424 +#: ../semanage/seobject.py:493 +#: ../semanage/seobject.py:549 +#: ../semanage/seobject.py:1080 +#: ../semanage/seobject.py:1119 +#: ../semanage/seobject.py:1188 +#: ../semanage/seobject.py:1222 #, fuzzy, python-format msgid "Could not create a key for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:242 ../semanage/seobject.py:300 -#: ../semanage/seobject.py:347 ../semanage/seobject.py:353 +#: ../semanage/seobject.py:242 +#: ../semanage/seobject.py:300 +#: ../semanage/seobject.py:347 +#: ../semanage/seobject.py:353 #, python-format msgid "Could not check if login mapping for %s is defined" msgstr "" @@ -473,12 +491,14 @@ msgid "Could not create login mapping for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:256 ../semanage/seobject.py:438 +#: ../semanage/seobject.py:256 +#: ../semanage/seobject.py:438 #, fuzzy, python-format msgid "Could not set name for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:261 ../semanage/seobject.py:448 +#: ../semanage/seobject.py:261 +#: ../semanage/seobject.py:448 #, fuzzy, python-format msgid "Could not set MLS range for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -488,20 +508,29 @@ msgid "Could not set SELinux user for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:269 ../semanage/seobject.py:321 -#: ../semanage/seobject.py:359 ../semanage/seobject.py:463 -#: ../semanage/seobject.py:526 ../semanage/seobject.py:565 -#: ../semanage/seobject.py:692 ../semanage/seobject.py:734 -#: ../semanage/seobject.py:763 ../semanage/seobject.py:890 -#: ../semanage/seobject.py:931 ../semanage/seobject.py:963 -#: ../semanage/seobject.py:1060 ../semanage/seobject.py:1103 -#: ../semanage/seobject.py:1135 ../semanage/seobject.py:1206 +#: ../semanage/seobject.py:269 +#: ../semanage/seobject.py:321 +#: ../semanage/seobject.py:359 +#: ../semanage/seobject.py:463 +#: ../semanage/seobject.py:526 +#: ../semanage/seobject.py:565 +#: ../semanage/seobject.py:692 +#: ../semanage/seobject.py:734 +#: ../semanage/seobject.py:763 +#: ../semanage/seobject.py:890 +#: ../semanage/seobject.py:931 +#: ../semanage/seobject.py:963 +#: ../semanage/seobject.py:1060 +#: ../semanage/seobject.py:1103 +#: ../semanage/seobject.py:1135 +#: ../semanage/seobject.py:1206 #: ../semanage/seobject.py:1238 #, fuzzy msgid "Could not start semanage transaction" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:273 ../semanage/seobject.py:277 +#: ../semanage/seobject.py:273 +#: ../semanage/seobject.py:277 #, fuzzy, python-format msgid "Could not add login mapping for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -510,7 +539,8 @@ msgid "Requires seuser or serange" msgstr "" -#: ../semanage/seobject.py:302 ../semanage/seobject.py:349 +#: ../semanage/seobject.py:302 +#: ../semanage/seobject.py:349 #, fuzzy, python-format msgid "Login mapping for %s is not defined" msgstr "$file bukan milik \"$user\"" @@ -520,7 +550,8 @@ msgid "Could not query seuser for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:325 ../semanage/seobject.py:329 +#: ../semanage/seobject.py:325 +#: ../semanage/seobject.py:329 #, fuzzy, python-format msgid "Could not modify login mapping for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -530,7 +561,8 @@ msgid "Login mapping for %s is defined in policy, cannot be deleted" msgstr "" -#: ../semanage/seobject.py:364 ../semanage/seobject.py:368 +#: ../semanage/seobject.py:364 +#: ../semanage/seobject.py:368 #, fuzzy, python-format msgid "Could not delete login mapping for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -540,8 +572,10 @@ msgid "Could not list login mappings" msgstr "Senarai Pengepala tidak dijumpai" -#: ../semanage/seobject.py:428 ../semanage/seobject.py:497 -#: ../semanage/seobject.py:553 ../semanage/seobject.py:559 +#: ../semanage/seobject.py:428 +#: ../semanage/seobject.py:497 +#: ../semanage/seobject.py:553 +#: ../semanage/seobject.py:559 #, fuzzy, python-format msgid "Could not check if SELinux user %s is defined" msgstr "Pengguna %s tidak dapat dipadam: %s.\n" @@ -576,7 +610,8 @@ msgid "Could not extract key for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:467 ../semanage/seobject.py:471 +#: ../semanage/seobject.py:467 +#: ../semanage/seobject.py:471 #, fuzzy, python-format msgid "Could not add SELinux user %s" msgstr "Pengguna %s tidak dapat dipadam: %s.\n" @@ -589,7 +624,8 @@ msgid "Requires prefix or roles" msgstr "" -#: ../semanage/seobject.py:499 ../semanage/seobject.py:555 +#: ../semanage/seobject.py:499 +#: ../semanage/seobject.py:555 #, fuzzy, python-format msgid "SELinux user %s is not defined" msgstr "$file bukan milik \"$user\"" @@ -599,7 +635,8 @@ msgid "Could not query user for %s" msgstr "Pengguna %s tidak dapat dipadam: %s.\n" -#: ../semanage/seobject.py:530 ../semanage/seobject.py:534 +#: ../semanage/seobject.py:530 +#: ../semanage/seobject.py:534 #, fuzzy, python-format msgid "Could not modify SELinux user %s" msgstr "Pengguna %s tidak dapat dipadam: %s.\n" @@ -609,7 +646,8 @@ msgid "SELinux user %s is defined in policy, cannot be deleted" msgstr "$file bukan milik \"$user\"" -#: ../semanage/seobject.py:569 ../semanage/seobject.py:573 +#: ../semanage/seobject.py:569 +#: ../semanage/seobject.py:573 #, fuzzy, python-format msgid "Could not delete SELinux user %s" msgstr "Pengguna %s tidak dapat dipadam: %s.\n" @@ -644,8 +682,10 @@ msgid "Type is required" msgstr "Nama Perkongsian diperlukan" -#: ../semanage/seobject.py:655 ../semanage/seobject.py:717 -#: ../semanage/seobject.py:751 ../semanage/seobject.py:757 +#: ../semanage/seobject.py:655 +#: ../semanage/seobject.py:717 +#: ../semanage/seobject.py:751 +#: ../semanage/seobject.py:757 #, fuzzy, python-format msgid "Could not check if port %s/%s is defined" msgstr "Tidak dapat memperuntukkan partisyen" @@ -690,12 +730,14 @@ msgid "Could not set port context for %s/%s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:696 ../semanage/seobject.py:700 +#: ../semanage/seobject.py:696 +#: ../semanage/seobject.py:700 #, fuzzy, python-format msgid "Could not add port %s/%s" msgstr "Tidak dapat memperuntukkan partisyen" -#: ../semanage/seobject.py:709 ../semanage/seobject.py:906 +#: ../semanage/seobject.py:709 +#: ../semanage/seobject.py:906 #, fuzzy msgid "Requires setype or serange" msgstr "Ralat Pilihan s s" @@ -705,7 +747,8 @@ msgid "Requires setype" msgstr "Ralat Pilihan s s" -#: ../semanage/seobject.py:719 ../semanage/seobject.py:753 +#: ../semanage/seobject.py:719 +#: ../semanage/seobject.py:753 #, fuzzy, python-format msgid "Port %s/%s is not defined" msgstr "%s adalah nama hos yang tidak sah" @@ -715,7 +758,8 @@ msgid "Could not query port %s/%s" msgstr "Tidak dapat memperuntukkan partisyen" -#: ../semanage/seobject.py:738 ../semanage/seobject.py:742 +#: ../semanage/seobject.py:738 +#: ../semanage/seobject.py:742 #, fuzzy, python-format msgid "Could not modify port %s/%s" msgstr "Tidak dapat memperuntukkan partisyen" @@ -725,29 +769,36 @@ msgid "Port %s/%s is defined in policy, cannot be deleted" msgstr "" -#: ../semanage/seobject.py:767 ../semanage/seobject.py:771 +#: ../semanage/seobject.py:767 +#: ../semanage/seobject.py:771 #, fuzzy, python-format msgid "Could not delete port %s/%s" -msgstr "Padam fail atau tidak?" +msgstr "Tidak dapat memadam boolean %s" -#: ../semanage/seobject.py:779 ../semanage/seobject.py:798 +#: ../semanage/seobject.py:779 +#: ../semanage/seobject.py:798 #, fuzzy msgid "Could not list ports" -msgstr "Senarai Pengepala tidak dijumpai" +msgstr "Tidak dapat menyenaraikan boolean" -#: ../semanage/seobject.py:842 ../semanage/seobject.py:1014 +#: ../semanage/seobject.py:842 +#: ../semanage/seobject.py:1014 #, fuzzy msgid "SELinux Type is required" msgstr "Nama Perkongsian diperlukan" -#: ../semanage/seobject.py:846 ../semanage/seobject.py:910 -#: ../semanage/seobject.py:947 ../semanage/seobject.py:1018 +#: ../semanage/seobject.py:846 +#: ../semanage/seobject.py:910 +#: ../semanage/seobject.py:947 +#: ../semanage/seobject.py:1018 #, fuzzy, python-format msgid "Could not create key for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:850 ../semanage/seobject.py:914 -#: ../semanage/seobject.py:951 ../semanage/seobject.py:957 +#: ../semanage/seobject.py:850 +#: ../semanage/seobject.py:914 +#: ../semanage/seobject.py:951 +#: ../semanage/seobject.py:957 #, fuzzy, python-format msgid "Could not check if interface %s is defined" msgstr "Tidak dapat memperuntukkan partisyen" @@ -762,7 +813,8 @@ msgid "Could not create interface for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:861 ../semanage/seobject.py:1033 +#: ../semanage/seobject.py:861 +#: ../semanage/seobject.py:1033 #, fuzzy, python-format msgid "Could not create context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -797,12 +849,14 @@ msgid "Could not set message context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:894 ../semanage/seobject.py:898 +#: ../semanage/seobject.py:894 +#: ../semanage/seobject.py:898 #, fuzzy, python-format msgid "Could not add interface %s" msgstr "Tidak dapat memperuntukkan partisyen" -#: ../semanage/seobject.py:916 ../semanage/seobject.py:953 +#: ../semanage/seobject.py:916 +#: ../semanage/seobject.py:953 #, fuzzy, python-format msgid "Interface %s is not defined" msgstr "RALAT: kotak \"%s\" adalah bukan antaramuka bolehtulis.\n" @@ -812,7 +866,8 @@ msgid "Could not query interface %s" msgstr "Tidak dapat memperuntukkan partisyen" -#: ../semanage/seobject.py:935 ../semanage/seobject.py:939 +#: ../semanage/seobject.py:935 +#: ../semanage/seobject.py:939 #, fuzzy, python-format msgid "Could not modify interface %s" msgstr "Tidak dapat memperuntukkan partisyen" @@ -822,18 +877,21 @@ msgid "Interface %s is defined in policy, cannot be deleted" msgstr "RALAT: kotak \"%s\" adalah bukan antaramuka bolehtulis.\n" -#: ../semanage/seobject.py:967 ../semanage/seobject.py:971 +#: ../semanage/seobject.py:967 +#: ../semanage/seobject.py:971 #, fuzzy, python-format msgid "Could not delete interface %s" -msgstr "Padam fail atau tidak?" +msgstr "Tidak dapat memadam boolean %s" #: ../semanage/seobject.py:979 #, fuzzy msgid "Could not list interfaces" -msgstr "Senarai Pengepala tidak dijumpai" +msgstr "Tidak dapat menyenaraikan boolean" -#: ../semanage/seobject.py:1022 ../semanage/seobject.py:1084 -#: ../semanage/seobject.py:1123 ../semanage/seobject.py:1129 +#: ../semanage/seobject.py:1022 +#: ../semanage/seobject.py:1084 +#: ../semanage/seobject.py:1123 +#: ../semanage/seobject.py:1129 #, fuzzy, python-format msgid "Could not check if file context for %s is defined" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -873,7 +931,8 @@ msgid "Could not set file context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:1064 ../semanage/seobject.py:1068 +#: ../semanage/seobject.py:1064 +#: ../semanage/seobject.py:1068 #, fuzzy, python-format msgid "Could not add file context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -883,7 +942,8 @@ msgid "Requires setype, serange or seuser" msgstr "Ralat Pilihan s s" -#: ../semanage/seobject.py:1086 ../semanage/seobject.py:1125 +#: ../semanage/seobject.py:1086 +#: ../semanage/seobject.py:1125 #, fuzzy, python-format msgid "File context for %s is not defined" msgstr "RALAT: kotak \"%s\" adalah bukan antaramuka bolehtulis.\n" @@ -893,7 +953,8 @@ msgid "Could not query file context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" -#: ../semanage/seobject.py:1107 ../semanage/seobject.py:1111 +#: ../semanage/seobject.py:1107 +#: ../semanage/seobject.py:1111 #, fuzzy, python-format msgid "Could not modify file context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -903,7 +964,8 @@ msgid "File context for %s is defined in policy, cannot be deleted" msgstr "" -#: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143 +#: ../semanage/seobject.py:1139 +#: ../semanage/seobject.py:1143 #, fuzzy, python-format msgid "Could not delete file context for %s" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -914,37 +976,40 @@ msgstr "tidak dapat membuat fail sementara" #: ../semanage/seobject.py:1184 -#, fuzzy msgid "Requires value" -msgstr "Nilai tidak sah" +msgstr "Memerlukan nilai" -#: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226 +#: ../semanage/seobject.py:1192 +#: ../semanage/seobject.py:1226 #: ../semanage/seobject.py:1232 -#, fuzzy, python-format +#, python-format msgid "Could not check if boolean %s is defined" -msgstr "Tidak dapat memperuntukkan partisyen" +msgstr "Tidak dapat memeriksa sama ada boolean %s dinyatakan" -#: ../semanage/seobject.py:1194 ../semanage/seobject.py:1228 -#, fuzzy, python-format +#: ../semanage/seobject.py:1194 +#: ../semanage/seobject.py:1228 +#, python-format msgid "Boolean %s is not defined" -msgstr "%s adalah nama hos yang tidak sah" +msgstr "Boolean %s tidak dinyatakan" #: ../semanage/seobject.py:1198 -#, fuzzy, python-format +#, python-format msgid "Could not query file context %s" -msgstr "tidak dapat membuat fail sementara" +msgstr "Tidak dapat menyoal fail konteks %s" -#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1214 -#, fuzzy, python-format +#: ../semanage/seobject.py:1210 +#: ../semanage/seobject.py:1214 +#, python-format msgid "Could not modify boolean %s" -msgstr "Tidak dapat memperuntukkan partisyen" +msgstr "Tidak dapat mengubah boolean %s" #: ../semanage/seobject.py:1234 #, python-format msgid "Boolean %s is defined in policy, cannot be deleted" msgstr "" -#: ../semanage/seobject.py:1242 ../semanage/seobject.py:1246 +#: ../semanage/seobject.py:1242 +#: ../semanage/seobject.py:1246 #, python-format msgid "Could not delete boolean %s" msgstr "Tidak dapat memadam boolean %s" @@ -984,3 +1049,4 @@ #, c-format msgid "Options Error: %s " msgstr "Ralat Pilihan: %s" + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.14/restorecon/restorecon.c --- nsapolicycoreutils/restorecon/restorecon.c 2006-05-15 09:42:56.000000000 -0400 +++ policycoreutils-1.30.14/restorecon/restorecon.c 2006-06-22 14:07:15.000000000 -0400 @@ -42,6 +42,7 @@ static int change=1; static int verbose=0; +static int progress=0; static FILE *outfile=NULL; static char *progname; static int errors=0; @@ -49,6 +50,7 @@ static int force=0; #define STAT_BLOCK_SIZE 1 static int pipe_fds[2] = { -1, -1 }; +static unsigned long long count=0; #define MAX_EXCLUDES 100 static int excludeCtr=0; @@ -126,6 +128,18 @@ security_context_t prev_context=NULL; struct stat st; char path[PATH_MAX+1]; + + if (progress) { + count++; + if (count % 80000 == 0) { + fprintf(stdout, "\n"); + fflush(stdout); + } + if (count % 1000 == 0) { + fprintf(stdout, "*"); + fflush(stdout); + } + } if (excludeCtr > 0 && exclude(filename)) { return 0; @@ -185,7 +199,7 @@ fprintf(stderr,"matchpathcon(%s) failed %s\n", filename,strerror(errno)); return 1; } - retcontext=lgetfilecon(filename,&prev_context); + retcontext=lgetfilecon_raw(filename,&prev_context); if (retcontext >= 0 || errno == ENODATA) { int customizable=0; @@ -306,8 +320,9 @@ progname=argv[0]; if (is_selinux_enabled() <= 0 ) exit(0); + set_matchpathcon_flags(MATCHPATHCON_NOTRANS); - while ((opt = getopt(argc, argv, "FrRnvf:o:e:")) > 0) { + while ((opt = getopt(argc, argv, "pFrRnvf:o:e:")) > 0) { switch (opt) { case 'n': change = 0; @@ -332,8 +347,20 @@ __fsetlocking(outfile, FSETLOCKING_BYCALLER); break; case 'v': + if (progress) { + fprintf(stderr, "Progress and Verbose mutually exclusive\n"); + usage(argv[0]); + } + verbose++; break; + case 'p': + if (verbose) { + fprintf(stderr, "Progress and Verbose mutually exclusive\n"); + usage(argv[0]); + } + progress = 1; + break; case 'f': file = 1; file_name=optarg; diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.14/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-05-15 09:42:57.000000000 -0400 +++ policycoreutils-1.30.14/restorecond/restorecond.c 2006-06-21 15:56:15.000000000 -0400 @@ -182,7 +182,7 @@ syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno)); return; } - retcontext=fgetfilecon(fd,&prev_context); + retcontext=fgetfilecon_raw(fd,&prev_context); if (retcontext >= 0 || errno == ENODATA) { if (retcontext < 0) prev_context=NULL; @@ -420,6 +420,8 @@ sigemptyset( &sa.sa_mask ) ; sigaction( SIGTERM, &sa, NULL ); + set_matchpathcon_flags(MATCHPATHCON_NOTRANS); + master_fd = inotify_init (); if (master_fd < 0) exitApp("inotify_init"); diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.14/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-06-16 15:08:24.000000000 -0400 +++ policycoreutils-1.30.14/scripts/fixfiles 2006-06-22 14:21:55.000000000 -0400 @@ -28,7 +28,7 @@ DIRS="" RPMILES="" OUTFILES="" -LOGFILE=/dev/null +LOGFILE=`tty` SYSLOGFLAG="-l" LOGGER=/usr/sbin/logger SETFILES=/sbin/setfiles @@ -118,7 +118,7 @@ fi if [ ! -z "$RPMFILES" ]; then for i in `echo $RPMFILES | sed 's/,/ /g'`; do - rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE + rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE done exit $? fi @@ -126,16 +126,16 @@ if [ -x /usr/bin/find ]; then for d in ${DIRS} ; do find $d \ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print | \ - ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE done else - ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE fi exit $? fi LogReadOnly -${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE +${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE exit $? } @@ -234,8 +234,8 @@ # Make sure they specified one of the three valid commands # case "$command" in - restore) restore ;; - check) restore -n ;; + restore) restore -p -q ;; + check) restore -n -v ;; relabel) relabel;; *) usage diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.14/setfiles/setfiles.c --- nsapolicycoreutils/setfiles/setfiles.c 2006-06-16 15:08:24.000000000 -0400 +++ policycoreutils-1.30.14/setfiles/setfiles.c 2006-06-22 14:32:43.000000000 -0400 @@ -20,6 +20,7 @@ * -d Show what specification matched each file. * -l Log changes in files labels to syslog. * -n Do not change any file labels. + * -p Show progress. Prints * for every 1000 files * -q Be quiet (suppress non-error output). * -r Use an alternate root path * -s Use stdin for a list of files instead of searching a partition. @@ -88,6 +89,8 @@ static int force=0; #define STAT_BLOCK_SIZE 1 static int pipe_fds[2] = { -1, -1 }; +static int progress=0; +static unsigned long long count=0; #define MAX_EXCLUDES 100 static int excludeCtr=0; @@ -208,7 +211,7 @@ void usage(const char * const name) { fprintf(stderr, - "usage: %s [-dnqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n" + "usage: %s [-dnpqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n" "usage: %s -c policyfile spec_file\n" "usage: %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, name); exit(1); @@ -278,6 +281,18 @@ /* No matching specification. */ return 0; + if (progress) { + count++; + if (count % 80000 == 0) { + fprintf(stdout, "\n"); + fflush(stdout); + } + if (count % 1000 == 0) { + fprintf(stdout, "*"); + fflush(stdout); + } + } + /* * Try to add an association between this inode and * this specification. If there is already an association @@ -301,7 +316,7 @@ } /* Get the current context of the file. */ - ret = lgetfilecon(my_file, &context); + ret = lgetfilecon_raw(my_file, &context); if (ret < 0) { if (errno == ENODATA) { context = NULL; @@ -414,7 +429,7 @@ if (policyfile) { valid = (sepol_check_context (context) >= 0); - } else if (security_canonicalize_context(context, &tmpcon) < 0) { + } else if (security_canonicalize_context_raw(context, &tmpcon) < 0) { if (errno != ENOENT) { valid = 0; inc_err(); @@ -485,10 +500,10 @@ memset(excludeArray,0, sizeof(excludeArray)); /* Validate all file contexts during matchpathcon_init. */ - set_matchpathcon_flags(MATCHPATHCON_VALIDATE); + set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS); /* Process any options. */ - while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) { + while ((opt = getopt(argc, argv, "Fc:dlnpqrsvWe:o:")) > 0) { switch (opt) { case 'c': { @@ -566,8 +581,19 @@ add_assoc = 0; break; case 'v': + if (progress) { + fprintf(stderr, "Progress and Verbose mutually exclusive\n"); + exit(1); + } verbose++; break; + case 'p': + if (verbose) { + fprintf(stderr, "Progress and Verbose mutually exclusive\n"); + usage(argv[0]); + } + progress = 1; + break; case 'W': warn_no_match = 1; break; diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8 --- nsapolicycoreutils/setsebool/setsebool.8 2006-05-15 09:42:58.000000000 -0400 +++ policycoreutils-1.30.14/setsebool/setsebool.8 2006-06-19 10:32:36.000000000 -0400 @@ -9,8 +9,7 @@ .SH "DESCRIPTION" .B setsebool sets the current state of a particular SELinux boolean or a list of booleans -to a given value. The value may be 1 or true to enable the boolean, or 0 or -false to disable it. +to a given value. The value may be 1 or true or on to enable the boolean, or 0 or false or off to disable it. Without the -P option, only the current boolean value is affected; the boot-time default settings diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.30.14/setsebool/setsebool.c --- nsapolicycoreutils/setsebool/setsebool.c 2006-06-16 15:08:24.000000000 -0400 +++ policycoreutils-1.30.14/setsebool/setsebool.c 2006-06-19 10:32:04.000000000 -0400 @@ -197,10 +197,12 @@ *value_ptr = 0; value_ptr++; if (strcmp(value_ptr, "1") == 0 || - strcasecmp(value_ptr, "true") == 0) + strcasecmp(value_ptr, "true") == 0 || + strcasecmp(value_ptr, "on") == 0) value = 1; else if (strcmp(value_ptr, "0") == 0 || - strcasecmp(value_ptr, "false") == 0) + strcasecmp(value_ptr, "false") == 0 || + strcasecmp(value_ptr, "off") == 0) value = 0; else { fprintf(stderr, "setsebool: illegal value "