rpms/libselinux/devel libselinux-rhat.patch, 1.150, 1.151 libselinux.spec, 1.320, 1.321

[Daniel J Walsh (dwalsh)]

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Mar 13 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.59-2
- Fix matchpathcon memory leak


libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- libselinux-rhat.patch	28 Feb 2008 21:06:47 -0000	1.150
+++ libselinux-rhat.patch	13 Mar 2008 23:45:19 -0000	1.151
@@ -1,6 +1,26 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.57/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/label.c libselinux-2.0.59/src/label.c
+--- nsalibselinux/src/label.c	2007-07-16 14:20:46.000000000 -0400
++++ libselinux-2.0.59/src/label.c	2008-03-13 19:40:24.000000000 -0400
+@@ -95,7 +95,7 @@
+ 	if (compat_validate(rec, lr, "file_contexts", 0))
+ 		return NULL;
+ 
+-	if (translating &&
++	if (translating && (! lr->ctx_trans) &&
+ 	    selinux_raw_to_trans_context(lr->ctx_raw, &lr->ctx_trans))
+ 		return NULL;
+ 
+@@ -131,6 +131,7 @@
+ void selabel_close(struct selabel_handle *rec)
+ {
+ 	rec->func_close(rec);
++	free(rec->data);
+ 	free(rec);
+ }
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.59/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-28 09:48:58.000000000 -0400
-+++ libselinux-2.0.57/src/matchpathcon.c	2008-02-28 14:33:51.000000000 -0500
++++ libselinux-2.0.59/src/matchpathcon.c	2008-03-13 19:23:39.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- libselinux.spec	29 Feb 2008 20:24:11 -0000	1.320
+++ libselinux.spec	13 Mar 2008 23:45:19 -0000	1.321
@@ -4,7 +4,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.59
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -137,6 +137,9 @@
 %{python_sitearch}/selinux/*
 
 %changelog
+* Thu Mar 13 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.59-2
+- Fix matchpathcon memory leak
+
 * Fri Feb 29 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.59-1
 - Update to Upstream
 	* Merged new X label "poly_selection" namespace from Eamon Walsh.