- Pull in upstream patch to fix pclose checking (testing as possible fix

for RHBZ#507066).
This commit is contained in:
Richard W.M. Jones 2009-06-20 13:58:55 +00:00
parent ffe9c960ed
commit 87afda4422
2 changed files with 26 additions and 2 deletions

17
guestfs-daemon-find.patch Normal file
View File

@ -0,0 +1,17 @@
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);

View File

@ -4,13 +4,16 @@
Summary: Access and modify virtual machine disk images Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Version: 1.0.49 Version: 1.0.49
Release: 3%{?dist} Release: 4%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://libguestfs.org/ URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Upstream: 3c5b447efd42b03c24104bdc1f3260e879bb1d25
Patch0: guestfs-daemon-find.patch
# Basic build requirements: # Basic build requirements:
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text BuildRequires: /usr/bin/pod2text
@ -249,6 +252,8 @@ Requires: jpackage-utils
%prep %prep
%setup -q %setup -q
%patch0 -p1
mkdir -p daemon/m4 mkdir -p daemon/m4
# Rerun the generator to make sure all files are up to date. # Rerun the generator to make sure all files are up to date.
@ -493,8 +498,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Jun 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-3 * Sat Jun 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-4
- Remove workaround for RHBZ#507007, since bug is now fixed. - 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@redhat.com> - 1.0.49-2 * Fri Jun 19 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-2
- New upstream release 1.0.49. - New upstream release 1.0.49.