rpms/policycoreutils/devel policycoreutils-rhat.patch,1.376,1.377

[Daniel J Walsh (dwalsh)]

Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch 
Log Message:
* Wed Jul 9 2008 Dan Walsh <dwalsh at redhat.com> 2.0.52-5
- Additial cleanup of boolean handling for semanage


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- policycoreutils-rhat.patch	9 Jul 2008 13:04:58 -0000	1.376
+++ policycoreutils-rhat.patch	10 Jul 2008 13:40:20 -0000	1.377
@@ -1,3 +1,41 @@
+diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.52/Makefile
+--- nsapolicycoreutils/Makefile	2008-06-12 23:25:24.000000000 -0400
++++ policycoreutils-2.0.52/Makefile	2008-07-09 08:44:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
++SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
+ 
+ INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+ 
+diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.52/restorecond/restorecond.c
+--- nsapolicycoreutils/restorecond/restorecond.c	2008-06-12 23:25:21.000000000 -0400
++++ policycoreutils-2.0.52/restorecond/restorecond.c	2008-07-09 08:44:40.000000000 -0400
+@@ -210,9 +210,10 @@
+ 			}
+ 
+ 			if (fsetfilecon(fd, scontext) < 0) {
+-				syslog(LOG_ERR,
+-				       "set context %s->%s failed:'%s'\n",
+-				       filename, scontext, strerror(errno));
++				if (errno != EOPNOTSUPP) 
++					syslog(LOG_ERR,
++					       "set context %s->%s failed:'%s'\n",
++					       filename, scontext, strerror(errno));
+ 				if (retcontext >= 0)
+ 					free(prev_context);
+ 				free(scontext);
+@@ -225,8 +226,9 @@
+ 		if (retcontext >= 0)
+ 			free(prev_context);
+ 	} else {
+-		syslog(LOG_ERR, "get context on %s failed: '%s'\n",
+-		       filename, strerror(errno));
++		if (errno != EOPNOTSUPP) 
++			syslog(LOG_ERR, "get context on %s failed: '%s'\n",
++			       filename, strerror(errno));
+ 	}
+ 	free(scontext);
+ 	close(fd);
 diff --exclude-from=exclude --exclude=sepolgen-1.0.12 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.52/semanage/semanage
 --- nsapolicycoreutils/semanage/semanage	2008-07-02 17:19:15.000000000 -0400
 +++ policycoreutils-2.0.52/semanage/semanage	2008-07-09 08:44:58.000000000 -0400