rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.214, 1.215 policycoreutils.spec, 1.296, 1.297 policycoreutils-1.30.10-audit-mass-relabel.patch, 1.2, NONE policycoreutils-1.30.10-secon.patch, 1.2, NONE policycoreutils-1.30.12-audit-mass-relabel.patch, 1.1, NONE policycoreutils-1.30.9-secon.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 2 18:28:12 UTC 2006
- Previous message (by thread): rpms/openssl/devel openssl-0.9.8b-enc-bufsize.patch, NONE, 1.1 openssl.spec, 1.81, 1.82
- Next message (by thread): rpms/glibc/devel .cvsignore, 1.161, 1.162 glibc-fedora.patch, 1.165, 1.166 glibc.spec, 1.252, 1.253 sources, 1.185, 1.186
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6344
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Removed Files:
policycoreutils-1.30.10-audit-mass-relabel.patch
policycoreutils-1.30.10-secon.patch
policycoreutils-1.30.12-audit-mass-relabel.patch
policycoreutils-1.30.9-secon.patch
Log Message:
* Wed Aug 2 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-2
- Stop restorecond init script when selinux is not enabled
policycoreutils-rhat.patch:
newrole/newrole.c | 8 +
po/fr.po | 54 ++++++---
po/sv.po | 252 +++++++++++++++++++++++++++----------------
po/ta.po | 34 ++---
restorecond/restorecond.c | 7 +
restorecond/restorecond.init | 2
scripts/fixfiles | 2
7 files changed, 229 insertions(+), 130 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- policycoreutils-rhat.patch 1 Aug 2006 13:56:38 -0000 1.214
+++ policycoreutils-rhat.patch 2 Aug 2006 18:28:08 -0000 1.215
@@ -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 @@
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/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 @@
+
+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 <ifelix at redhat.com>\n"
+ "Language-Team: Tamil <ta at li.org>\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 @@
/* 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
#
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- policycoreutils.spec 1 Aug 2006 13:56:38 -0000 1.296
+++ policycoreutils.spec 2 Aug 2006 18:28:09 -0000 1.297
@@ -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 @@
/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 <dwalsh at redhat.com> 1.30.22-2
+- Stop restorecond init script when selinux is not enabled
+
* Tue Aug 1 2006 Dan Walsh <dwalsh at redhat.com> 1.30.22-1
- Update to upstream
* Merged restorecond size_t fix from Joshua Brindle.
--- policycoreutils-1.30.10-audit-mass-relabel.patch DELETED ---
--- policycoreutils-1.30.10-secon.patch DELETED ---
--- policycoreutils-1.30.12-audit-mass-relabel.patch DELETED ---
--- policycoreutils-1.30.9-secon.patch DELETED ---
- Previous message (by thread): rpms/openssl/devel openssl-0.9.8b-enc-bufsize.patch, NONE, 1.1 openssl.spec, 1.81, 1.82
- Next message (by thread): rpms/glibc/devel .cvsignore, 1.161, 1.162 glibc-fedora.patch, 1.165, 1.166 glibc.spec, 1.252, 1.253 sources, 1.185, 1.186
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list