refresh (create temporary patch)

diff --git a/meta b/meta
index 98c5e07f743020a11b112cdcff9b4e9f33c14414..b0a0cc573b60394ebc18a71393e4c8bd968b21b2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 787fee5e12f2842af28701de8337ea72105750df
-Head: 49754c7df5f31b1de88c34a878b44131a4d5434c
+Previous: 2e46867696082bfc98d51928a318e40bdd30563f
+Head: 7f16adcaf72b76f22cfe568c6484412f50099f28
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 49754c7df5f31b1de88c34a878b44131a4d5434c
+  refresh-temp: 7f16adcaf72b76f22cfe568c6484412f50099f28
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..fcf0bcb
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: 14944660e78363c6bab4cdc351003fe0f8f71bf4
+Top:    079d7bbe6129342c62546a42ccf45af677b9160f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-17 12:46:35 -0700
+
+Refresh of fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index ed952d7..6cc0d72 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -836,14 +836,14 @@ pid_t fork(void)
+       ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
+       if (ret)
+               goto out;
+-      sin6.sin6_flowinfor = sin6.sin6_scope_id = 0;
++      sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
+       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
+ 
+       sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
+       if (sem == SEM_FAILED)
+               goto out;
+ 
+-      lfd = rsocket(sa.ss_family, SOCK_STREAM, 0);
++      lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
+       if (lfd < 0)
+               goto sclose;