[setools/f14/master] - Exit seinfo and sesearch with proper status

[Daniel J Walsh]

commit f232315525aa73593f0522e8b54b234d305b514e
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Jan 6 16:56:49 2011 -0500

    - Exit seinfo and sesearch with proper status

 setools-cmdline.patch |   59 +++++++++++++++++++++++++++++++++++++++++++++++++
 setools.spec          |    2 +
 2 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/setools-cmdline.patch b/setools-cmdline.patch
new file mode 100644
index 0000000..a55e214
--- /dev/null
+++ b/setools-cmdline.patch
@@ -0,0 +1,59 @@
+diff -up setools-3.3.7/man/replcon.1.cmdline setools-3.3.7/man/replcon.1
+--- setools-3.3.7/man/replcon.1.cmdline	2007-08-02 17:16:33.000000000 -0400
++++ setools-3.3.7/man/replcon.1	2010-11-17 16:31:01.000000000 -0500
+@@ -44,6 +44,8 @@ Search for files which include PATH.
+ .IP "-c CLASS, --class=CLASS"
+ Search only files of object class CLASS.
+ .SH OPTIONS
++.IP "-R, --regex"
++Enable regular expressions
+ .IP "-v, --verbose"
+ Display context info during replacement.
+ .IP "-h, --help"
+diff -up setools-3.3.7/man/seinfo.1.cmdline setools-3.3.7/man/seinfo.1
+--- setools-3.3.7/man/seinfo.1.cmdline	2010-05-03 12:39:02.000000000 -0400
++++ setools-3.3.7/man/seinfo.1	2010-11-17 16:23:36.000000000 -0500
+@@ -76,6 +76,10 @@ There is no expanded information for thi
+ .IP "--nodecon[=ADDR]"
+ Print a list of node contexts or, if ADDR is provided, print the statement for the node with address ADDR.
+ There is no expanded information for this component.
++.IP "--polcap"
++Print policy capabilities.
++.IP "--permissive"
++Print permissive types.
+ .IP "--portcon[=PORT]"
+ Print a list of port contexts or, if PORT is provided, print the statement for port PORT.
+ There is no expanded information for this component.
+@@ -93,7 +97,7 @@ These details include the types assigned
+ This option is not available for all component types; see the description of each component for the details this option will provide.
+ .IP "--stats"
+ Print policy statistics including policy type and version information and counts of all components and rules.
+-.IP "-l"
++.IP "-l, --line-breaks"
+ Print line breaks when displaying constraint statements.
+ .IP "-h, --help"
+ Print help information and exit.
+diff -up setools-3.3.7/seaudit/seaudit-report.c.cmdline setools-3.3.7/seaudit/seaudit-report.c
+--- setools-3.3.7/seaudit/seaudit-report.c.cmdline	2010-11-17 16:09:48.000000000 -0500
++++ setools-3.3.7/seaudit/seaudit-report.c	2010-11-17 16:11:06.000000000 -0500
+@@ -100,7 +100,7 @@ static void seaudit_report_info_usage(co
+ 	printf("  -s, --stdin              read log data from standard input\n");
+ 	printf("  -m, --malformed          include malformed log messages\n");
+ 	printf("  -o FILE, --output=FILE   output to FILE\n");
+-	printf("  --config=FILE            read configuration from FILE\n");
++	printf("  -c FILE, --config=FILE   read configuration from FILE\n");
+ 	printf("  --html                   set output format to HTML\n");
+ 	printf("  --stylesheet=FILE        HTML style sheet for formatting HTML report\n");
+ 	printf("                           (ignored if --html is not given)\n");
+diff -up setools-3.3.7/sediff/sediff.c.cmdline setools-3.3.7/sediff/sediff.c
+--- setools-3.3.7/sediff/sediff.c.cmdline	2007-08-02 17:16:33.000000000 -0400
++++ setools-3.3.7/sediff/sediff.c	2010-11-17 16:20:01.000000000 -0500
+@@ -420,7 +420,7 @@ int main(int argc, char **argv)
+ 	poldiff_t *diff = NULL;
+ 	size_t total = 0;
+ 
+-	while ((optc = getopt_long(argc, argv, "ctarubANDLMCRqhV", longopts, NULL)) != -1) {
++	while ((optc = getopt_long(argc, argv, "ctarubAqhV", longopts, NULL)) != -1) {
+ 		switch (optc) {
+ 		case 0:
+ 			break;
diff --git a/setools.spec b/setools.spec
index 7a74be8..b216df7 100644
--- a/setools.spec
+++ b/setools.spec
@@ -17,6 +17,7 @@ Source4: sediffx.desktop
 Patch1: setools-python.patch
 Patch2: setools-exitstatus.patch
 Patch3: setools-neverallow.patch
+Patch4: setools-cmdline.patch
 Summary: Policy analysis tools for SELinux
 Group: System Environment/Base
 Requires: setools-libs = %{version}-%{release} setools-libs-tcl = %{version}-%{release} setools-gui = %{version}-%{release} setools-console = %{version}-%{release}
@@ -191,6 +192,7 @@ This package includes the following graphical tools:
 %patch1 -p 1 -b .python
 %patch2 -p 1 -b .exitstatus
 %patch3 -p 1 -b .neverallow
+%patch4 -p 1 -b .cmdline
 
 # Fixup expected version of SWIG:
 sed -i -e "s|AC_PROG_SWIG(1.3.28)|AC_PROG_SWIG(2.0.0)|g" configure.ac