pop

diff --git a/meta b/meta
index f15b312e7fb5a90d8c47ec3507676bf43f577ef3..41fc42f5e0f2cb933452356cff564a9956654cbc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: ef3c5f144ffdf1b268ad8a352ec9a387b3a473f5
-Head: ca5813e7cf95dee5933fc417e4a34d26f2b01824
+Previous: 00a676a077c915c9aae1b94e6910f14f95b6cfa9
+Head: dcd994c9e3d610f447e676429a394a496b83a2d6
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
+  fstat: dcd994c9e3d610f447e676429a394a496b83a2d6
 Unapplied:
-  fstat: b3146de2e39672cc98915604e2bc94dd98312356
   dbg-out: 332b5e4db811019600b165f03de1cd0326c94952
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/fstat b/patches/fstat
index 7a5670501511879bd1997b0a4c329463bc7b61bc..f88283c8be2cbf791befc688b47bd55236ac8c02 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
-Bottom: fdd492cdb13406bafcf14c37b554b2de76a99d5b
-Top:    799d9bfcd5b6545c40e5e19c7b50907bd25ed616
+Bottom: 7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
+Top:    7bf18695fef78ce1cf020b98bda96e2687917519
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -13,7 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 085e8b4..749857e 100644
+index b18d310..33eb9a3 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -84,6 +84,7 @@ struct socket_calls {
@@ -32,7 +32,7 @@ index 085e8b4..749857e 100644
  
        rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
        rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -960,3 +962,17 @@ int dup2(int oldfd, int newfd)
+@@ -961,3 +963,17 @@ int dup2(int oldfd, int newfd)
        atomic_inc(&oldfdi->refcnt);
        return newfd;
  }