rpms/libsemanage/devel libsemanage-rhat.patch, 1.11, 1.12 libsemanage.spec, 1.80, 1.81

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- 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/devel/libsemanage-rhat.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsemanage-rhat.patch	17 Mar 2006 20:25:31 -0000	1.11
+++ libsemanage-rhat.patch	3 Apr 2006 20:49:58 -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-03-29 14:20:16.000000000 -0500
+@@ -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/devel/libsemanage.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- libsemanage.spec	21 Mar 2006 15:45:58 -0000	1.80
+++ libsemanage.spec	3 Apr 2006 20:49:58 -0000	1.81
@@ -3,10 +3,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.6.2
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
+Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -72,7 +74,10 @@
 %{_mandir}/man3/*
 
 %changelog
-* Tue Mar 21 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2
+* 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.