From 3ebcb71e9f30b24c2d70d03b004a9ee5b156a538 Mon Sep 17 00:00:00 2001
From: Feng Lee <feng@emqtt.io>
Date: Mon, 13 Mar 2017 17:03:34 +0800
Subject: [PATCH 1/3] Upgrade esockd library to v4.2

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cf1234a02..80000fcf1 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ DEPS = gproc lager esockd mochiweb lager_syslog pbkdf2
 dep_gproc        = git https://github.com/uwiger/gproc
 dep_getopt       = git https://github.com/jcomellas/getopt v0.8.2
 dep_lager        = git https://github.com/basho/lager master
-dep_esockd       = git https://github.com/emqtt/esockd emq20
+dep_esockd       = git https://github.com/emqtt/esockd v4.2
 dep_mochiweb     = git https://github.com/emqtt/mochiweb
 dep_lager_syslog = git https://github.com/basho/lager_syslog
 dep_pbkdf2       = git https://github.com/comtihon/erlang-pbkdf2.git 2.0.0

From 076b3c00688f58b62758bdc6328dabcff32bfd06 Mon Sep 17 00:00:00 2001
From: Feng Lee <feng@emqtt.io>
Date: Mon, 13 Mar 2017 17:10:54 +0800
Subject: [PATCH 2/3] Upgrade esockd library to v4.2

---
 rebar.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config b/rebar.config
index 659b453cf..4cc2a59d1 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,4 +1,4 @@
 {deps, [
-{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","emq20"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{pbkdf2,".*",{git,"https://github.com/comtihon/erlang-pbkdf2.git","2.0.0"}}
+{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","v4.2"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{pbkdf2,".*",{git,"https://github.com/comtihon/erlang-pbkdf2.git","2.0.0"}}
 ]}.
 {erl_opts, [{parse_transform,lager_transform}]}.

From e39a96cbc8b0517990ec767bf84b39d3152ab382 Mon Sep 17 00:00:00 2001
From: J Phani Mahesh <code@phanimahesh.me>
Date: Thu, 23 Mar 2017 22:00:24 +0530
Subject: [PATCH 3/3] update rebar.lock

This was missed when pbkdf2 was added and esockd was updated.
mochiweb silently got an update, which I wouldn't have realised
if not for this.
---
 rebar.lock | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rebar.lock b/rebar.lock
index e5d182bad..1364f95ae 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,6 +1,6 @@
 [{<<"esockd">>,
   {git,"https://github.com/emqtt/esockd",
-       {ref,"6ef597f16ce242fe37ae019d6ff5214f7a784c80"}},
+       {ref,"87d0d3b672e0f25e474f5f8298da568cbb6b168a"}},
   0},
  {<<"gen_logger">>,
   {git,"https://github.com/emqtt/gen_logger.git",
@@ -24,7 +24,11 @@
   0},
  {<<"mochiweb">>,
   {git,"https://github.com/emqtt/mochiweb",
-       {ref,"af27c0c90bf4c1bfeae0290e4c541264b69f7168"}},
+       {ref,"c75d88e451b4fe26580a58223f645d99482f51af"}},
+  0},
+ {<<"pbkdf2">>,
+  {git,"https://github.com/comtihon/erlang-pbkdf2.git",
+       {ref,"7076584f5377e98600a7e2cb81980b2992fb2f71"}},
   0},
  {<<"syslog">>,
   {git,"git://github.com/Vagabond/erlang-syslog",