rpms/hal/F-9 hal-cloexec.patch,NONE,1.1 hal.spec,1.157,1.158

[Richard Hughes (rhughes)]

Author: rhughes

Update of /cvs/pkgs/rpms/hal/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15176

Modified Files:
	hal.spec 
Added Files:
	hal-cloexec.patch 
Log Message:
* Thu Jun 12 2008 Richard Hughes <rhughes at redhat.com> - 0.5.11-2
- Fix unmounting of USB drives when using SELinux due to a leaking file
  descriptor (#447195)


hal-cloexec.patch:

--- NEW FILE hal-cloexec.patch ---
diff -up hal-0.5.11/tools/hal-storage-shared.c~ hal-0.5.11/tools/hal-storage-shared.c
--- hal-0.5.11/tools/hal-storage-shared.c~	2008-05-07 19:24:24.000000000 -0400
+++ hal-0.5.11/tools/hal-storage-shared.c	2008-05-20 09:20:06.000000000 -0400
@@ -706,6 +706,8 @@ lock_hal_mtab (void)
 	if (lock_mtab_fd < 0)
 		return FALSE;
 
+	fcntl(lock_mtab_fd, F_SETFD, FD_CLOEXEC);
+
 tryagain:
 #if sun
 	if (lockf (lock_mtab_fd, F_LOCK, 0) != 0) {


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/F-9/hal.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- hal.spec	9 May 2008 20:08:38 -0000	1.157
+++ hal.spec	12 Jun 2008 14:37:34 -0000	1.158
@@ -26,11 +26,12 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch1: hal-0.5.10-set-property-direct.patch
 Patch2: hal-change-priority.patch
+Patch3: hal-cloexec.patch
 License: AFL or GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -126,6 +127,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .direct
 %patch2 -p1 -b .priority
+%patch3 -p1 -b .selinux-leak
 
 %build
 autoreconf
@@ -270,6 +272,10 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Thu Jun 12 2008 Richard Hughes <rhughes at redhat.com> - 0.5.11-2
+- Fix unmounting of USB drives when using SELinux due to a leaking file
+  descriptor (#447195)
+
 * Fri May 09 2008 Richard Hughes <rhughes at redhat.com> - 0.5.11-1
 - Update to latest upstream release