rpms/libselinux/devel libselinux-rhat.patch, 1.177, 1.178 libselinux.spec, 1.351, 1.352

[Daniel J Walsh]

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Tue Dec 16 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.76-6
- Strip trailing / for matchpathcon


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- libselinux-rhat.patch	16 Dec 2008 14:38:48 -0000	1.177
+++ libselinux-rhat.patch	19 Dec 2008 20:17:53 -0000	1.178
@@ -3078,3 +3078,18 @@
 -	return 0;
 +	return ret >= 0;
  }
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.76/utils/matchpathcon.c
+--- nsalibselinux/utils/matchpathcon.c	2008-10-28 10:06:51.000000000 -0400
++++ libselinux-2.0.76/utils/matchpathcon.c	2008-12-19 15:14:20.000000000 -0500
+@@ -101,6 +101,11 @@
+ 	for (i = optind; i < argc; i++) {
+ 		int mode = 0;
+ 		struct stat buf;
++		int len = strlen(argv[i]);
++		if (len > 1  && argv[i][len - 1 ] == '/') {
++			argv[i][len - 1 ] = '\0';
++		}
++
+ 		if (lstat(argv[i], &buf) == 0)
+ 			mode = buf.st_mode;
+ 


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- libselinux.spec	16 Dec 2008 14:38:49 -0000	1.351
+++ libselinux.spec	19 Dec 2008 20:17:53 -0000	1.352
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.76
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -163,6 +163,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Dec 16 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.76-6
+- Strip trailing / for matchpathcon
+
 * Tue Dec 16 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.76-5
 - Fix segfault if seusers file does not work