refresh

diff --git a/meta b/meta
index 12e3bdce175596a994c2d6ec50344e0dbb2b009b..164df9dad95a84a4d38c3851b904290f7c6547bf 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: c3be4dcdb5881c430dc68276d30a823205fe8589
-Head: 735dbe6d45e931746453cfc42cb7ee12f467fab1
+Previous: 2bc20db2f6907e5afcd1e9f173ddb2366578181d
+Head: b3146de2e39672cc98915604e2bc94dd98312356
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
-  fstat: 05f560a29b84296921b236dcd1fb65b73b6e6280
-  refresh-temp: 735dbe6d45e931746453cfc42cb7ee12f467fab1
+  fstat: b3146de2e39672cc98915604e2bc94dd98312356
 Unapplied:
   dbg-out: 0771c59dbf02c9c6170f8fb47c7d656e5e850006
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/fstat b/patches/fstat
index abb094ecacdf5df9da5d11689ccaf17c3964f2a0..7a5670501511879bd1997b0a4c329463bc7b61bc 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: fdd492cdb13406bafcf14c37b554b2de76a99d5b
-Top:    a70e486d7fb3d18adace33aea325353d847f6b41
+Top:    799d9bfcd5b6545c40e5e19c7b50907bd25ed616
 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..b9c32e6 100644
+index 085e8b4..749857e 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -84,6 +84,7 @@ struct socket_calls {
@@ -44,7 +44,7 @@ index 085e8b4..b9c32e6 100644
 +      if (fd_get(socket, &fd) == fd_rsocket) {
 +              ret = real.fstat(socket, buf);
 +              if (!ret)
-+                      buf->st_mode |= __S_IFSOCK;
++                      buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
 +      } else {
 +              ret = real.fstat(fd, buf);
 +      }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 36eaaf3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: a70e486d7fb3d18adace33aea325353d847f6b41
-Top:    799d9bfcd5b6545c40e5e19c7b50907bd25ed616
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 11:26:32 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index b9c32e6..749857e 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -970,7 +970,7 @@ int fstat(int socket, struct stat *buf)
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fstat(socket, buf);
-               if (!ret)
--                      buf->st_mode |= __S_IFSOCK;
-+                      buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
-       } else {
-               ret = real.fstat(fd, buf);
-       }