pop

diff --git a/meta b/meta
index 9f68a5dafbb5a90faba9cf7ea382253c440d15d3..5a7293a3aecb8c60e8ec2fcb56cc12b63fe8182d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,14 @@
 Version: 1
-Previous: 069251ceaf8e43bfbdc90d7fae44611e846edfd9
-Head: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
+Previous: 3af3d9f4f5bf326cfab11b3bf8a8171fef25dde2
+Head: ff0af9d581e9a8ca9b6e1467d7484b0de619b0d2
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
+  daemonize: ff0af9d581e9a8ca9b6e1467d7484b0de619b0d2
 Unapplied:
-  daemonize: 646c4c05e8e149d4d82050e9613b806ae29f7016
   rel-1.0.6: 01c9f3298c9da13ed42a1506e1546abb5c4fcec0
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/daemonize b/patches/daemonize
index b92fef7a42730985bcdd70be3b0ae93a49c55587..0b5ae79f70eba4971a67546fef79fc5d59367c24 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
-Bottom: ef30d4769ae20a3994fb559aacbb91d3b16e4415
-Top:    0bdb64d40f0cfe5da790eae42e067b44d56c6a15
+Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
+Top:    98dea5a2ee9946a718b1b722725010445646dc9b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -648,7 +648,7 @@ index d53fc37..8f670f1 100644
  
  int CDECL_FUNC main(int argc, char **argv)
 diff --git a/src/acme.c b/src/acme.c
-index 768f17e..63103ee 100644
+index f9ea74f..9eae065 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -43,7 +43,7 @@