rpms/policycoreutils/devel policycoreutils-rhat.patch,1.119,1.120

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch 
Log Message:


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |  465 +++++++++++++++++++++++++++++--------------
 audit2allow/audit2allow.perl |  164 +++++++++++++++
 scripts/genhomedircon        |   25 --
 semodule/semodule.c          |   26 +-
 4 files changed, 504 insertions(+), 176 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- policycoreutils-rhat.patch	17 Nov 2005 15:38:45 -0000	1.119
+++ policycoreutils-rhat.patch	17 Nov 2005 16:06:39 -0000	1.120
@@ -708,3 +708,118 @@
  					u[5] != "/" and \
  					string.count(u[5], "/") > 1:
  				homedir = u[5][:string.rfind(u[5], "/")]
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-1.27.28/semodule/semodule.c
+--- nsapolicycoreutils/semodule/semodule.c	2005-11-08 20:32:51.000000000 -0500
++++ policycoreutils-1.27.28/semodule/semodule.c	2005-11-17 11:02:35.000000000 -0500
+@@ -38,7 +38,7 @@
+ static int num_commands = 0;
+ 
+ /* options given on command line */
+-static int quiet;
++static int verbose;
+ static int reload;
+ static int no_reload;
+ static int build;
+@@ -122,7 +122,7 @@
+ 	printf("  -s,--store	   name of the store to operate on\n");
+ 	printf("  -n,--noreload	   do not reload policy after commit\n");
+         printf("  -h,--help        print this message and quit\n");
+-        printf("  -q,--quiet       be quiet\n");
++        printf("  -v,--verbose     be verbose\n");
+ }
+ 
+ /* Sets the global mode variable to new_mode, but only if no other
+@@ -157,7 +157,7 @@
+                 {"help", 0, NULL, 'h'},
+                 {"install", required_argument, NULL, 'i'},
+                 {"list-modules", 0, NULL, 'l'},
+-                {"quiet", 0, NULL, 'q'},
++                {"verbose", 0, NULL, 'v'},
+                 {"remove", required_argument, NULL, 'r'},
+                 {"upgrade", required_argument, NULL, 'u'},
+ 		{"reload", 0, NULL, 'R'},
+@@ -166,7 +166,7 @@
+                 {NULL, 0, NULL, 0}
+         };
+         int i;
+-        quiet = 0;
++        verbose = 0;
+ 	reload = 0;
+ 	no_reload = 0;
+         while ((i = getopt_long(argc, argv, "s:b:hi:lqr:u:RnB", opts, NULL)) != -1) {
+@@ -175,7 +175,7 @@
+                 case 'h': usage(argv[0]); exit(0);
+                 case 'i': set_mode(INSTALL_M, optarg); break;
+                 case 'l': set_mode(LIST_M, NULL); break;
+-                case 'q': quiet = 1; break;
++                case 'v': verbose = 1; break;
+                 case 'r': set_mode(REMOVE_M, optarg); break;
+                 case 'u': set_mode(UPGRADE_M,optarg); break;
+ 		case 's': set_store(optarg); break;
+@@ -266,28 +266,28 @@
+                 }
+                 switch (mode) {
+                 case INSTALL_M: {
+-                        if (!quiet) {
++                        if (verbose) {
+                                 printf("Attempting to install module '%s':\n", mode_arg);
+                         }
+                         result = semanage_module_install(sh, data, data_len);
+                         break;
+                 }
+                 case UPGRADE_M: {
+-                        if (!quiet) {
++                        if (verbose) {
+                                 printf("Attempting to upgrade module '%s':\n", mode_arg);
+                         }
+                         result = semanage_module_upgrade(sh, data, data_len);
+                         break;
+                 }
+                 case BASE_M: {
+-                        if (!quiet) {
++                        if (verbose) {
+                                 printf("Attempting to install base module '%s':\n", mode_arg);
+                         }
+                         result = semanage_module_install_base(sh, data, data_len);
+                         break;
+                 }
+                 case REMOVE_M: {
+-                        if (!quiet) {
++                        if (verbose) {
+                                 printf("Attempting to remove module '%s':\n", mode_arg);
+                         }
+                         result = semanage_module_remove(sh, mode_arg);
+@@ -296,7 +296,7 @@
+                 case LIST_M: {
+                         semanage_module_info_t *modinfo;
+                         int num_modules;
+-                        if (!quiet) {
++                        if (verbose) {
+                                 printf("Attempting to list active modules:\n");
+                         }
+                         if ((result = semanage_module_list(sh, &modinfo, &num_modules)) >= 0) {
+@@ -328,13 +328,13 @@
+                         fprintf(stderr, "Failed!\n");
+                         goto cleanup;
+                 }
+-                else if (!quiet) {
++                else if (verbose) {
+                         printf("Ok: return value of %d.\n", result);
+                 }
+         }
+         
+         if (commit) {
+-                if (!quiet) {
++                if (verbose) {
+                         printf("Committing changes:\n");
+                 }
+ 		if (no_reload) {
+@@ -347,7 +347,7 @@
+                 fprintf(stderr, "Failed!\n");
+                 goto cleanup;
+         }
+-        else if (commit && !quiet) {
++        else if (commit && verbose) {
+                 printf("Ok: transaction number %d.\n", result);
+         }
+