rpms/libsemanage/FC-5 libsemanage-rhat.patch, 1.11, 1.12 libsemanage.spec, 1.79, 1.80

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3554

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
- Fix leaky descriptor


libsemanage-rhat.patch:
 semanage_store.c |    2 ++
 1 files changed, 2 insertions(+)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage-rhat.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsemanage-rhat.patch	20 Mar 2006 20:41:19 -0000	1.11
+++ libsemanage-rhat.patch	4 Apr 2006 09:16:42 -0000	1.12
@@ -1,11 +1,12 @@
---- libsemanage-1.5.28/src/Makefile~	2006-02-17 14:45:52.000000000 -0500
-+++ libsemanage-1.5.28/src/Makefile	2006-03-17 08:44:29.000000000 -0500
-@@ -3,7 +3,7 @@
- LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
--PYLIBVER ?= python2.4
-+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
- PYINC ?= /usr/include/${PYLIBVER}
- PYLIBDIR ?= $(LIBDIR)/${PYLIBVER}
- 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.2/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2006-03-10 09:48:01.000000000 -0500
++++ libsemanage-1.6.2/src/semanage_store.c	2006-04-03 18:58:56.000000000 -0400
+@@ -1159,6 +1159,8 @@
+ 		ERR(sh, "Could not open direct %s at %s.", lock_name, lock_file);
+ 		return -1;
+ 	}
++	fcntl(fd, F_SETFD, FD_CLOEXEC);
++
+ 	if (sh->timeout == 0) {
+ 		/* return immediately */
+ 		origtime.tv_sec = 0;


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- libsemanage.spec	22 Mar 2006 16:50:55 -0000	1.79
+++ libsemanage.spec	4 Apr 2006 09:16:42 -0000	1.80
@@ -1,9 +1,9 @@
-%define libsepolver 1.12-1
+%define libsepolver 1.12.4-1
 %define libselinuxver 1.30-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.6
-Release: 1.fc5
+Version: 1.6.2
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -44,7 +44,7 @@
 
 %build
 make clean
-make CFLAGS="%{optflags}" all pywrap
+make CFLAGS="%{optflags}" LIBDIR="%{_libdir}" SHLIBDIR="%{_lib}" all pywrap
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -74,6 +74,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 4 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2.fc5
+- Fix leaky descriptor
+
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
+- Fix leaky descriptor
+
+* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-1
+- Upgrade to latest from NSA
+	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
+	* Merged man page reorganization from Ivan Gyurdiev.
+
 * Mon Mar 18 2006 Dan Walsh <dwalsh at redhat.com> - 1.6-1.fc5
 - Rebuild for FC5
 
@@ -345,7 +356,7 @@
 	* Merged interface parse/print, context_to_string interface change,
 	  move assert_noeof, and order preserving patches from Ivan Gyurdiev.
         * Added src/dso.h in preparation for other changes.
-	* Merged install seusers, handle/error messages, MLS parsing,
+p	* Merged install seusers, handle/error messages, MLS parsing,
 	  and seusers validation patches from Ivan Gyurdiev.
 
 * Mon Oct 31 2005 Dan Walsh <dwalsh at redhat.com> 1.3.39-1