refresh

diff --git a/meta b/meta
index 12b9afb0508270862b324b2d7772308245e06743..b2f3d833c55f21cb095dffcf4489db66645877ab 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 87cd29ee4b9b553d00fd230e54d8c1f5b1376e77
-Head: 07f5b736cf516a6169331df30d9dce9f5fb17a1d
+Previous: 94fd8c9f63cd57e5a2a717829fdba72659bee226
+Head: 3524c878f537ef2c57f973fad54b1204c299026d
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
-  dup2: 145e9c03553f4d2a6f4b6217435fb22147f8e57e
-  refresh-temp: 07f5b736cf516a6169331df30d9dce9f5fb17a1d
+  dup2: 3524c878f537ef2c57f973fad54b1204c299026d
 Unapplied:
   addrinfo-af-ib: 3346f04fb2cdbd6d05ab848d9ea6ad67d511157e
   addrtype: 066c2615bf5399848088a9771093a76c5e205bf1

diff --git a/patches/dup2 b/patches/dup2
index 65cb3b81dfd439076e23bd54c1c8d8b9f1d11e74..3d28953a5167d5a85f36318fa02a4f5a4a815237 100644 (file)
--- a/patches/dup2
+++ b/patches/dup2
@@ -5,6 +5,12 @@ Date:   2012-09-07 10:20:53 -0700
 
 rspreload: Fix state checks in dup2
 
+The patch to add dup2 support was never updated to handle the fd
+state.  The check for the fd type == fd_fork is no longer valid.
+We need to instead check the fd state before handling forking.
+
+Problem pointed out by Alex Couvrard <acouvrard@gmail.com>
+
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 35a2a96..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 79d073d6c2d4883bac75c2245a0da053def1f1d6
-Top:    79d073d6c2d4883bac75c2245a0da053def1f1d6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-07 10:28:12 -0700
-
-Refresh of dup2
-
----
-
-