refresh

diff --git a/meta b/meta
index cebd929dff26041616adf977385cde37432a7605..0760ad3d039c2c7e2029ecbeb0532d6b9d48d7d3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: d00ed0f7ec9b97c3d974e97c491c40a5cb7ca980
-Head: a50b77aea40f01272cef0079b1dd8e850f2e39e8
+Previous: e0739f6100bfa98c7a770a74de8a08c0ac4cd3d2
+Head: bb9d29b2fc3c8906fcc7a0b205e9130a60fc16f2
 Applied:
   rs-ftp: 772f3c0addc0837fffce837760caef3dce59bce1
   check-id: f997b1b02f5e4d46a8571b9c1601c6929ebcd808
   fast-disc: b8f3b02178571b9db3f31520c49b85c0fdc4bf65
-  dup2: 20b2e72636f0be4b86e642a7cabda39252dc2c99
-  refresh-temp: a50b77aea40f01272cef0079b1dd8e850f2e39e8
+  dup2: bb9d29b2fc3c8906fcc7a0b205e9130a60fc16f2
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dup2 b/patches/dup2
index c3c9e3b248006ea9cd5f3b88f8e4ecf4559fe079..c0210201045d49d5501ff1c1fb03be5a164c3e10 100644 (file)
--- a/patches/dup2
+++ b/patches/dup2
@@ -1,5 +1,5 @@
 Bottom: d24dd0fae6823a86b3a40de76ff29ff00831ae09
-Top:    d24dd0fae6823a86b3a40de76ff29ff00831ae09
+Top:    5770132465e02e074374c2198a8f7ee3aad036ea
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-30 16:06:32 -0700
 
@@ -13,4 +13,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 52eaf1a..e230a56 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -886,3 +886,10 @@ int fcntl(int socket, int cmd, ... /* arg */)
+       va_end(args);
+       return ret;
+ }
++
++int dup2(int oldfd, int newfd)
++{
++      int fd;
++      return (fd_get(oldfd, &fd) == fd_rsocket) ?
++              : dup2(oldfd, newfd);
++}

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9c3928e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: d24dd0fae6823a86b3a40de76ff29ff00831ae09
-Top:    5770132465e02e074374c2198a8f7ee3aad036ea
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-01 14:14:07 -0700
-
-Refresh of dup2
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..e230a56 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -886,3 +886,10 @@ int fcntl(int socket, int cmd, ... /* arg */)
-       va_end(args);
-       return ret;
- }
-+
-+int dup2(int oldfd, int newfd)
-+{
-+      int fd;
-+      return (fd_get(oldfd, &fd) == fd_rsocket) ?
-+              : dup2(oldfd, newfd);
-+}