rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.208, 1.209 policycoreutils.spec, 1.290, 1.291

Tue Jul 11 19:29:32 UTC 2006

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17849

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Jul 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-2
- Add verbose flag to restorecond and update translations


policycoreutils-rhat.patch:
 po/af.po                  |   98 +++---
 po/am.po                  |   98 +++---
 po/ar.po                  |   98 +++---
 po/be.po                  |   98 +++---
 po/bg.po                  |   98 +++---
 po/bn.po                  |   98 +++---
 po/bn_IN.po               |   98 +++---
 po/ca.po                  |   98 +++---
 po/cs.po                  |   98 +++---
 po/cy.po                  |   98 +++---
 po/da.po                  |   96 +++---
 po/de.po                  |  721 +++++++++++++++++++++++-----------------------
 po/el.po                  |  703 ++++++++++++++++++++++++--------------------
 po/en_GB.po               |   98 +++---
 po/es.po                  |   98 +++---
 po/et.po                  |   96 +++---
 po/eu_ES.po               |   98 +++---
 po/fa.po                  |   98 +++---
 po/fi.po                  |   98 +++---
 po/fr.po                  |  501 ++++++++++++++++---------------
 po/gl.po                  |   96 +++---
 po/gu.po                  |   98 +++---
 po/he.po                  |   98 +++---
 po/hi.po                  |  102 +++---
 po/hr.po                  |   98 +++---
 po/hu.po                  |   98 +++---
 po/hy.po                  |   98 +++---
 po/id.po                  |   96 +++---
 po/is.po                  |   98 +++---
 po/it.po                  |   98 +++---
 po/ja.po                  |   98 +++---
 po/ka.po                  |   98 +++---
 po/kn.po                  |   98 +++---
 po/ko.po                  |  349 +++++++++++-----------
 po/ku.po                  |   98 +++---
 po/lo.po                  |   98 +++---
 po/lt.po                  |   98 +++---
 po/lv.po                  |   98 +++---
 po/mk.po                  |   98 +++---
 po/ml.po                  |  123 ++++---
 po/mr.po                  |  156 +++++----
 po/ms.po                  |  332 ++++++++++++---------
 po/my.po                  |   98 +++---
 po/nb.po                  |   98 +++---
 po/nl.po                  |   96 +++---
 po/nn.po                  |   98 +++---
 po/no.po                  |   98 +++---
 po/nso.po                 |   98 +++---
 po/or.po                  |   98 +++---
 po/pa.po                  |   98 +++---
 po/pl.po                  |   98 +++---
 po/pt.po                  |   98 +++---
 po/pt_BR.po               |   98 +++---
 po/ro.po                  |   98 +++---
 po/ru.po                  |   98 +++---
 po/si.po                  |   98 +++---
 po/sk.po                  |   98 +++---
 po/sl.po                  |   98 +++---
 po/sq.po                  |   98 +++---
 po/sr.po                  |   98 +++---
 po/sr at Latn.po             |   98 +++---
 po/sv.po                  |   96 +++---
 po/ta.po                  |   98 +++---
 po/te.po                  |   98 +++---
 po/th.po                  |   98 +++---
 po/tr.po                  |   98 +++---
 po/uk.po                  |   98 +++---
 po/ur.po                  |   98 +++---
 po/vi.po                  |   98 +++---
 po/zh_CN.po               |  363 +++++++++++++----------
 po/zh_TW.po               |  143 ++++-----
 po/zu.po                  |   98 +++---
 restorecond/restorecond.c |   16 -
 73 files changed, 4944 insertions(+), 4629 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.208 -r 1.209 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209

