From 03614a8cec5c11eb7f62c7b4b5acd99e0584aaf2 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 26 Sep 2006 15:46:20 +0000 Subject: [PATCH] * Tue Sep 21 2006 Dan Walsh 1.30.29-6 - Pass -i qualifier to restorecon for fixfiles -R - Update translations * Tue Sep 21 2006 Dan Walsh 1.30.29-5 - Remove recursion from fixfiles -R calls - Fix semanage to verify prefix --- policycoreutils-po.patch | 65 ++++++++++++++++++++++++-------------- policycoreutils-rhat.patch | 16 +++++----- policycoreutils.spec | 6 +++- 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/policycoreutils-po.patch b/policycoreutils-po.patch index ec1a4c2..47548ca 100644 --- a/policycoreutils-po.patch +++ b/policycoreutils-po.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.30.29/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/bn_IN.po 2006-09-21 16:56:01.000000000 -0400 ++++ policycoreutils-1.30.29/po/bn_IN.po 2006-09-26 11:26:33.000000000 -0400 @@ -1,3 +1,4 @@ +# translation of bn_IN.po to Bengali India # translation of bn_IN.po to Bangla (INDIA) @@ -70,7 +70,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreut + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.30.29/po/ca.po --- nsapolicycoreutils/po/ca.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/ca.po 2006-09-21 16:56:01.000000000 -0400 ++++ policycoreutils-1.30.29/po/ca.po 2006-09-26 11:26:33.000000000 -0400 @@ -4,6 +4,7 @@ # package. # @@ -1068,7 +1068,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils +msgstr "Error en les opcions: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.30.29/po/de.po --- nsapolicycoreutils/po/de.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/de.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/de.po 2006-09-26 11:26:33.000000000 -0400 @@ -1,19 +1,22 @@ +# translation of de.po to # German translation of policycoreutils. @@ -1548,7 +1548,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils -#~ msgstr "%s: Erledigt.\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.30.29/po/el.po --- nsapolicycoreutils/po/el.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/el.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/el.po 2006-09-26 11:26:33.000000000 -0400 @@ -3,18 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # @@ -1685,7 +1685,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hr.po policycoreutils-1.30.29/po/hr.po --- nsapolicycoreutils/po/hr.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/hr.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/hr.po 2006-09-26 11:26:33.000000000 -0400 @@ -1,8 +1,3 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -1697,7 +1697,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hr.po policycoreutils "Project-Id-Version: policycoreutils\n" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hu.po policycoreutils-1.30.29/po/hu.po --- nsapolicycoreutils/po/hu.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/hu.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/hu.po 2006-09-26 11:26:33.000000000 -0400 @@ -1,248 +1,253 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -2861,13 +2861,13 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hu.po policycoreutils + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.30.29/po/ms.po --- nsapolicycoreutils/po/ms.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/ms.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/ms.po 2006-09-26 11:26:33.000000000 -0400 @@ -8,7 +8,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-06-29 15:53-0400\n" -"PO-Revision-Date: 2006-08-08 01:09+0800\n" -+"PO-Revision-Date: 2006-09-09 10:38+0800\n" ++"PO-Revision-Date: 2006-09-25 01:34+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -2977,7 +2977,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils #, fuzzy, python-format msgid "Translations can not contain spaces '%s' " msgstr "Nama Perkongsian tidak boleh mengandungi ruang" -@@ -443,17 +454,24 @@ +@@ -443,20 +454,27 @@ msgid "Could not establish semanage connection" msgstr "Tidak dapat menetapkan konteks default untuk %s untuk program %s.\n" @@ -3003,13 +3003,18 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils -#: ../semanage/seobject.py:242 ../semanage/seobject.py:300 -#: ../semanage/seobject.py:347 ../semanage/seobject.py:353 +-#, python-format +#: ../semanage/seobject.py:242 +#: ../semanage/seobject.py:300 +#: ../semanage/seobject.py:347 +#: ../semanage/seobject.py:353 - #, python-format ++#, fuzzy, python-format msgid "Could not check if login mapping for %s is defined" - msgstr "" +-msgstr "" ++msgstr "Tidak dapat memeriksa jika konteks fail untuk %s telah dinyatakan" + + #: ../semanage/seobject.py:244 + #, fuzzy, python-format @@ -471,46 +489,59 @@ #: ../semanage/seobject.py:252 #, fuzzy, python-format @@ -3108,7 +3113,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils #, fuzzy, python-format msgid "Could not delete login mapping for %s" msgstr "Tidak dapat memadam konteks fail untuk %s" -@@ -540,8 +573,10 @@ +@@ -540,11 +573,13 @@ msgid "Could not list login mappings" msgstr "Tidak dapat menyenaraikan konteks fail" @@ -3120,7 +3125,11 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils +#: ../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" +-msgstr "Pengguna %s tidak dapat dipadam: %s.\n" ++msgstr "Tidak dapat memeriksa jika konteks fail untuk %s telah dinyatakan" + + #: ../semanage/seobject.py:430 + #, fuzzy, python-format @@ -554,29 +589,30 @@ #: ../semanage/seobject.py:434 #, fuzzy, python-format @@ -3412,26 +3421,34 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils #, fuzzy, python-format msgid "Interface %s is not defined" msgstr "Boolean %s tidak dinyatakan" -@@ -812,7 +868,8 @@ +@@ -812,51 +868,54 @@ msgid "Could not query interface %s" msgstr "Tidak dapat menyoal fail konteks %s" -#: ../semanage/seobject.py:935 ../semanage/seobject.py:939 +-#, fuzzy, python-format +#: ../semanage/seobject.py:935 +#: ../semanage/seobject.py:939 - #, fuzzy, python-format ++#, python-format msgid "Could not modify interface %s" - msgstr "Tidak dapat mengubah boolean %s" -@@ -822,41 +879,43 @@ +-msgstr "Tidak dapat mengubah boolean %s" ++msgstr "Tidak dapat mengubah antaramuka %s" + + #: ../semanage/seobject.py:959 +-#, fuzzy, python-format ++#, python-format msgid "Interface %s is defined in policy, cannot be deleted" - msgstr "RALAT: kotak \"%s\" adalah bukan antaramuka bolehtulis.\n" +-msgstr "RALAT: kotak \"%s\" adalah bukan antaramuka bolehtulis.\n" ++msgstr "Antaramuka %s dinyatakan dalam polisi, tidak boleh dipadam" -#: ../semanage/seobject.py:967 ../semanage/seobject.py:971 +-#, fuzzy, python-format +#: ../semanage/seobject.py:967 +#: ../semanage/seobject.py:971 - #, fuzzy, python-format ++#, python-format msgid "Could not delete interface %s" - msgstr "Tidak dapat memadam boolean %s" +-msgstr "Tidak dapat memadam boolean %s" ++msgstr "Tidak dapat memadam antaramuka %s" #: ../semanage/seobject.py:979 -#, fuzzy @@ -3566,7 +3583,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-1.30.29/po/ru.po --- nsapolicycoreutils/po/ru.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/ru.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/ru.po 2006-09-26 11:26:33.000000000 -0400 @@ -6,7 +6,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" @@ -4510,7 +4527,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils +msgstr "Ошибка параметров: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.30.29/po/sk.po --- nsapolicycoreutils/po/sk.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/sk.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/sk.po 2006-09-26 11:26:33.000000000 -0400 @@ -3,246 +3,252 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. @@ -5805,7 +5822,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.29/po/sv.po --- nsapolicycoreutils/po/sv.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/sv.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/sv.po 2006-09-26 11:26:33.000000000 -0400 @@ -2,19 +2,19 @@ # Copyright (C) 2006 Christian Rose. # Christian Rose , 2006. @@ -6629,7 +6646,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils -#~ msgstr "Flaggfel: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.30.29/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2006-09-01 22:32:13.000000000 -0400 -+++ policycoreutils-1.30.29/po/zh_TW.po 2006-09-21 16:56:02.000000000 -0400 ++++ policycoreutils-1.30.29/po/zh_TW.po 2006-09-26 11:26:33.000000000 -0400 @@ -9,7 +9,7 @@ "Project-Id-Version: zh_TW\n" "Report-Msgid-Bugs-To: \n" diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 9ca167b..1e15085 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.29/audit2allow/avc.py --- nsapolicycoreutils/audit2allow/avc.py 2006-09-14 08:07:24.000000000 -0400 -+++ policycoreutils-1.30.29/audit2allow/avc.py 2006-09-21 17:16:48.000000000 -0400 ++++ policycoreutils-1.30.29/audit2allow/avc.py 2006-09-26 11:25:03.000000000 -0400 @@ -357,6 +357,15 @@ break else: @@ -19,7 +19,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/audit2a found = 0 diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.30.29/restorecon/restorecon.8 --- nsapolicycoreutils/restorecon/restorecon.8 2006-08-28 16:58:19.000000000 -0400 -+++ policycoreutils-1.30.29/restorecon/restorecon.8 2006-09-21 17:16:48.000000000 -0400 ++++ policycoreutils-1.30.29/restorecon/restorecon.8 2006-09-26 11:25:03.000000000 -0400 @@ -23,6 +23,9 @@ .SH "OPTIONS" @@ -32,7 +32,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restore .TP diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c --- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400 -+++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-21 17:16:49.000000000 -0400 ++++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-26 11:25:03.000000000 -0400 @@ -11,9 +11,10 @@ * restorecon [-Rnv] pathname... * @@ -189,7 +189,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restore } diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.29/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 2006-08-28 16:58:19.000000000 -0400 -+++ policycoreutils-1.30.29/restorecond/Makefile 2006-09-21 17:16:49.000000000 -0400 ++++ policycoreutils-1.30.29/restorecond/Makefile 2006-09-26 11:25:03.000000000 -0400 @@ -5,14 +5,14 @@ INITDIR = $(DESTDIR)/etc/rc.d/init.d SELINUXDIR = $(DESTDIR)/etc/selinux @@ -210,7 +210,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restore [ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8 diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.29/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-09-01 22:32:11.000000000 -0400 -+++ policycoreutils-1.30.29/scripts/fixfiles 2006-09-23 19:31:23.000000000 -0400 ++++ policycoreutils-1.30.29/scripts/fixfiles 2006-09-26 11:25:17.000000000 -0400 @@ -117,8 +117,8 @@ exit $? fi @@ -218,7 +218,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts - for i in `echo $RPMFILES | sed 's/,/ /g'`; do - rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE + for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do -+ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE ++ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -i -f - 2>&1 >> $LOGFILE done exit $? fi @@ -241,7 +241,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts usage diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.30.29/scripts/fixfiles.8 --- nsapolicycoreutils/scripts/fixfiles.8 2006-08-28 16:58:19.000000000 -0400 -+++ policycoreutils-1.30.29/scripts/fixfiles.8 2006-09-21 17:16:49.000000000 -0400 ++++ policycoreutils-1.30.29/scripts/fixfiles.8 2006-09-26 11:25:03.000000000 -0400 @@ -3,9 +3,9 @@ fixfiles \- fix file security contexts. @@ -275,7 +275,7 @@ diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.29/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-09-14 08:07:24.000000000 -0400 -+++ policycoreutils-1.30.29/semanage/seobject.py 2006-09-25 09:53:57.000000000 -0400 ++++ policycoreutils-1.30.29/semanage/seobject.py 2006-09-26 11:25:03.000000000 -0400 @@ -456,7 +456,8 @@ rc = semanage_user_set_mlslevel(self.sh, u, selevel) if rc < 0: diff --git a/policycoreutils.spec b/policycoreutils.spec index 1f6a4e9..1f75ebe 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.29 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -122,6 +122,10 @@ fi [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Tue Sep 21 2006 Dan Walsh 1.30.29-6 +- Pass -i qualifier to restorecon for fixfiles -R +- Update translations + * Tue Sep 21 2006 Dan Walsh 1.30.29-5 - Remove recursion from fixfiles -R calls - Fix semanage to verify prefix