refresh

diff --git a/meta b/meta
index 0c58f4b74b28cfc5835e8fc4fabf9f8218bc81b2..e0559b3f46748c7cddb50e10eeb985873fb71268 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 97aab6224cffed34b3258128002d5c98b7da6738
-Head: 80ea674e7581007f20349740abb4bd4cb1c8bc8d
+Previous: 53bed9869acea69331c2d153d76f01b16decc856
+Head: c3882ddaea14673b5b3b3322459209c02f4083bf
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: f9fddc8f75f50d70032e9a084aad0421cc7886a1
-  refresh-temp: 80ea674e7581007f20349740abb4bd4cb1c8bc8d
+  fork: c3882ddaea14673b5b3b3322459209c02f4083bf
 Unapplied:
   rstream-fork: 1dc5b7e931e62c81846d0ce7cbfdffc7c3993c65
   dbg: 897be364bd8d8c83d4bf73e4d5ddc8c3e05b13f1

diff --git a/patches/fork b/patches/fork
index 79fed03eba6b7ae0b852eb0f0e869eb37de58c40..470d4076a6ef451ee0239f9b79446b4deca41406 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    a60724bf5aa9081e8c88db5b5cfd3786af42b333
+Top:    7877a1a5ec8b625a7127ef30ba236e4677df5df2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..731643d 100644
+index d2058e2..a1073d5 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -210,7 +210,7 @@ index d2058e2..731643d 100644
 +      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);
++      sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR, S_IRWXU, 1);
 +      if (sem == SEM_FAILED)
 +              goto out;
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b0d4076..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: a60724bf5aa9081e8c88db5b5cfd3786af42b333
-Top:    7877a1a5ec8b625a7127ef30ba236e4677df5df2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 11:37:30 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 731643d..a1073d5 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -846,7 +846,7 @@ pid_t fork(void)
-       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);
-+      sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR, S_IRWXU, 1);
-       if (sem == SEM_FAILED)
-               goto out;