refresh (create temporary patch)

diff --git a/meta b/meta
index ad601a730bb2df3e1d8ebe96636bf3bfe2824a3e..757fa00d7194737eb403fe7f73972bca0964b4ac 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: d04e01941849bff19e7978c50bc1ea4d8d2cb1bd
-Head: 787c3c665c26cd4f4e898649af3897b6743d271c
+Previous: 015e9db16d79e87ef59d9fae7bc150bc3a18f049
+Head: 658de9e426dc6fbbef8370e0a31d769f597469f2
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 787c3c665c26cd4f4e898649af3897b6743d271c
+  refresh-temp: 658de9e426dc6fbbef8370e0a31d769f597469f2
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5f6fc45
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,50 @@
+Bottom: 6fb26f02c06c27cb2b94fd21d21273260c3c4563
+Top:    3e3c89beff00570aab96ab4c0bd6a397aaae83a4
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-17 12:42:17 -0700
+
+Refresh of fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index cdf1ea6..00ca24e 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -460,7 +460,6 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+ 
+ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+-      struct sockaddr_in *sin;
+       int fd, ret;
+       uint32_t msg;
+ 
+@@ -505,6 +504,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ 
+               rclose(fd);
+               fd = ret;
++              break;
++      default:
++              break;
+       }
+ 
+       return real.connect(fd, addr, addrlen);
+@@ -821,7 +823,8 @@ pid_t fork(void)
+       struct sockaddr_in6 sin6;
+       pid_t pid;
+       sem_t *sem;
+-      int lfd, sfd, dfd, ret, len, param;
++      int lfd, sfd, dfd, ret, param;
++      socklen_t len;
+       uint32_t msg;
+ 
+       init_preload();
+@@ -831,7 +834,7 @@ pid_t fork(void)
+               goto out;
+ 
+       len = sizeof sa;
+-      ret = real.getsockname(sfd, &sa, &len);
++      ret = real.getsockname(sfd, (struct sockaddr *) &sa, &len);
+       if (ret)
+               goto out;
+       sin6.sin6_family = sa.ss_family;