refresh (create temporary patch)

diff --git a/meta b/meta
index 1a487ef5b70bf0096c9584b4c3536c41a8af22e1..b39b485e42fb830048fb50f31423d0304bc41ee6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6b4f69c70031f9c192a5f96dc9b8cec80df4f41b
-Head: 5f6035045a3c2dfa888ab2da865bcd16923a58a6
+Previous: 98efd63b6a400dcbba47a8e735b7ed7d82c72e89
+Head: 7eac7053c6779e28b6c2e0dedf77aeb1260bda0f
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -9,6 +9,7 @@ Applied:
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: 5f6035045a3c2dfa888ab2da865bcd16923a58a6
+  refresh-temp: 7eac7053c6779e28b6c2e0dedf77aeb1260bda0f
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c97acab
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,39 @@
+Bottom: ebbfcee2d01231735d5a1be17b9fd52b51608bca
+Top:    758d450afd5a63013c7540fa171eea46bb810c1a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-14 16:23:08 -0700
+
+Refresh of fstat
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 1dc7082..ec62e69 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -86,11 +86,9 @@ struct socket_calls {
+                         void *optval, socklen_t *optlen);
+       int (*fcntl)(int socket, int cmd, ... /* arg */);
+       int (*dup2)(int oldfd, int newfd);
+-<<<<<<< current
+       ssize_t (*sendfile)(int out_fd, int in_fd, off_t *offset, size_t count);
+-=======
+       int (*fxstat64)(int ver, int fd, struct stat64 *buf);
+->>>>>>> patched
++      int (*fxstat)(int ver, int fd, struct stat *buf);
+ };
+ 
+ static struct socket_calls real;
+@@ -283,11 +281,9 @@ static void init_preload(void)
+       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
+       real.fcntl = dlsym(RTLD_NEXT, "fcntl");
+       real.dup2 = dlsym(RTLD_NEXT, "dup2");
+-<<<<<<< current
+       real.sendfile = dlsym(RTLD_NEXT, "sendfile");
+-=======
+       real.fxstat64 = dlsym(RTLD_NEXT, "__fxstat64");
+->>>>>>> patched
++      real.fxstat = dlsym(RTLD_NEXT, "__fxstat");
+ 
+       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
+       rs.bind = dlsym(RTLD_DEFAULT, "rbind");