rpms/libguestfs/devel guestfs-daemon-find.patch, NONE, 1.1 libguestfs.spec, 1.55, 1.56

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7115

Modified Files:
	libguestfs.spec 
Added Files:
	guestfs-daemon-find.patch 
Log Message:
- Pull in upstream patch to fix pclose checking
  (testing as possible fix for RHBZ#507066).


guestfs-daemon-find.patch:

--- NEW FILE guestfs-daemon-find.patch ---
diff --git a/daemon/find.c b/daemon/find.c
index a873bca..287aae3 100644
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -113,7 +113,11 @@ do_find (char *dir)
       return NULL;
     }
   }
-  pclose (fp);
+  if (pclose (fp) == -1) {
+    reply_with_perror ("pclose: find");
+    free_stringslen (res, size);
+    return NULL;
+  }
 
   if (r == -1) {
     free_stringslen (res, size);


Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/devel/libguestfs.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libguestfs.spec	20 Jun 2009 12:45:40 -0000	1.55
+++ libguestfs.spec	20 Jun 2009 13:58:55 -0000	1.56
@@ -4,13 +4,16 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Version:     1.0.49
-Release:     3%{?dist}
+Release:     4%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# Upstream: 3c5b447efd42b03c24104bdc1f3260e879bb1d25
+Patch0:      guestfs-daemon-find.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -249,6 +252,8 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+%patch0 -p1
+
 mkdir -p daemon/m4
 
 # Rerun the generator to make sure all files are up to date.
@@ -493,8 +498,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jun 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.49-3
+* Sat Jun 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.49-4
 - Remove workaround for RHBZ#507007, since bug is now fixed.
+- Pull in upstream patch to fix pclose checking
+  (testing as possible fix for RHBZ#507066).
 
 * Fri Jun 19 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.49-2
 - New upstream release 1.0.49.