summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-01-20 00:47:29 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-01-20 00:47:29 +0000
commit3f2d5923bd90443679e70ac7088310eccac35d81 (patch)
tree1dfaed05c8896c716be3735ded903138aaf68574 /sys-apps/diffutils/files
parentadded mbox and maildir to IUSE (diff)
downloadhistorical-3f2d5923bd90443679e70ac7088310eccac35d81.tar.gz
historical-3f2d5923bd90443679e70ac7088310eccac35d81.tar.bz2
historical-3f2d5923bd90443679e70ac7088310eccac35d81.zip
bug #11728; do not waitpid in sdiff in pipe
Diffstat (limited to 'sys-apps/diffutils/files')
-rw-r--r--sys-apps/diffutils/files/diffutils-2.8.4-sdiff-no-waitpid.patch23
-rw-r--r--sys-apps/diffutils/files/digest-diffutils-2.8.4-r21
2 files changed, 24 insertions, 0 deletions
diff --git a/sys-apps/diffutils/files/diffutils-2.8.4-sdiff-no-waitpid.patch b/sys-apps/diffutils/files/diffutils-2.8.4-sdiff-no-waitpid.patch
new file mode 100644
index 000000000000..a41b11648d64
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-2.8.4-sdiff-no-waitpid.patch
@@ -0,0 +1,23 @@
+--- diffutils-2.8.4/src/sdiff.c.orig 2002-06-17 00:55:42.000000000 -0500
++++ diffutils-2.8.4/src/sdiff.c 2003-01-08 03:04:02.000000000 -0600
+@@ -692,7 +692,7 @@
+ ck_fclose (out);
+
+ {
+- int wstatus;
++ int wstatus = 0;
+ int werrno = 0;
+
+ #if ! (HAVE_WORKING_FORK || HAVE_WORKING_VFORK)
+@@ -701,11 +701,6 @@
+ werrno = errno;
+ #else
+ ck_fclose (diffout);
+- while (waitpid (diffpid, &wstatus, 0) < 0)
+- if (errno == EINTR)
+- checksigs ();
+- else
+- perror_fatal ("waitpid");
+ diffpid = 0;
+ #endif
+
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.4-r2 b/sys-apps/diffutils/files/digest-diffutils-2.8.4-r2
new file mode 100644
index 000000000000..ab1523b47820
--- /dev/null
+++ b/sys-apps/diffutils/files/digest-diffutils-2.8.4-r2
@@ -0,0 +1 @@
+MD5 a9c028579abc79ecd6842d60a13abf1d diffutils-2.8.4.tar.gz 828766