refresh

diff --git a/meta b/meta
index 3ad78614a8f5da1dea89ae4b5454f71507469466..61bfe333f389c07842c142c6b416e7ddf19edbdf 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: c6b076837a45999569bcefa0a2b66e9cdf975edb
-Head: e7a8c5561e1b0b11e7537bf6785d4317b05fd7f3
+Previous: 8c9a396320c1354c32757da60bf39a79aa448b08
+Head: b0f890f94a7a9af571f390e1cc5885474d934212
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
-  fork-connect: 1bd37069db8ad3555c9fd59b2bb956f95eba066e
-  refresh-temp: e7a8c5561e1b0b11e7537bf6785d4317b05fd7f3
+  fork-connect: b0f890f94a7a9af571f390e1cc5885474d934212
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/fork-connect b/patches/fork-connect
index 46f1746871039703ede298287ea733d213be58af..37efbb8768b4a18d95f17a674eb512a0a31e641f 100644 (file)
--- a/patches/fork-connect
+++ b/patches/fork-connect
@@ -1,5 +1,5 @@
 Bottom: 3ea2748a5c41b11a2e7033c56bddd938d2770b6c
-Top:    3513087cec3ea33b2826cc40e6f7fcdcafbab00c
+Top:    869244971263f9cd4426b0428f1505bf77030a32
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-10 21:44:39 -0700
 
@@ -28,7 +28,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index b18d310..76c473b 100644
+index b18d310..9182b6a 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -99,12 +99,20 @@ static int fork_support;
@@ -212,7 +212,7 @@ index b18d310..76c473b 100644
 +      if ((ret != sizeof msg) || msg)
 +              goto err2;
 +
-+      ret = rconnect(ret, &addr, len);
++      ret = rconnect(ret, (struct sockaddr *) &addr, len);
 +      if (ret)
 +              goto err2;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e804cc0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 3513087cec3ea33b2826cc40e6f7fcdcafbab00c
-Top:    869244971263f9cd4426b0428f1505bf77030a32
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-13 14:48:42 -0700
-
-Refresh of fork-connect
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 76c473b..9182b6a 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -514,7 +514,7 @@ static void fork_active(int socket)
-       if ((ret != sizeof msg) || msg)
-               goto err2;
- 
--      ret = rconnect(ret, &addr, len);
-+      ret = rconnect(ret, (struct sockaddr *) &addr, len);
-       if (ret)
-               goto err2;