rpms/policycoreutils/devel policycoreutils-po.patch, NONE, 1.1 policycoreutils-rhat.patch, 1.228, 1.229 policycoreutils.spec, 1.310, 1.311
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 8 14:53:10 UTC 2006
- Previous message (by thread): rpms/ORBit2/FC-5 .cvsignore, 1.17, 1.18 ORBit2.spec, 1.34, 1.35 sources, 1.17, 1.18
- Next message (by thread): rpms/gcc/devel gcc41-pr27567.patch, NONE, 1.1 .cvsignore, 1.168, 1.169 gcc41.spec, 1.99, 1.100 sources, 1.170, 1.171 gcc41-pr28683.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17204
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Added Files:
policycoreutils-po.patch
Log Message:
* Fri Sep 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-6
- Change setfiles and restorecon to use stderr except for -o flag
- Also -o flag will now output files
* Thu Sep 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-5
- Put back Erich's change
policycoreutils-po.patch:
ca.po | 317 ++++++++++++++++++---------------
de.po | 272 ++++++++--------------------
el.po | 6
ms.po | 263 +++++++++++++++++----------
sk.po | 596 +++++++++++++++++++++++++++++++++++----------------------------
sv.po | 279 ++++++++++++-----------------
zh_TW.po | 4
7 files changed, 878 insertions(+), 859 deletions(-)
--- NEW FILE policycoreutils-po.patch ---
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.28/po/ca.po
--- nsapolicycoreutils/po/ca.po 2006-09-01 22:32:13.000000000 -0400
+++ policycoreutils-1.30.28/po/ca.po 2006-09-08 09:12:12.000000000 -0400
@@ -4,6 +4,7 @@
# package.
#
# Josep Puigdemont Casamajó <josep.puigdemont at gmail.com>, 2006.
+# Xavier Conde Rueda <xavi.conde at gmail.com>, 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ó <josep.puigdemont at gmail.com>\n"
+"PO-Revision-Date: 2006-08-28 10:34+0200\n"
+"Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
"Language-Team: Catalan <tradgnome at softcatala.org>\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"
+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"
[...3900 lines suppressed...]
msgid "Could not set type in file context for %s"
-msgstr ""
+msgstr "Kunde inte sätta typ i filkontext för %s"
#: ../semanage/seobject.py:1050
#, python-format
msgid "Could not set mls fields in file context for %s"
-msgstr ""
+msgstr "Kunde inte sätta mls-fält i filkontext för %s"
#: ../semanage/seobject.py:1056
#, python-format
msgid "Could not set file context for %s"
-msgstr ""
+msgstr "Kunde inte sätta filkontext för %s"
#: ../semanage/seobject.py:1064 ../semanage/seobject.py:1068
#, python-format
msgid "Could not add file context for %s"
-msgstr ""
+msgstr "Kunde inte lägga till filkontext för %s"
#: ../semanage/seobject.py:1076
msgid "Requires setype, serange or seuser"
-msgstr ""
+msgstr "Kräver setype, serange eller seuser"
#: ../semanage/seobject.py:1086 ../semanage/seobject.py:1125
#, python-format
msgid "File context for %s is not defined"
-msgstr ""
+msgstr "Filkontext för %s är inte definierad"
#: ../semanage/seobject.py:1090
#, python-format
msgid "Could not query file context for %s"
-msgstr ""
+msgstr "Kunde inte fråga filkontext för %s"
#: ../semanage/seobject.py:1107 ../semanage/seobject.py:1111
#, python-format
msgid "Could not modify file context for %s"
-msgstr ""
+msgstr "Kunde inte modifiera filkontext för %s"
#: ../semanage/seobject.py:1131
#, python-format
msgid "File context for %s is defined in policy, cannot be deleted"
-msgstr ""
+msgstr "Filkontext för %s är definierad i policy, kan inte tas bort"
#: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143
#, python-format
msgid "Could not delete file context for %s"
-msgstr ""
+msgstr "Kunde inte radera filkontext för %s"
#: ../semanage/seobject.py:1151
msgid "Could not list file contexts"
-msgstr ""
+msgstr "Kunde inte lista filkontext"
#: ../semanage/seobject.py:1184
msgid "Requires value"
@@ -898,41 +902,41 @@
#: ../semanage/seobject.py:1232
#, python-format
msgid "Could not check if boolean %s is defined"
-msgstr ""
+msgstr "Kunde inte kontrollera om flaggan %s är definierad"
#: ../semanage/seobject.py:1194 ../semanage/seobject.py:1228
#, python-format
msgid "Boolean %s is not defined"
-msgstr ""
+msgstr "Flaggan %s är inte definierad"
#: ../semanage/seobject.py:1198
#, python-format
msgid "Could not query file context %s"
-msgstr ""
+msgstr "Kunde inte fråga filkontext %s"
#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1214
#, python-format
msgid "Could not modify boolean %s"
-msgstr ""
+msgstr "Kunde inte modifiera flagga %s"
#: ../semanage/seobject.py:1234
#, python-format
msgid "Boolean %s is defined in policy, cannot be deleted"
-msgstr ""
+msgstr "Flagga %s är definierad i policy, kan inte tas bort"
#: ../semanage/seobject.py:1242 ../semanage/seobject.py:1246
#, python-format
msgid "Could not delete boolean %s"
-msgstr ""
+msgstr "Kunde inte ta bort flagga %s"
#: ../semanage/seobject.py:1254
msgid "Could not list booleans"
-msgstr ""
+msgstr "Kunde inte lista flaggor"
#: ../audit2allow/audit2allow:179
#, c-format
msgid "Generating type enforcment file: %s.te"
-msgstr ""
+msgstr "Genererar upprätthållande-typ fil: %s.te"
#: ../audit2allow/audit2allow:184
msgid "Compiling policy"
@@ -955,59 +959,14 @@
"semodule -i %s.pp\n"
"\n"
msgstr ""
+"För att ladda detta nya policy-paket in i kärnan,\n"
+"måste du köra \n"
+"\n"
+"semodule -i %s.pp\n"
+"\n"
#: ../audit2allow/audit2allow:203
#, c-format
msgid "Options Error: %s "
msgstr "Flaggfel: %s "
-#~ msgid "Usage: %s CATEGORY File ..."
-#~ msgstr "Användning: %s KATEGORI fil ..."
-
-#~ msgid "Usage: %s -l CATEGORY user ..."
-#~ msgstr "Användning: %s -l KATEGORI användare ..."
-
-#~ msgid "Usage: %s [[+|-]CATEGORY],...]q File ..."
-#~ msgstr "Användning: %s [[+|-]KATEGORI],...]q fil ..."
-
-#~ msgid "Usage: %s -l [[+|-]CATEGORY],...]q user ..."
-#~ msgstr "Användning: %s -l [[+|-]KATEGORI],...]q användare ..."
-
-#~ msgid "Usage: %s -d File ..."
-#~ msgstr "Användning: %s -d fil ..."
-
-#~ msgid "Usage: %s -l -d user ..."
-#~ msgstr "Användning: %s -l -d användare ..."
-
-#~ msgid "Usage: %s -L"
-#~ msgstr "Användning: %s -L"
-
-#~ msgid "Usage: %s"
-#~ msgstr "Användning: %s"
-
-#~ msgid "Usage: %s"
-#~ msgstr "Användning: %s"
-
-#~ msgid "Usage:"
-#~ msgstr "Användning:"
-
-#~ msgid "Usage: %s -L -l user"
-#~ msgstr "Användning: %s -L -l användare"
-
-#~ msgid "Options Error %s"
-#~ msgstr "Flaggfel %s"
-
-#~ msgid "Translations can not contain spaces '%s'"
-#~ msgstr "Översättningar kan inte innehålla blanksteg \"%s\""
-
-#~ msgid "Invalid Level '%s'"
-#~ msgstr "Ogiltig nivå \"%s\""
-
-#~ msgid "User %s does not exist"
-#~ msgstr "Användaren %s finns inte"
-
-#~ msgid "******************** IMPORTANT ***********************\n"
-#~ msgstr "********************* VIKTIGT ************************\n"
-
-#~ msgid "Options Error: %s"
-#~ msgstr "Flaggfel: %s"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.28/po/zh_TW.po
--- nsapolicycoreutils/po/zh_TW.po 2006-09-01 22:32:13.000000000 -0400
+++ policycoreutils-1.30.28/po/zh_TW.po 2006-09-08 09:12:12.000000000 -0400
@@ -9,7 +9,7 @@
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-29 15:53-0400\n"
-"PO-Revision-Date: 2006-08-20 00:44+1000\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"
"MIME-Version: 1.0\n"
@@ -169,7 +169,7 @@
#: ../newrole/newrole.c:693
#, c-format
msgid "failed to set new range %s\n"
-msgstr ""
+msgstr "è¨å®šæ–°ç¯„åœ %s 失敗\n"
#: ../newrole/newrole.c:708
#, c-format
policycoreutils-rhat.patch:
audit2allow/audit2allow | 2 +-
audit2allow/avc.py | 2 +-
newrole/newrole.c | 1 +
restorecon/restorecon.8 | 11 +++++++----
restorecon/restorecon.c | 40 +++++++++++++++++++---------------------
restorecond/restorecond.init | 6 +++---
scripts/chcat | 2 +-
scripts/fixfiles | 12 ++++++------
scripts/genhomedircon | 2 +-
secon/Makefile | 4 ++--
semanage/semanage | 2 +-
semanage/seobject.py | 2 +-
setfiles/setfiles.8 | 6 +++---
setfiles/setfiles.c | 28 +++++++++-------------------
14 files changed, 56 insertions(+), 64 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.228 -r 1.229 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- policycoreutils-rhat.patch 7 Sep 2006 13:31:34 -0000 1.228
+++ policycoreutils-rhat.patch 8 Sep 2006 14:53:08 -0000 1.229
@@ -1,24 +1,24 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.28/audit2allow/audit2allow
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.28/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2006-08-28 16:58:19.000000000 -0400
-+++ policycoreutils-1.30.28/audit2allow/audit2allow 2006-09-05 08:00:38.000000000 -0400
++++ policycoreutils-1.30.28/audit2allow/audit2allow 2006-09-08 09:12:12.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.28/audit2allow/avc.py
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.28/audit2allow/avc.py
--- nsapolicycoreutils/audit2allow/avc.py 2006-08-28 16:58:19.000000000 -0400
-+++ policycoreutils-1.30.28/audit2allow/avc.py 2006-09-05 08:00:38.000000000 -0400
++++ policycoreutils-1.30.28/audit2allow/avc.py 2006-09-08 09:12:12.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
# Copyright (C) 2006 Red Hat
# see file 'COPYING' for use and warranty information
#
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.28/newrole/newrole.c
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.28/newrole/newrole.c
--- nsapolicycoreutils/newrole/newrole.c 2006-08-28 16:58:20.000000000 -0400
-+++ policycoreutils-1.30.28/newrole/newrole.c 2006-09-05 08:00:38.000000000 -0400
++++ policycoreutils-1.30.28/newrole/newrole.c 2006-09-08 09:12:12.000000000 -0400
@@ -445,6 +445,7 @@
/* Terminate on SIGHUP. */
@@ -27,4318 +27,19 @@
#ifdef USE_NLS
setlocale(LC_ALL, "");
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.28/po/ca.po
---- nsapolicycoreutils/po/ca.po 2006-09-01 22:32:13.000000000 -0400
-+++ policycoreutils-1.30.28/po/ca.po 2006-09-06 10:47:42.000000000 -0400
-@@ -4,6 +4,7 @@
- # package.
- #
- # Josep Puigdemont Casamajó <josep.puigdemont at gmail.com>, 2006.
-+# Xavier Conde Rueda <xavi.conde at gmail.com>, 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ó <josep.puigdemont at gmail.com>\n"
-+"PO-Revision-Date: 2006-08-28 10:34+0200\n"
-+"Last-Translator: Xavier Conde Rueda <xavi.conde at gmail.com>\n"
- "Language-Team: Catalan <tradgnome at softcatala.org>\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"
-+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
[...4333 lines suppressed...]
- rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
+ for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
-+ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i $* -f - 2>&1 >> $LOGFILE
++ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i $* -f - 2>> $LOGFILE
done
exit $?
fi
+@@ -126,10 +126,10 @@
+ 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} $* -f - 2>&1 >> $LOGFILE
++ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>> $LOGFILE
+ done
+ else
+- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE
++ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>> $LOGFILE
+ fi
+
+ exit $?
@@ -190,7 +190,7 @@
RPMFILES=$OPTARG
;;
o)
- OUTFILES=$OPTARG
-+ OUTFILES="-o $OPTARG"
++ OUTFILES="-o"
;;
l)
LOGFILE=$OPTARG
@@ -4471,30 +270,163 @@
if [ $OPTIND -le $# ]; then
usage
fi
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.28/scripts/genhomedircon
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.28/scripts/genhomedircon
--- nsapolicycoreutils/scripts/genhomedircon 2006-08-28 16:58:19.000000000 -0400
-+++ policycoreutils-1.30.28/scripts/genhomedircon 2006-09-05 08:00:38.000000000 -0400
++++ policycoreutils-1.30.28/scripts/genhomedircon 2006-09-08 09:12:12.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python -E
# Copyright (C) 2004 Tresys Technology, LLC
# see file 'COPYING' for use and warranty information
#
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.28/semanage/semanage
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/secon/Makefile policycoreutils-1.30.28/secon/Makefile
+--- nsapolicycoreutils/secon/Makefile 2006-08-28 16:58:20.000000000 -0400
++++ policycoreutils-1.30.28/secon/Makefile 2006-09-08 09:16:28.000000000 -0400
+@@ -20,8 +20,8 @@
+ install: all
+ install -m 755 secon $(BINDIR);
+
+-# test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
+-# install -m 644 ../man/secon.1 $(MANDIR)/man1
++ test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
++ install -m 644 secon.1 $(MANDIR)/man1
+
+ relabel:
+ /sbin/restorecon $(BINDIR)/secon
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.28/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2006-08-28 16:58:18.000000000 -0400
-+++ policycoreutils-1.30.28/semanage/semanage 2006-09-05 08:00:38.000000000 -0400
++++ policycoreutils-1.30.28/semanage/semanage 2006-09-08 09:12:12.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.28/semanage/seobject.py
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.28/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2006-08-28 16:58:18.000000000 -0400
-+++ policycoreutils-1.30.28/semanage/seobject.py 2006-09-05 08:00:38.000000000 -0400
++++ policycoreutils-1.30.28/semanage/seobject.py 2006-09-08 09:12:12.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.30.28/setfiles/setfiles.8
+--- nsapolicycoreutils/setfiles/setfiles.8 2006-08-28 16:58:22.000000000 -0400
++++ policycoreutils-1.30.28/setfiles/setfiles.8 2006-09-08 09:12:12.000000000 -0400
+@@ -4,7 +4,7 @@
+
+ .SH "SYNOPSIS"
+ .B setfiles
+-.I [\-c policy ] [\-d] [\-l] [\-n] [\-e directory ] [\-o filename ] [\-q] [\-s] [\-v] [\-vv] [\-W] [\-F] spec_file pathname...
++.I [\-c policy ] [\-d] [\-l] [\-n] [\-e directory ] [\-o ] [\-q] [\-s] [\-v] [\-vv] [\-W] [\-F] spec_file pathname...
+ .SH "DESCRIPTION"
+ This manual page describes the
+ .BR setfiles
+@@ -44,8 +44,8 @@
+ .B \-F
+ Force reset of context to match file_context for customizable files
+ .TP
+-.B \-o filename
+-save list of files with incorrect context in filename.
++.B \-o
++Print list of files with incorrect context.
+ .TP
+ .B \-s
+ take a list of files from standard input instead of using a pathname on the
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.28/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c 2006-08-28 16:58:22.000000000 -0400
++++ policycoreutils-1.30.28/setfiles/setfiles.c 2006-09-08 09:12:51.000000000 -0400
+@@ -12,7 +12,7 @@
+ * the user. The program does not cross file system boundaries.
+ *
+ * USAGE:
+- * setfiles [-dnpqsvW] [-e directory ] [-c policy] [-o filename ] spec_file pathname...
++ * setfiles [-odnpqsvW] [-e directory ] [-c policy] spec_file pathname...
+ *
+ * -e Specify directory to exclude
+ * -F Force reset of context to match file_context for customizable files
+@@ -26,7 +26,7 @@
+ * -s Use stdin for a list of files instead of searching a partition.
+ * -v Show changes in file labels.
+ * -W Warn about entries that have no matching file.
+- * -o filename write out file names with wrong context.
++ * -o print out file names with wrong context.
+ *
+ * spec_file The specification file.
+ * pathname... The file systems to label (omit if using -s).
+@@ -85,7 +85,7 @@
+ #endif
+
+ static int add_assoc = 1;
+-static FILE *outfile = NULL;
++static int outfile = 0;
+ static int force = 0;
+ #define STAT_BLOCK_SIZE 1
+ static int pipe_fds[2] = { -1, -1 };
+@@ -321,7 +321,7 @@
+ }
+
+ if (debug) {
+- printf("%s: %s matched by %s\n", progname, my_file, newcon);
++ fprintf(stderr, "%s: %s matched by %s\n", progname, my_file, newcon);
+ }
+
+ /* Get the current context of the file. */
+@@ -366,10 +366,10 @@
+ * same. For "-vv", emit everything. */
+ if (verbose > 1 || !user_only_changed) {
+ if (context)
+- printf("%s: relabeling %s from %s to %s\n",
++ fprintf(stderr,"%s: relabeling %s from %s to %s\n",
+ progname, my_file, context, newcon);
+ else
+- printf("%s: labeling %s to %s\n", progname,
++ fprintf(stderr, "%s: labeling %s to %s\n", progname,
+ my_file, newcon);
+ }
+ }
+@@ -384,7 +384,7 @@
+ }
+
+ if (outfile && !user_only_changed)
+- fprintf(outfile, "%s\n", my_file);
++ fprintf(stdout, "%s\n", my_file);
+
+ if (context)
+ freecon(context);
+@@ -516,7 +516,7 @@
+ set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS);
+
+ /* Process any options. */
+- while ((opt = getopt(argc, argv, "Fc:dlnpqrsvWe:o:")) > 0) {
++ while ((opt = getopt(argc, argv, "Fc:dlnpqrsvWe:o")) > 0) {
+ switch (opt) {
+ case 'c':
+ {
+@@ -570,14 +570,7 @@
+ change = 0;
+ break;
+ case 'o':
+- outfile = fopen(optarg, "w");
+- if (!outfile) {
+- fprintf(stderr, "Error opening %s: %s\n",
+- optarg, strerror(errno));
+-
+- usage(argv[0]);
+- }
+- __fsetlocking(outfile, FSETLOCKING_BYCALLER);
++ outfile = 1;
+ break;
+ case 'q':
+ quiet = 1;
+@@ -750,9 +743,6 @@
+ if (warn_no_match)
+ matchpathcon_checkmatches(argv[0]);
+
+- if (outfile)
+- fclose(outfile);
+-
+ for (i = 0; i < excludeCtr; i++) {
+ free(excludeArray[i].directory);
+ }
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- policycoreutils.spec 7 Sep 2006 13:31:37 -0000 1.310
+++ policycoreutils.spec 8 Sep 2006 14:53:08 -0000 1.311
@@ -5,11 +5,12 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.28
-Release: 5
+Release: 6
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
Patch: policycoreutils-rhat.patch
+Patch1: policycoreutils-po.patch
BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel gettext
Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
@@ -37,6 +38,7 @@
%prep
%setup -q
%patch -p1 -b .rhat
+%patch1 -p1 -b .rhatpo
%build
make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all
@@ -100,6 +102,7 @@
%{_mandir}/man8/run_init.8.gz
%{_mandir}/man1/audit2allow.1.gz
%{_mandir}/man1/newrole.1.gz
+%{_mandir}/man1/secon.1.gz
%config %{_sysconfdir}/pam.d/newrole
%config %{_sysconfdir}/pam.d/run_init
%config(noreplace) %{_sysconfdir}/sestatus.conf
@@ -119,6 +122,10 @@
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
+* Fri Sep 8 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-6
+- Change setfiles and restorecon to use stderr except for -o flag
+- Also -o flag will now output files
+
* Thu Sep 7 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-5
- Put back Erich's change
- Previous message (by thread): rpms/ORBit2/FC-5 .cvsignore, 1.17, 1.18 ORBit2.spec, 1.34, 1.35 sources, 1.17, 1.18
- Next message (by thread): rpms/gcc/devel gcc41-pr27567.patch, NONE, 1.1 .cvsignore, 1.168, 1.169 gcc41.spec, 1.99, 1.100 sources, 1.170, 1.171 gcc41-pr28683.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list