From b131c8649adf97c01170ca4095b3312abfbf6557 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Jun 22 2009 09:09:14 +0000
Subject: Removed patches which are now upstream.


---

diff --git a/guestfs-daemon-find.patch b/guestfs-daemon-find.patch
deleted file mode 100644
index 9c1e00e..0000000
--- a/guestfs-daemon-find.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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);
diff --git a/guestfs-daemon-waitpid.patch b/guestfs-daemon-waitpid.patch
deleted file mode 100644
index 5ea9e7e..0000000
--- a/guestfs-daemon-waitpid.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
-index 2e83b9f..030aabe 100644
---- a/daemon/guestfsd.c
-+++ b/daemon/guestfsd.c
-@@ -453,7 +453,8 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv)
- {
-   int so_size = 0, se_size = 0;
-   int so_fd[2], se_fd[2];
--  int pid, r, quit, i;
-+  pid_t pid;
-+  int r, quit, i;
-   fd_set rset, rset2;
-   char buf[256];
-   char *p;
-@@ -589,7 +590,10 @@ commandrv (char **stdoutput, char **stderror, char * const* const argv)
-   }
- 
-   /* Get the exit status of the command. */
--  waitpid (pid, &r, 0);
-+  if (waitpid (pid, &r, 0) != pid) {
-+    perror ("waitpid");
-+    return -1;
-+  }
- 
-   if (WIFEXITED (r)) {
-     return WEXITSTATUS (r);
diff --git a/libguestfs.spec b/libguestfs.spec
index a7f8d82..2bf477c 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -11,11 +11,6 @@ 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
-# Upstream: 6654f617a6f720baa8f1ced89179e11679353d1e
-Patch1:      guestfs-daemon-waitpid.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -254,9 +249,6 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-
 mkdir -p daemon/m4
 
 # Rerun the generator to make sure all files are up to date.
@@ -503,6 +495,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Jun 22 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.50-1
 - New upstream release 1.0.50.
+- Removed patches which are now upstream.
 
 * Sat Jun 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.49-5
 - Remove workaround for RHBZ#507007, since bug is now fixed.