--- policycoreutils-rhat.patch	22 Jun 2006 18:37:08 -0000	1.208
+++ policycoreutils-rhat.patch	11 Jul 2006 19:29:29 -0000	1.209
@@ -1,1177 +1,27379 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.14/audit2allow/audit2allow.1
---- nsapolicycoreutils/audit2allow/audit2allow.1	2006-05-15 09:42:57.000000000 -0400
-+++ policycoreutils-1.30.14/audit2allow/audit2allow.1	2006-06-20 09:11:30.000000000 -0400
-@@ -66,7 +66,7 @@
- Generate require output syntax for loadable modules.
- .TP
- .B "\-R" | "\-\-reference"
--Generate reference policy using installed macros
-+Generate reference policy using installed macros.  Requires the selinux-policy-devel package.
- .TP
- .B "\-t "  | "\-\-tefile"
- Indicates input file is a te (type enforcement) file.  This can be used to translate old te format to new policy format.
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.14/audit2allow/avc.py
---- nsapolicycoreutils/audit2allow/avc.py	2006-05-23 06:19:30.000000000 -0400
-+++ policycoreutils-1.30.14/audit2allow/avc.py	2006-06-20 09:12:47.000000000 -0400
-@@ -66,7 +66,7 @@
- 	try:
- 		fd = open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt")
- 	except IOError, error:
--		raise IOError("Reference policy generation requires the policy development package.\n%s" % error)
-+		raise IOError("Reference policy generation requires the policy development package selinux-policy-devel.\n%s" % error)
-         records = fd.read().split("\n")
-         regexp = "^define *\(`([^']*)' *, *` *\{([^}]*)}'"
-         for r in records:
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.30.14/po/hi.po
---- nsapolicycoreutils/po/hi.po	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/po/hi.po	2006-06-19 10:34:57.000000000 -0400
-@@ -7,15 +7,15 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.30.17/po/af.po
+--- nsapolicycoreutils/po/af.po	2006-07-03 07:52:45.000000000 -0400
++++ policycoreutils-1.30.17/po/af.po	2006-07-10 13:09:18.000000000 -0400
+@@ -8,7 +8,7 @@
  msgstr ""
- "Project-Id-Version: hi\n"
+ "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-06-16 09:51-0400\n"
--"PO-Revision-Date: 2006-05-09 15:25+0530\n"
+-"POT-Creation-Date: 2006-06-29 15:53-0400\n"
 +"POT-Creation-Date: 2006-05-26 13:48-0400\n"
-+"PO-Revision-Date: 2006-06-19 11:09+0530\n"
- "Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
- "Language-Team: Hindi <fedora-trans-hi at redhat.com>\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 "à¤—à¥ˆà¤°-MLS à¤®à¤¶à¥€à¤¨ à¤ªà¤° à¤…à¤¨à¥à¤µà¤¾à¤¦ à¤¸à¤®à¤°à¥à¤¥à¤¿à¤¤ à¤¨à¤¹à¥€à¤‚"
-+msgstr "à¤—à¥ˆà¤°-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"
+ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+ "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+ "Language-Team: LANGUAGE <LL at li.org>\n"
+@@ -21,7 +21,7 @@
+ msgid "usage:  %s [-bq]\n"
+ msgstr ""
  
- #: ../semanage/semanage:299
--#, fuzzy, c-format
-+#, c-format
- msgid "Invalid value %s"
--msgstr "à¤…à¤µà¥ˆà¤§ à¤¸à¥à¤¤à¤° '%s' "
-+msgstr "à¤…à¤µà¥ˆà¤§ à¤®à¤¾à¤¨ %s"
+-#: ../load_policy/load_policy.c:66
++#: ../load_policy/load_policy.c:62
+ #, c-format
+ msgid "%s:  Can't load policy:  %s\n"
+ msgstr ""
+@@ -31,26 +31,26 @@
+ msgid "Out of memory!\n"
+ msgstr ""
  
- #: ../semanage/seobject.py:124
- msgid "translations not supported on non-MLS machines"
-@@ -971,3 +969,4 @@
+-#: ../newrole/newrole.c:199 ../run_init/run_init.c:126
++#: ../newrole/newrole.c:201 ../run_init/run_init.c:126
  #, c-format
- msgid "Options Error: %s "
- msgstr "à¤µà¤¿à¤•à¤²à¥à¤ª à¤¤à¥à¤°à¥à¤Ÿà¤¿: %s "
-+
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.30.14/po/mr.po
---- nsapolicycoreutils/po/mr.po	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/po/mr.po	2006-06-19 10:31:00.000000000 -0400
-@@ -1,20 +1,21 @@
--# SOME DESCRIPTIVE TITLE.
--# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# translation of mr.po to Marathi
- # This file is distributed under the same license as the PACKAGE package.
--# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-+# Rahul Bhalerao <rbhalera at redhat.com>, 2006.
- #
--#, fuzzy
- msgid ""
+ msgid "failed to initialize PAM\n"
  msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
-+"Project-Id-Version: mr\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-06-16 09:51-0400\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
--"Language-Team: LANGUAGE <LL at li.org>\n"
-+"POT-Creation-Date: 2006-05-26 13:48-0400\n"
-+"PO-Revision-Date: 2006-06-13 14:36+0530\n"
-+"Last-Translator: Rahul Bhalerao <rbhalera at redhat.com>\n"
-+"Language-Team: Marathi\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"
  
- #: ../load_policy/load_policy.c:22
+-#: ../newrole/newrole.c:210
++#: ../newrole/newrole.c:212
  #, c-format
-@@ -42,8 +43,9 @@
+ msgid "failed to set PAM_TTY\n"
  msgstr ""
  
