refresh

diff --git a/meta b/meta
index 0c2351652cbe3a99b35a9fa913ee9c1406d605ea..5360ea021935139c35af88dab8396ddcb7710a2e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 949daeb1b3d272a3ea201cad3de5f9c516a47734
-Head: ef849852e5d996677ab2f29d0387cdd42f6f7ae0
+Previous: 45caa5356b16bc4e115f45fe785bb1878bf94e2e
+Head: 80f787d351c57e6d7a54d49370b4e02eefaa542a
 Applied:
-  dbg-fork: 12cc7c21255592d07188cd12ff7c79b485d763e2
-  refresh-temp: ef849852e5d996677ab2f29d0387cdd42f6f7ae0
+  dbg-fork: 80f787d351c57e6d7a54d49370b4e02eefaa542a
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/dbg-fork b/patches/dbg-fork
index 1eac78d0b7e7efd7b047efab33e940131b61455a..7fb7ad85fc39d734065805c5aa4f730c5f709afa 100644 (file)
--- a/patches/dbg-fork
+++ b/patches/dbg-fork
@@ -1,5 +1,5 @@
 Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    a84f3a159dd9126f12ef6854a797b9e0dcdbf321
+Top:    06853a301391158299c28be6011861e4de091813
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-21 13:49:59 -0700
 
@@ -9,16 +9,15 @@ debug fork issue
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..cdca9df 100644
+index 0645f6d..c96d1d7 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -413,11 +413,13 @@ int socket(int domain, int type, int protocol)
                return index;
  
        recursive = 1;
--      ret = rsocket(domain, type, protocol);
-+//    ret = rsocket(domain, type, protocol);
 +goto realsock;
+       ret = rsocket(domain, type, protocol);
        recursive = 0;
        if (ret >= 0) {
                if (fork_support) {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b8328f4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: a84f3a159dd9126f12ef6854a797b9e0dcdbf321
-Top:    06853a301391158299c28be6011861e4de091813
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-22 14:18:49 -0700
-
-Refresh of dbg-fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index cdca9df..c96d1d7 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -413,8 +413,8 @@ int socket(int domain, int type, int protocol)
-               return index;
- 
-       recursive = 1;
--//    ret = rsocket(domain, type, protocol);
- goto realsock;
-+      ret = rsocket(domain, type, protocol);
-       recursive = 0;
-       if (ret >= 0) {
-               if (fork_support) {