Merge pull request #956 from emqtt/develop

Depend on goldrush and emqtt/pbkdf2 to resolve the building errors

Makefile

@@ -2,20 +2,22 @@ PROJECT = emqttd
 PROJECT_DESCRIPTION = Erlang MQTT Broker
 PROJECT_VERSION = 2.1.0
 
-NO_AUTOPATCH = cuttlefish
+DEPS = goldrush gproc lager esockd mochiweb pbkdf2 lager_syslog
 
-DEPS = gproc lager esockd mochiweb lager_syslog pbkdf2
 
+dep_goldrush     = git https://github.com/basho/goldrush 0.1.9
 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_mochiweb     = git https://github.com/emqtt/mochiweb
+dep_pbkdf2       = git https://github.com/emqtt/pbkdf2 2.0.1
 dep_lager_syslog = git https://github.com/basho/lager_syslog
-dep_pbkdf2       = git https://github.com/comtihon/erlang-pbkdf2.git 2.0.0
 
 ERLC_OPTS += +'{parse_transform, lager_transform}'
 
+NO_AUTOPATCH = cuttlefish
+
 BUILD_DEPS = cuttlefish
 dep_cuttlefish = git https://github.com/emqtt/cuttlefish
 

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",""}},{ger_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{pbkdf2,".*",{git,"https://github.com/comtihon/erlang-pbkdf2.git","2.0.0"}}
+{goldrush,".*",{git,"https://github.com/basho/goldrush","0.1.9"}},{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",""}},{pbkdf2,".*",{git,"https://github.com/emqtt/pbkdf2","2.0.1"}},{ger_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}}
 ]}.
 {erl_opts, [{parse_transform,lager_transform}]}.

test/emqttd_SUITE.erl

@@ -715,7 +715,7 @@ change_opts(SslType, DataDir, Vals) ->
     lists:foldl(fun({Protocol, Port, Opts} = Listener, Acc) ->
     case Protocol of
     ssl ->
-            SslOpts = proplists:get_value(ssl, Opts),
+            SslOpts = proplists:get_value(sslopts, Opts),
             Keyfile = filename:join([DataDir, proplists:get_value(keyfile, SslOpts)]),
             Certfile = filename:join([DataDir, proplists:get_value(certfile, SslOpts)]),
             TupleList1 = lists:keyreplace(keyfile, 1, SslOpts, {keyfile, Keyfile}),