- #: ../newrole/newrole.c:250 ../run_init/run_init.c:155
-+#, fuzzy
+-#: ../newrole/newrole.c:246 ../run_init/run_init.c:154
++#: ../newrole/newrole.c:250 ../run_init/run_init.c:155
  msgid "Password:"
--msgstr ""
-+msgstr "à¤—à¥à¤ªà¥à¤¤à¤¶à¤¬à¥à¤¦:"
+ msgstr ""
  
- #: ../newrole/newrole.c:282 ../run_init/run_init.c:187
+-#: ../newrole/newrole.c:281 ../run_init/run_init.c:189
++#: ../newrole/newrole.c:282 ../run_init/run_init.c:187
  #, c-format
-@@ -57,28 +59,33 @@
+ msgid "Cannot find your entry in the shadow passwd file.\n"
+ msgstr ""
  
- #: ../newrole/newrole.c:354
+-#: ../newrole/newrole.c:287 ../run_init/run_init.c:195
++#: ../newrole/newrole.c:288 ../run_init/run_init.c:193
  #, c-format
-+#, fuzzy
[...27982 lines suppressed...]
---- nsapolicycoreutils/scripts/fixfiles	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/scripts/fixfiles	2006-06-22 14:21:55.000000000 -0400
-@@ -28,7 +28,7 @@
- DIRS=""
- RPMILES=""
- OUTFILES=""
--LOGFILE=/dev/null
-+LOGFILE=`tty`
- SYSLOGFLAG="-l"
- LOGGER=/usr/sbin/logger
- SETFILES=/sbin/setfiles
-@@ -118,7 +118,7 @@
- fi
- if [ ! -z "$RPMFILES" ]; then
-     for i in `echo $RPMFILES | sed 's/,/ /g'`; do
--	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE
-+	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
-     done
-     exit $?
- fi
-@@ -126,16 +126,16 @@
-     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} $1 -v -f - 2>&1 >> $LOGFILE
-+	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE
- 	done
-     else
--	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE
-     fi
- 
-     exit $?
- fi
- LogReadOnly
--${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
-+${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- exit $?
- }
+@@ -364,7 +367,7 @@
  
-@@ -234,8 +234,8 @@
- # Make sure they specified one of the three valid commands
- #
- case "$command" in
--    restore) restore ;;
--    check) restore -n ;;
-+    restore) restore -p -q ;;
-+    check) restore -n -v ;;
-     relabel) relabel;;
-     *)
-     usage
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.30.14/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/setfiles/setfiles.c	2006-06-22 14:32:43.000000000 -0400
-@@ -20,6 +20,7 @@
-  * -d   Show what specification matched each file.
-  * -l   Log changes in files labels to syslog.
-  * -n	Do not change any file labels.
-+ * -p   Show progress.  Prints * for every 1000 files
-  * -q   Be quiet (suppress non-error output).
-  * -r   Use an alternate root path
-  * -s   Use stdin for a list of files instead of searching a partition.
-@@ -88,6 +89,8 @@
- static int force=0;
- #define STAT_BLOCK_SIZE 1
- static int pipe_fds[2] = { -1, -1 };
-+static int progress=0;
-+static unsigned long long count=0;
- 
- #define MAX_EXCLUDES 100
- static int excludeCtr=0;
-@@ -208,7 +211,7 @@
- void usage(const char * const name)
+ static void usage(char *program)
  {
- 	fprintf(stderr,
--		"usage:  %s [-dnqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
-+		"usage:  %s [-dnpqvW] [-o filename] [-r alt_root_path ] spec_file pathname...\n"
- 		"usage:  %s -c policyfile spec_file\n"
- 		"usage:  %s -s [-dnqvW] [-o filename ] spec_file\n", name, name, name);
- 	exit(1);
-@@ -278,6 +281,18 @@
- 		/* No matching specification. */
- 		return 0;
- 
-+	if (progress) {
-+		count++;
-+		if (count % 80000 == 0) {
-+			fprintf(stdout, "\n");
-+			fflush(stdout);
-+		}
-+		if (count % 1000 == 0) {
-+			fprintf(stdout, "*");
-+			fflush(stdout);
-+		}
-+	}
-+
- 	/*
- 	 * Try to add an association between this inode and
- 	 * this specification.  If there is already an association
-@@ -301,7 +316,7 @@
- 	}
+-	printf("%s [-d] \n", program);
++	printf("%s [-d] [-v] \n", program);
+ 	exit(0);
+ }
  
- 	/* Get the current context of the file. */
--	ret = lgetfilecon(my_file, &context);
-+	ret = lgetfilecon_raw(my_file, &context);
- 	if (ret < 0) {
- 		if (errno == ENODATA) {
- 			context = NULL;
-@@ -414,7 +429,7 @@
- 
- 	if (policyfile) {
- 		valid = (sepol_check_context (context) >= 0);
--	} else if (security_canonicalize_context(context, &tmpcon) < 0) {
-+	} else if (security_canonicalize_context_raw(context, &tmpcon) < 0) {
- 		if (errno != ENOENT) {
- 			valid = 0;
- 			inc_err();
-@@ -485,10 +500,10 @@
- 	memset(excludeArray,0, sizeof(excludeArray));
- 
- 	/* Validate all file contexts during matchpathcon_init. */
--	set_matchpathcon_flags(MATCHPATHCON_VALIDATE);
-+	set_matchpathcon_flags(MATCHPATHCON_VALIDATE | MATCHPATHCON_NOTRANS);
- 
- 	/* Process any options. */
--	while ((opt = getopt(argc, argv, "Fc:dlnqrsvWe:o:")) > 0) {
-+	while ((opt = getopt(argc, argv, "Fc:dlnpqrsvWe:o:")) > 0) {
+@@ -449,11 +452,14 @@
+ 	if (master_fd < 0)
+ 		exitApp("inotify_init");
+ 
+-	while ((opt = getopt(argc, argv, "d")) > 0) {
++	while ((opt = getopt(argc, argv, "dv")) > 0) {
  		switch (opt) {
- 		case 'c':
- 		{
-@@ -566,8 +581,19 @@
- 			add_assoc = 0;
+ 		case 'd':
+ 			debug_mode = 1;
  			break;
- 		case 'v':
-+			if (progress) {
-+				fprintf(stderr, "Progress and Verbose mutually exclusive\n");
-+				exit(1);
-+			}
- 			verbose++;
- 			break;
-+		case 'p':
-+			if (verbose) {
-+				fprintf(stderr, "Progress and Verbose mutually exclusive\n");
-+				usage(argv[0]);
-+			}
-+			progress = 1;
++		case 'v':
++			verbose_mode = 1;
 +			break;
- 		case 'W':
- 			warn_no_match = 1;
- 			break;
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.8 policycoreutils-1.30.14/setsebool/setsebool.8
---- nsapolicycoreutils/setsebool/setsebool.8	2006-05-15 09:42:58.000000000 -0400
-+++ policycoreutils-1.30.14/setsebool/setsebool.8	2006-06-19 10:32:36.000000000 -0400
-@@ -9,8 +9,7 @@
- .SH "DESCRIPTION"
- .B setsebool 
- sets the current state of a particular SELinux boolean or a list of booleans 
--to a given value. The value may be 1 or true to enable the boolean, or 0 or 
--false to disable it. 
-+to a given value. The value may be 1 or true or on to enable the boolean, or 0 or false or off to disable it. 
- 
- Without the -P option, only the current boolean value is 
- affected; the boot-time default settings 
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.30.14/setsebool/setsebool.c
---- nsapolicycoreutils/setsebool/setsebool.c	2006-06-16 15:08:24.000000000 -0400
-+++ policycoreutils-1.30.14/setsebool/setsebool.c	2006-06-19 10:32:04.000000000 -0400
-@@ -197,10 +197,12 @@
- 		*value_ptr = 0;
- 		value_ptr++;
- 		if (strcmp(value_ptr, "1") == 0 || 
--				strcasecmp(value_ptr, "true") == 0)
-+		    strcasecmp(value_ptr, "true") == 0 ||
-+		    strcasecmp(value_ptr, "on") == 0)
- 			value = 1;
- 		else if (strcmp(value_ptr, "0") == 0 || 
--				strcasecmp(value_ptr, "false") == 0)
-+			 strcasecmp(value_ptr, "false") == 0 ||
-+			 strcasecmp(value_ptr, "off") == 0)
- 			value = 0;
- 		else {
- 			fprintf(stderr, "setsebool: illegal value "
+ 		case '?':
+ 			usage(argv[0]);
+ 		}


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- policycoreutils.spec	7 Jul 2006 11:34:10 -0000	1.290
+++ policycoreutils.spec	11 Jul 2006 19:29:29 -0000	1.291
@@ -5,10 +5,11 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.17
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Patch: policycoreutils-rhat.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
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat 
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -109,6 +111,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Mon Jul 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-2
+- Add verbose flag to restorecond and update translations
+
 * Tue Jul 4 2006 Dan Walsh <dwalsh at redhat.com> 1.30.17-1
 - Update to upstream
 	* Lindent.


