pop

diff --git a/meta b/meta
index c6e898a20d6f0b3fb687a3a2f6410b109701bd9a..c3d9e793eb16e4785494d5802f3bf0a9660a15ef 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 39b1b528b2c28db4b9372b07b6b44e5cd08f9942
-Head: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
+Previous: 8042db7c30f7b006af6145993c5031c2805846cc
+Head: 810924b05f1448e9da2916d16c71a44996ade3dc
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
+  dup2: 810924b05f1448e9da2916d16c71a44996ade3dc
 Unapplied:
-  dup2: bb9d29b2fc3c8906fcc7a0b205e9130a60fc16f2
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dup2 b/patches/dup2
index c0210201045d49d5501ff1c1fb03be5a164c3e10..14dfc41475e6fbd72bda9a3f59cb33a114043de0 100644 (file)
--- a/patches/dup2
+++ b/patches/dup2
@@ -1,5 +1,5 @@
-Bottom: d24dd0fae6823a86b3a40de76ff29ff00831ae09
-Top:    5770132465e02e074374c2198a8f7ee3aad036ea
+Bottom: c4f9e56fde30641b69e81060e3981b0df33f49c2
+Top:    6c3a4d4cc0146d11acbd41ec30ac983f004e11c7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-30 16:06:32 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..e230a56 100644
+index a680143..4b891a1 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -886,3 +886,10 @@ int fcntl(int socket, int cmd, ... /* arg */)