setools-cmdline patch

[Daniel J Walsh <dwalsh@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 500 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This patch cleans up some missing commandline options from seinfo,
sediff and seaudit-report

sediff actually had options listed in its getopt that did not exist.

Oops missed one on replcon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAkzkShIACgkQrlYvE4MpobMl/wCdH5+IaaKhGbEB56KfeRi9zZ1r
8P4AniLVK24my6NUrB8OLsn2Q3wVOjRv
=2eCW
-----END PGP SIGNATURE-----

[-- Attachment #2: setools-cmdline.patch --]
[-- Type: text/plain, Size: 3101 bytes --]

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;

[-- Attachment #3: setools-cmdline.patch.sig --]
[-- Type: application/pgp-signature, Size: 72 bytes --]