From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 18 Jul 2012 18:56:02 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bd89ed1b20ed69c7482228555304a9ab5bc6ae94;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 8b5c3f32..0334bb36 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 23591f9c95b3a9c9c984c0b6df26718085fce374
-Head: 15c591892324492936be0b8589d21d843bf4e9d1
+Previous: afc59a0d3ae01aec926453ebfdc45e90875b0570
+Head: 3954e0217e42a05d30c8ad773cdc0d80529ab553
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: cf6c4a3503761d2505c4f3782e0b3529347c1f17
-  refresh-temp: 15c591892324492936be0b8589d21d843bf4e9d1
+  fork: 3954e0217e42a05d30c8ad773cdc0d80529ab553
 Unapplied:
   rstream-fork: f9f6a263b1b604b0c6084441254d14ae15193c27
   dbg: ff02e9796a45f108da358d23b2917f0726569695
diff --git a/patches/fork b/patches/fork
index 776ef7aa..e97e151a 100644
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    c3cf2f5759614f2ebce8277cf3fac4f7c1643d05
+Top:    94fad5ac7a70819178822801a6a0dc686831107d
 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..5b6b50a 100644
+index d2058e2..2c07cc2 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -172,7 +172,7 @@ index d2058e2..5b6b50a 100644
  	}
  
  	return real.connect(fd, addr, addrlen);
-@@ -754,3 +812,86 @@ int fcntl(int socket, int cmd, ... /* arg */)
+@@ -754,3 +812,87 @@ int fcntl(int socket, int cmd, ... /* arg */)
  	va_end(args);
  	return ret;
  }
@@ -210,7 +210,8 @@ index d2058e2..5b6b50a 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 | O_RDWR, S_IRWXU, 1);
++	sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR,
++		       S_IRWXU | S_IRWXG, 1);
 +	if (sem == SEM_FAILED)
 +		goto out;
 +
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index cdd35e9d..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: c3cf2f5759614f2ebce8277cf3fac4f7c1643d05
-Top:    94fad5ac7a70819178822801a6a0dc686831107d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 11:56:02 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 5b6b50a..2c07cc2 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -846,7 +846,8 @@ 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 | O_RDWR, S_IRWXU, 1);
-+	sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR,
-+		       S_IRWXU | S_IRWXG, 1);
- 	if (sem == SEM_FAILED)
- 		goto out;