rpms/libselinux/devel libselinux-rhat.patch, 1.200, 1.201 libselinux.spec, 1.383, 1.384

[Daniel J Walsh]

Author: dwalsh

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

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Mon Jam 4 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-2
- Free memory on disabled selinux boxes


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

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- libselinux-rhat.patch	23 Nov 2009 18:32:48 -0000	1.200
+++ libselinux-rhat.patch	4 Jan 2010 22:17:31 -0000	1.201
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.89/man/man8/selinuxconlist.8
+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.89/man/man8/selinuxconlist.8	2009-11-23 13:26:01.000000000 -0500
++++ libselinux-2.0.90/man/man8/selinuxconlist.8	2010-01-04 17:14:21.000000000 -0500
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -20,9 +20,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.89/man/man8/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.89/man/man8/selinuxdefcon.8	2009-11-23 13:30:18.000000000 -0500
++++ libselinux-2.0.90/man/man8/selinuxdefcon.8	2010-01-04 17:14:21.000000000 -0500
 @@ -0,0 +1,24 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -48,9 +48,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.89/src/callbacks.c
+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.89/src/callbacks.c	2009-11-23 13:26:01.000000000 -0500
++++ libselinux-2.0.90/src/callbacks.c	2010-01-04 17:14:21.000000000 -0500
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -59,9 +59,24 @@ diff --exclude-from=exclude -N -u -r nsa
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.89/src/matchpathcon.c
+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-04 17:14:56.000000000 -0500
+@@ -59,8 +59,10 @@
+ 	}
+ 	fclose(fp);
+ 
+-	if (!exists)
++	if (!exists) {
++		free(buf);
+ 		return;
++	}
+ 
+ 	/* 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/matchpathcon.c libselinux-2.0.90/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.89/src/matchpathcon.c	2009-11-23 13:26:01.000000000 -0500
++++ libselinux-2.0.90/src/matchpathcon.c	2010-01-04 17:14:21.000000000 -0500
 @@ -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.383
retrieving revision 1.384
diff -u -p -r1.383 -r1.384
--- libselinux.spec	1 Dec 2009 21:18:45 -0000	1.383
+++ libselinux.spec	4 Jan 2010 22:17:33 -0000	1.384
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -166,6 +166,9 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Mon Jam 4 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-2
+- Free memory on disabled selinux boxes
+
 * Tue Dec 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.90-1
 - Update to upstream 
 	* add/reformat man pages by Guido Trentalancia <guido at trentalancia.com>.