rpms/libselinux/devel .cvsignore, 1.155, 1.156 libselinux-rhat.patch, 1.134, 1.135 libselinux.spec, 1.294, 1.295 sources, 1.157, 1.158

[Daniel J Walsh (dwalsh)]

Author: dwalsh

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

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Fri Nov 30 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.46-1
- Upgrade to upstream
	* matchpathcon(8) man page update from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- .cvsignore	30 Nov 2007 20:13:08 -0000	1.155
+++ .cvsignore	11 Dec 2007 02:50:12 -0000	1.156
@@ -136,3 +136,4 @@
 libselinux-2.0.42.tgz
 libselinux-2.0.43.tgz
 libselinux-2.0.45.tgz
+libselinux-2.0.46.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- libselinux-rhat.patch	30 Nov 2007 20:13:08 -0000	1.134
+++ libselinux-rhat.patch	11 Dec 2007 02:50:12 -0000	1.135
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.42/include/selinux/av_permissions.h
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.45/include/selinux/av_permissions.h
 --- nsalibselinux/include/selinux/av_permissions.h	2007-11-15 15:52:46.000000000 -0500
-+++ libselinux-2.0.42/include/selinux/av_permissions.h	2007-11-15 16:30:48.000000000 -0500
++++ libselinux-2.0.45/include/selinux/av_permissions.h	2007-11-30 17:27:14.000000000 -0500
 @@ -900,6 +900,8 @@
  #define PACKET__SEND                              0x00000001UL
  #define PACKET__RECV                              0x00000002UL
@@ -10,9 +10,26 @@
  #define KEY__VIEW                                 0x00000001UL
  #define KEY__READ                                 0x00000002UL
  #define KEY__WRITE                                0x00000004UL
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.42/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-2.0.45/man/man8/matchpathcon.8
+--- nsalibselinux/man/man8/matchpathcon.8	2007-08-03 16:02:56.000000000 -0400
++++ libselinux-2.0.45/man/man8/matchpathcon.8	2007-12-06 11:22:40.000000000 -0500
+@@ -6,7 +6,12 @@
+ .B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath...
+ .SH "DESCRIPTION"
+ .B matchpathcon
+-Prints the file path and the default security context associated with it.
++Queries the system and prints the default security context associated with the filepath.
++
++Note: Identical paths can have different security contexts, depending on the file type. (regular file, directory, link file, char file ...)
++
++matchpathcon will check the system default context using the file type if the file exists.  If the file does not exist, it will get the context of a regular file.
++
+ .SH OPTIONS
+ .B \-n
+ Do not display path.
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.45/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-28 09:48:58.000000000 -0400
-+++ libselinux-2.0.42/src/matchpathcon.c	2007-11-15 15:08:23.000000000 -0500
++++ libselinux-2.0.45/src/matchpathcon.c	2007-11-30 17:27:14.000000000 -0500
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -30,9 +47,9 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.42/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.45/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2007-07-16 14:20:45.000000000 -0400
-+++ libselinux-2.0.42/utils/matchpathcon.c	2007-11-15 15:08:23.000000000 -0500
++++ libselinux-2.0.45/utils/matchpathcon.c	2007-11-30 17:27:14.000000000 -0500
 @@ -17,10 +17,24 @@
  	exit(1);
  }


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- libselinux.spec	30 Nov 2007 20:13:08 -0000	1.294
+++ libselinux.spec	11 Dec 2007 02:50:12 -0000	1.295
@@ -1,7 +1,7 @@
 %define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.45
+Version: 2.0.46
 Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
@@ -123,6 +123,10 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Fri Nov 30 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.46-1
+- Upgrade to upstream
+	* matchpathcon(8) man page update from Dan Walsh.
+
 * Fri Nov 30 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.45-1
 - Upgrade to upstream
 	* dlopen libsepol.so.1 rather than libsepol.so from Stephen Smalley.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- sources	30 Nov 2007 20:13:08 -0000	1.157
+++ sources	11 Dec 2007 02:50:12 -0000	1.158
@@ -1 +1 @@
-a728752820841a8cb4e9e5a8a1d582cd  libselinux-2.0.45.tgz
+e5889fd624a0b8af73e02f175c171560  libselinux-2.0.46.tgz