rpms/libsemanage/devel libsemanage-rhat.patch,1.23,1.24

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8637

Modified Files:
	libsemanage-rhat.patch 
Log Message:
* Thu Aug 23 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.5-1
- Upgrade to latest from NSA


libsemanage-rhat.patch:

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libsemanage-rhat.patch	20 Aug 2007 23:30:14 -0000	1.23
+++ libsemanage-rhat.patch	5 Sep 2007 19:01:41 -0000	1.24
@@ -74,10 +74,25 @@
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
+--- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
+@@ -37,10 +37,10 @@
+ 	int expand_check;
+ 	int save_previous;
+ 	int save_linked;
+-	int disable_genhomedircon;
+ 	mode_t file_mode;
+ 	struct external_prog *load_policy;
+ 	struct external_prog *setfiles;
++	struct external_prog *genhomedircon;
+ 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
+ } semanage_conf_t;
+ 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2007-07-16 14:20:38.000000000 -0400
+--- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400
-@@ -1120,7 +1120,7 @@
+@@ -1130,7 +1120,7 @@
  
        skip_reload:
  
@@ -86,12 +101,3 @@
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
-@@ -1262,7 +1262,7 @@
- 		goto cleanup;
- 	}
- 
--	if ((retval =
-+	if (sh->do_rebuild_file_context && (retval =
- 	     semanage_exec_prog(sh, sh->conf->genhomedircon,
- 				sh->conf->store_path, "")) != 0) {
- 		ERR(sh, "genhomedircon returned error code %d.", retval);