diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 0a31e46..e2a34a8 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2006-07-03 07:52:43.000000000 -0400 -+++ policycoreutils-1.30.22/newrole/newrole.c 2006-08-01 09:53:54.000000000 -0400 ++++ policycoreutils-1.30.22/newrole/newrole.c 2006-08-02 14:22:10.000000000 -0400 @@ -47,6 +47,7 @@ * *************************************************************************/ @@ -32,7 +32,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policy perror(_("failed to exec shell\n")); diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.22/po/fr.po --- nsapolicycoreutils/po/fr.po 2006-08-01 09:47:27.000000000 -0400 -+++ policycoreutils-1.30.22/po/fr.po 2006-08-01 09:56:24.000000000 -0400 ++++ policycoreutils-1.30.22/po/fr.po 2006-08-02 14:22:10.000000000 -0400 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: Policy Core Utils 1.0\n" @@ -208,7 +208,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils - diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.22/po/sv.po --- nsapolicycoreutils/po/sv.po 2006-08-01 09:47:27.000000000 -0400 -+++ policycoreutils-1.30.22/po/sv.po 2006-08-01 09:56:24.000000000 -0400 ++++ policycoreutils-1.30.22/po/sv.po 2006-08-02 14:22:10.000000000 -0400 @@ -1,46 +1,64 @@ +# Swedish messages for policycoreutils. +# Copyright (C) 2006 Christian Rose. @@ -900,9 +900,99 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils + +msgid "Options Error: %s" +msgstr "Flaggfel: %s" +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.30.22/po/ta.po +--- nsapolicycoreutils/po/ta.po 2006-08-01 09:47:27.000000000 -0400 ++++ policycoreutils-1.30.22/po/ta.po 2006-08-02 14:25:00.000000000 -0400 +@@ -8,14 +8,14 @@ + "Project-Id-Version: ta\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-05-26 13:48-0400\n" +-"PO-Revision-Date: 2006-05-10 18:00+0530\n" ++"PO-Revision-Date: 2006-08-02 10:19+0530\n" + "Last-Translator: Felix \n" + "Language-Team: Tamil \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 "non-MLS கணினிகளில் மொழிபெயர்க்க முடியாது" ++msgstr "Non 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" +@@ -405,8 +403,7 @@ + #: ../semanage/seobject.py:131 + #, python-format + msgid "Unable to open %s: translations not supported on non-MLS machines" +-msgstr "" +-"%sஐ திறக்க முடியவில்லை: MLS இல்லா கணினிகளில் மொழிபெயர்ப்பிற்கு துணை புரிவதில்லை" ++msgstr "%sஐ திறக்க முடியவில்லை: MLS இல்லா கணினிகளில் மொழிபெயர்ப்பிற்கு துணை புரிவதில்லை" + + #: ../semanage/seobject.py:171 ../semanage/seobject.py:185 + #, python-format +@@ -972,3 +969,4 @@ + #, c-format + msgid "Options Error: %s " + msgstr "விருப்பங்கள் பிழை: %s " ++ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.22/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-08-01 09:47:23.000000000 -0400 -+++ policycoreutils-1.30.22/restorecond/restorecond.c 2006-08-01 09:55:14.000000000 -0400 ++++ policycoreutils-1.30.22/restorecond/restorecond.c 2006-08-02 14:22:10.000000000 -0400 @@ -436,9 +436,14 @@ /* Make sure we are root */ if (getuid() != 0) { @@ -919,9 +1009,21 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond. /* Register sighandlers */ sa.sa_flags = 0; +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.22/restorecond/restorecond.init +--- nsapolicycoreutils/restorecond/restorecond.init 2006-05-15 09:42:57.000000000 -0400 ++++ policycoreutils-1.30.22/restorecond/restorecond.init 2006-08-02 14:23:49.000000000 -0400 +@@ -11,6 +11,8 @@ + # Source function library. + . /etc/rc.d/init.d/functions + ++[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0 ++ + start() + { + echo -n $"Starting restorecond: " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.22/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-07-03 07:52:42.000000000 -0400 -+++ policycoreutils-1.30.22/scripts/fixfiles 2006-08-01 09:53:54.000000000 -0400 ++++ policycoreutils-1.30.22/scripts/fixfiles 2006-08-02 14:22:10.000000000 -0400 @@ -234,7 +234,7 @@ # Make sure they specified one of the three valid commands # diff --git a/policycoreutils.spec b/policycoreutils.spec index 0f3f2e0..067a329 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -1,11 +1,11 @@ %define libauditver 1.1.4-3 -%define libsepolver 1.12.19-1 +%define libsepolver 1.12.21-1 %define libsemanagever 1.6.11-1 %define libselinuxver 1.30.19-1 Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.22 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -112,16 +112,14 @@ if [ $1 -eq 0 ]; then /sbin/chkconfig --del restorecond fi -%postun -if [ $1 -ge 1 ]; then - /sbin/service restorecond condrestart > /dev/null 2>&1 || : -fi - %post /sbin/chkconfig --add restorecond [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Wed Aug 2 2006 Dan Walsh 1.30.22-2 +- Stop restorecond init script when selinux is not enabled + * Tue Aug 1 2006 Dan Walsh 1.30.22-1 - Update to upstream * Merged restorecond size_t fix from Joshua Brindle.