From 1f46a5f18ff58e7956037b6afb9c2ae334d390bc Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Jan 04 2010 22:17:33 +0000
Subject: Mon Jam 4 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.90-2

- Free memory on disabled selinux boxes

---

diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 72c90e6..0720183 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -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@redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -20,9 +20,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 lib
 +
 +.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@redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -48,9 +48,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libs
 +
 +.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 nsalibselinux/src/callbacks.c libselinux-2.
  	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>
diff --git a/libselinux.spec b/libselinux.spec
index 6f5f363..84bb883 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -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@redhat.com> - 2.0.90-2
+- Free memory on disabled selinux boxes
+
 * Tue Dec 1 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.90-1
 - Update to upstream 
 	* add/reformat man pages by Guido Trentalancia <guido@trentalancia.com>.