rpms/libselinux/devel libselinux-rhat.patch,1.202,1.203

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23760

Modified Files:
	libselinux-rhat.patch 
Log Message:
* Mon Jan 18 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-3
- Fix man page for selinuxdefcon


libselinux-rhat.patch:
 man/man8/selinuxconlist.8 |   18 ++++++++++++++++++
 man/man8/selinuxdefcon.8  |   24 ++++++++++++++++++++++++
 src/callbacks.c           |    1 +
 src/init.c                |    4 +++-
 src/label_file.c          |    3 +++
 src/matchpathcon.c        |    3 ++-
 6 files changed, 51 insertions(+), 2 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- libselinux-rhat.patch	18 Jan 2010 21:44:50 -0000	1.202
+++ libselinux-rhat.patch	18 Jan 2010 21:59:45 -0000	1.203
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.90/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.90/man/man8/selinuxconlist.8	2010-01-04 17:14:21.000000000 -0500
++++ libselinux-2.0.90/man/man8/selinuxconlist.8	2010-01-18 16:52:28.000000000 -0500
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -22,7 +22,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +secon(8), selinuxdefcon(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.90/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.90/man/man8/selinuxdefcon.8	2010-01-18 11:06:24.000000000 -0500
++++ libselinux-2.0.90/man/man8/selinuxdefcon.8	2010-01-18 16:52:28.000000000 -0500
 @@ -0,0 +1,24 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -50,7 +50,7 @@ diff --exclude-from=exclude -N -u -r nsa
 +secon(8), selinuxconlist(8)
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.90/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2009-04-08 09:06:23.000000000 -0400
-+++ libselinux-2.0.90/src/callbacks.c	2010-01-04 17:14:21.000000000 -0500
++++ libselinux-2.0.90/src/callbacks.c	2010-01-18 16:52:28.000000000 -0500
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -61,7 +61,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	va_end(ap);
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/src/init.c
 --- nsalibselinux/src/init.c	2009-07-14 11:16:03.000000000 -0400
-+++ libselinux-2.0.90/src/init.c	2010-01-15 11:25:24.000000000 -0500
++++ libselinux-2.0.90/src/init.c	2010-01-18 16:52:28.000000000 -0500
 @@ -59,8 +59,10 @@
  	}
  	fclose(fp);
@@ -74,9 +74,22 @@ diff --exclude-from=exclude -N -u -r nsa
  
  	/* At this point, the usual spot doesn't have an selinuxfs so
  	 * we look around for it */
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/label_file.c libselinux-2.0.90/src/label_file.c
+--- nsalibselinux/src/label_file.c	2009-05-18 13:53:14.000000000 -0400
++++ libselinux-2.0.90/src/label_file.c	2010-01-18 16:53:54.000000000 -0500
+@@ -20,6 +20,9 @@
+ #include "callbacks.h"
+ #include "label_internal.h"
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ /*
+  * Internals, mostly moved over from matchpathcon.c
+  */
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.90/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.90/src/matchpathcon.c	2010-01-04 17:14:21.000000000 -0500
++++ libselinux-2.0.90/src/matchpathcon.c	2010-01-18 16:52:28.000000000 -0500
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>