From d0a35325c97e1b04a9a01a907647f81524e65e12 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 20 Oct 2006 13:08:28 +0000 Subject: [PATCH] * Fri Oct 9 2006 Dan Walsh 1.32-1 - Add newrole audit patch from sgrubb - Update to upstream * Merged audit2allow -l fix from Yuichi Nakamura. * Merged restorecon -i and -o - support from Karl MacMillan. * Merged semanage/seobject fix from Dan Walsh. * Merged fixfiles -R and verify changes from Dan Walsh. --- .cvsignore | 1 + policycoreutils-po.patch | 5996 ++---------------------------------- policycoreutils-rhat.patch | 305 +- policycoreutils.spec | 32 +- sources | 2 +- 5 files changed, 392 insertions(+), 5944 deletions(-) diff --git a/.cvsignore b/.cvsignore index fc16e23..390cd99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -114,3 +114,4 @@ policycoreutils-1.30.27.tgz policycoreutils-1.30.28.tgz policycoreutils-1.30.29.tgz policycoreutils-1.30.30.tgz +policycoreutils-1.32.tgz diff --git a/policycoreutils-po.patch b/policycoreutils-po.patch index d608c6f..4423181 100644 --- a/policycoreutils-po.patch +++ b/policycoreutils-po.patch @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.30.30/po/as.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.32/po/as.po --- nsapolicycoreutils/po/as.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.30/po/as.po 2006-09-29 12:59:40.000000000 -0400 ++++ policycoreutils-1.32/po/as.po 2006-10-17 13:00:30.000000000 -0400 @@ -0,0 +1,960 @@ +# translation of as.po to Assamese +# This file is distributed under the same license as the PACKAGE package. @@ -962,2846 +962,1133 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils +msgid "Options Error: %s " +msgstr "" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.30.30/po/bn_IN.po ---- nsapolicycoreutils/po/bn_IN.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.30/po/bn_IN.po 2006-09-29 12:59:40.000000000 -0400 -@@ -1,3 +1,4 @@ -+# translation of bn_IN.po to Bengali India - # translation of bn_IN.po to Bangla (INDIA) - # translation of bn_IN.po to Bangla (INDIA) - # translation of bn_IN.po to Bangla (INDIA) -@@ -36,14 +37,14 @@ - "Project-Id-Version: bn_IN\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-06-29 15:53-0400\n" --"PO-Revision-Date: 2006-05-09 18:04+0530\n" -+"PO-Revision-Date: 2006-09-20 16:53+0530\n" - "Last-Translator: Runa Bhattacharjee \n" --"Language-Team: Bangla (INDIA) \n" -+"Language-Team: Bengali India\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" - - #: ../load_policy/load_policy.c:22 - #, c-format -@@ -182,7 +183,7 @@ - #: ../newrole/newrole.c:657 - #, c-format - msgid "failed to set new role %s\n" --msgstr "new role %s স্থাপন করতে ব্যর্থ\n" -+msgstr "নতুন ভূমিকা %s স্থাপন করতে ব্যর্থ\n" - - #: ../newrole/newrole.c:671 - #, c-format -@@ -202,7 +203,7 @@ - #: ../newrole/newrole.c:708 - #, c-format - msgid "failed to convert new context to string\n" --msgstr "new context'কে string হিসাবে রূপান্তর করা যায়নি\n" -+msgstr "নতুন context'কে string হিসাবে রূপান্তর করা যায়নি\n" - - #: ../newrole/newrole.c:717 - #, c-format -@@ -449,7 +450,7 @@ - #: ../semanage/seobject.py:177 - #, python-format - msgid "%s already defined in translations" --msgstr "অনুবাদের মধ্যে %s বর্তমান ব্যাখ্যা করা হয়েছে" -+msgstr "অনুবাদের মধ্যে %s বর্তমানে ব্যাখ্যা করা হয়েছে" - - #: ../semanage/seobject.py:189 - #, python-format -@@ -918,8 +919,7 @@ - #: ../semanage/seobject.py:1131 - #, python-format - msgid "File context for %s is defined in policy, cannot be deleted" --msgstr "" --"%s'র ফাইল context নিয়মনীতির মধ্যে নির্ধারিত হওয়ার ফলে তা অপসারণ করা সম্ভব নয়" -+msgstr "%s'র ফাইল context নিয়মনীতির মধ্যে নির্ধারিত হওয়ার ফলে তা অপসারণ করা সম্ভব নয়" - - #: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143 - #, python-format -@@ -1004,4 +1004,5 @@ - #: ../audit2allow/audit2allow:203 - #, c-format - msgid "Options Error: %s " --msgstr "বিকল্প সংক্রান্ত ত্রুটি: %s " -+msgstr "বিকল্প সংক্রান্ত ত্রুটি: %s" -+ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.30/po/ca.po ---- nsapolicycoreutils/po/ca.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.30/po/ca.po 2006-09-29 12:59:40.000000000 -0400 -@@ -4,6 +4,7 @@ - # package. - # - # Josep Puigdemont Casamajó , 2006. -+# Xavier Conde Rueda , 2006 - # - # This file is translated according to the glossary and style guide of - # Softcatalà. If you plan to modify this file, please read first the page -@@ -22,8 +23,8 @@ - "Project-Id-Version: policycoreutils\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-06-29 15:53-0400\n" --"PO-Revision-Date: 2006-05-13 10:34+0200\n" --"Last-Translator: Josep Puigdemont Casamajó \n" -+"PO-Revision-Date: 2006-08-28 10:34+0200\n" -+"Last-Translator: Xavier Conde Rueda \n" - "Language-Team: Catalan \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -37,12 +38,12 @@ - #: ../load_policy/load_policy.c:66 - #, c-format - msgid "%s: Can't load policy: %s\n" --msgstr "%s: No es pot carregar la política: %s\n" -+msgstr "%s: no es pot carregar la política: %s\n" - - #: ../newrole/newrole.c:97 - #, c-format - msgid "Out of memory!\n" --msgstr "No hi ha prou memòria!\n" -+msgstr "No hi ha prou memòria\n" - - #: ../newrole/newrole.c:199 ../run_init/run_init.c:126 - #, c-format -@@ -61,7 +62,9 @@ - #: ../newrole/newrole.c:281 ../run_init/run_init.c:189 - #, c-format - msgid "Cannot find your entry in the shadow passwd file.\n" --msgstr "No s'ha pogut trobar la vostra entrada en el fitxer passwd ocult.\n" +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.32/po/da.po +--- nsapolicycoreutils/po/da.po 2006-09-01 22:32:13.000000000 -0400 ++++ policycoreutils-1.32/po/da.po 2006-10-17 13:00:30.000000000 -0400 +@@ -1,230 +1,249 @@ ++# Danish messages for policycoreutils. ++# Copyright (C) 2006 Christian Rose. ++# Christian Rose , 2006. ++# Keld Simonsen , 2006. ++# ++# $Id: da.po,v 1.6 2006/10/10 19:39:53 keldsim Exp $ ++# ++msgid "" +msgstr "" -+"No s'ha pogut trobar la vostra entrada en el fitxer de contrasenyes " -+"ocultes.\n" - - #: ../newrole/newrole.c:287 ../run_init/run_init.c:195 - #, c-format -@@ -71,87 +74,91 @@ - #: ../newrole/newrole.c:354 - #, c-format - msgid "Error initing capabilities, aborting.\n" --msgstr "" -+msgstr "S'ha produït un error en iniciar les capacitats, s'està anul·lant.\n" - - #: ../newrole/newrole.c:368 - #, c-format - msgid "Error dropping capabilities, aborting\n" --msgstr "" -+msgstr "S'ha produït un error en eliminar les capacitats, s'està anul·lant.\n" - - #: ../newrole/newrole.c:375 - #, c-format - msgid "Error changing uid, aborting.\n" --msgstr "" -+msgstr "S'ha produït un error en canviar l'UID, s'està anul·lant.\n" - - #: ../newrole/newrole.c:382 - #, c-format - msgid "Error resetting KEEPCAPS, aborting\n" - msgstr "" -+"S'ha produït un error en tornar a establir el valor de KEEPCAPS, s'està " -+"anul·lant.\n" - - #: ../newrole/newrole.c:390 - #, c-format - msgid "Error dropping SETUID capability, aborting\n" - msgstr "" -+"S'ha produït un error en eliminar la capacitat per a SETUID, s'està " -+"anul·lant.\n" - - #: ../newrole/newrole.c:463 - #, c-format - msgid "Sorry, newrole may be used only on a SELinux kernel.\n" --msgstr "" -+msgstr "El newrole només es pot fer servir amb un nucli amb SELinux.\n" - - #: ../newrole/newrole.c:468 - #, c-format - msgid "Could not determine enforcing mode.\n" --msgstr "" -+msgstr "No s'ha pogut determinar el mode de reforç.\n" - - #: ../newrole/newrole.c:488 - #, c-format - msgid "Error: multiple roles specified\n" --msgstr "" -+msgstr "S'ha produït un error: s'han especificat múltiples rols\n" - - #: ../newrole/newrole.c:498 - #, c-format - msgid "Error: multiple types specified\n" --msgstr "" -+msgstr "S'ha produït un error: s'han especificat múltiples tipus\n" - - #: ../newrole/newrole.c:508 - #, c-format - msgid "Sorry, -l may be used with SELinux MLS support.\n" --msgstr "" -+msgstr "El «-l» s'ha de fer servir amb suport MLS de SELinux.\n" - - #: ../newrole/newrole.c:515 - #, c-format - msgid "Error: multiple levels specified\n" --msgstr "" -+msgstr "S'ha produït un error: s'han especificat múltiples nivells\n" - - #: ../newrole/newrole.c:537 - #, c-format - msgid "Couldn't get default type.\n" --msgstr "" -+msgstr "No s'ha pogut obtenir el tipus predeterminat.\n" - - #: ../newrole/newrole.c:559 - #, c-format - msgid "failed to get old_context.\n" --msgstr "" -+msgstr "no s'ha pogut obtenir l'old_context.\n" - - #: ../newrole/newrole.c:572 - #, c-format - msgid "failed to get new context.\n" --msgstr "" -+msgstr "no s'ha pogut obtenir el nou context.\n" - - #: ../newrole/newrole.c:596 - #, c-format - msgid "cannot find your entry in the passwd file.\n" --msgstr "" -+msgstr "no s'ha trobat la vostra entrada en el fitxer de contrasenyes.\n" - - #: ../newrole/newrole.c:606 - #, c-format - msgid "Error! Shell is not valid.\n" --msgstr "" -+msgstr "L'intèrpret d'ordres no és vàlid.\n" - - #: ../newrole/newrole.c:614 - #, c-format - msgid "Error! Could not retrieve tty information.\n" --msgstr "" -+msgstr "No s'ha pogut obtenir informació de la tty.\n" - - #: ../newrole/newrole.c:618 - #, c-format -@@ -161,32 +168,32 @@ - #: ../newrole/newrole.c:632 - #, c-format - msgid "newrole: incorrect password for %s\n" --msgstr "" -+msgstr "newrole: la contrasenya per a %s no és correcta\n" - - #: ../newrole/newrole.c:657 - #, c-format - msgid "failed to set new role %s\n" --msgstr "" -+msgstr "no s'ha pogut establir un nou rol %s\n" - - #: ../newrole/newrole.c:671 - #, c-format - msgid "failed to set new type %s\n" --msgstr "" -+msgstr "no s'ha pogut establir el nou tipus %s\n" - - #: ../newrole/newrole.c:688 - #, c-format - msgid "failed to build new range with level %s\n" --msgstr "" -+msgstr "no s'ha pogut muntar el nou rang amb nivell %s\n" - - #: ../newrole/newrole.c:693 - #, c-format - msgid "failed to set new range %s\n" --msgstr "" -+msgstr "no s'ha pogut establir el nou rang %s\n" - - #: ../newrole/newrole.c:708 - #, c-format - msgid "failed to convert new context to string\n" --msgstr "" -+msgstr "no s'ha pogut convertir el nou context en cadena de text\n" - - #: ../newrole/newrole.c:717 - #, c-format -@@ -196,32 +203,36 @@ - #: ../newrole/newrole.c:730 - #, c-format - msgid "Error! Could not open %s.\n" --msgstr "Error. No s'ha pogut obrir %s.\n" -+msgstr "S'ha produït un error: no s'ha pogut obrir %s.\n" - - #: ../newrole/newrole.c:738 - #, c-format - msgid "%s! Could not get current context for %s, not relabeling tty.\n" - msgstr "" -+"%s. No s'ha pogut obtenir el context actual per a %s, no es reetiquetarà el " -+"tty.\n" - - #: ../newrole/newrole.c:757 - #, c-format - msgid "%s! Could not get new context for %s, not relabeling tty.\n" - msgstr "" -+"%s. No s'ha pogut obtenir el nou context per a %s, no es reetiquetarà el " -+"tty.\n" - - #: ../newrole/newrole.c:771 - #, c-format - msgid "%s! Could not set new context for %s\n" --msgstr "" -+msgstr "%s. No s'ha pogut establir el nou context per a %s\n" - - #: ../newrole/newrole.c:784 - #, c-format - msgid "newrole: failure forking: %s" --msgstr "" -+msgstr "newrole: no s'ha pogut crear un fill: %s" - - #: ../newrole/newrole.c:789 - #, c-format - msgid "Warning! Could not restore context for %s\n" --msgstr "" -+msgstr "Avís: no es pot restaurar el context per a %s\n" - - #: ../newrole/newrole.c:810 - #, c-format -@@ -231,31 +242,31 @@ - #: ../newrole/newrole.c:834 - #, c-format - msgid "Could not close descriptors.\n" --msgstr "" -+msgstr "No s'ha pogut tancar els descriptors.\n" - - #: ../newrole/newrole.c:869 ../run_init/run_init.c:397 - #, c-format - msgid "Could not set exec context to %s.\n" --msgstr "" -+msgstr "No s'ha pogut establir el context d'execució a %s.\n" - - #: ../newrole/newrole.c:881 - #, c-format - msgid "Error connecting to audit system.\n" --msgstr "" -+msgstr "S'ha produït un error en connectar al sistema audit.\n" - - #: ../newrole/newrole.c:886 - #, c-format - msgid "Error allocating memory.\n" --msgstr "" -+msgstr "S'ha produït un error en assignar memòria.\n" - - #: ../newrole/newrole.c:892 - #, c-format - msgid "Error sending audit message.\n" --msgstr "" -+msgstr "S'ha produït un error en enviar el missatge d'audit.\n" - - #: ../newrole/newrole.c:903 - msgid "failed to exec shell\n" --msgstr "" -+msgstr "no s'ha pogut executar l'intèrpret d'ordres\n" - - #: ../run_init/run_init.c:67 - msgid "" -@@ -263,11 +274,14 @@ - " where: