rpms/xen/devel xen-3.0.1-cloexec.patch, 1.2, 1.3 xen.spec, 1.106, 1.107

[fedora-cvs-commits at redhat.com]

Author: veillard

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22197

Modified Files:
	xen-3.0.1-cloexec.patch xen.spec 
Log Message:
Incorporating fix from #188361, Daniel


xen-3.0.1-cloexec.patch:
 tools/python/xen/xend/XendCheckpoint.py             |    4 ++++
 xen-3.0.1/tools/libxc/xc_misc.c                     |   11 ++++++++++-
 xen-3.0.1/tools/python/xen/xend/server/SrvDaemon.py |    9 ++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

Index: xen-3.0.1-cloexec.patch
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen-3.0.1-cloexec.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-3.0.1-cloexec.patch	7 Mar 2006 22:09:42 -0000	1.2
+++ xen-3.0.1-cloexec.patch	18 Apr 2006 14:23:19 -0000	1.3
@@ -49,3 +49,23 @@
      return fd;
  }
  
+--- xen-3.0.1/tools/python/xen/xend/XendCheckpoint.py	2006-03-01 17:38:59.000000000 -0500
++++ xen-3.0.1-save/tools/python/xen/xend/XendCheckpoint.py	2006-04-07 12:38:03.000000000 -0400
+@@ -22,6 +22,7 @@
+ from XendError import XendError
+ from XendLogging import log
+ 
++import fcntl
+ 
+ SIGNATURE = "LinuxGuestRecord"
+ XC_SAVE = "xc_save"
+@@ -181,6 +182,9 @@
+ 
+ 
+ def forkHelper(cmd, fd, inputHandler, closeToChild):
++    fcntl.fcntl(fd,          fcntl.F_SETFD,0)
++    fcntl.fcntl(xc.handle(), fcntl.F_SETFD,0)
++
+     child = xPopen3(cmd, True, -1, [fd, xc.handle()])
+ 
+     if closeToChild:


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- xen.spec	9 Mar 2006 05:15:37 -0000	1.106
+++ xen.spec	18 Apr 2006 14:23:19 -0000	1.107
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.1
-Release: 4
+Release: 5
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -165,6 +165,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Apr 18 2006 Daniel Veillard <veillard at redhat.com> - 3.0.1-5
+- augment the close on exec patch with the fix for #188361
+
 * Thu Mar  9 2006 Jeremy Katz <katzj at redhat.com> - 3.0.1-4
 - add udev rule so that /dev/xen/evtchn gets created properly
 - make pygrub not use /tmp for SELinux