From 6c279265bff694b7867a91399f5a94a272607387 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 19 Jun 2006 14:36:40 +0000 Subject: [PATCH] * Mon Jun 19 2006 Dan Walsh 1.30.14-2 - Allow setsebool to use on/off - Update translations --- policycoreutils-rhat.patch | 117 ++++++++++++++++++++++++++++++++++++- policycoreutils.spec | 6 +- 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 0ee5cc4..5243691 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,88 @@ +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-16 15:22:02.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 @@ -238,7 +320,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils + 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-16 15:22:28.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" @@ -787,3 +869,34 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils msgid "Options Error: %s " msgstr "Ralat Pilihan: %s" + +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 " diff --git a/policycoreutils.spec b/policycoreutils.spec index 8a80d2b..1f46a7a 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.14 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -111,6 +111,10 @@ rm -rf %{buildroot} [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Mon Jun 19 2006 Dan Walsh 1.30.14-2 +- Allow setsebool to use on/off +- Update translations + * Fri Jun 16 2006 Dan Walsh 1.30.14-1 - Update to upstream * Merged fix for setsebool error path from Serge Hallyn.