Merge remote-tracking branch 'gum/master'

1 files changed, 72 insertions, 29 deletions

diff --git a/makefu/5pkgs/beef/Gemfile.lock b/makefu/5pkgs/beef/Gemfile.lock
index d2e6ad45e..8f18bf220 100644
--- a/makefu/5pkgs/beef/Gemfile.lock
+++ b/makefu/5pkgs/beef/Gemfile.lock
@@ -4,8 +4,9 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
-    chunky_png (1.3.8)
-    daemons (1.2.4)
+    buftok (0.2.0)
+    chunky_png (1.3.10)
+    daemons (1.2.6)
     data_objects (0.10.17)
       addressable (~> 2.1)
     dm-core (1.2.1)
@@ -26,48 +27,66 @@ GEM
       do_sqlite3 (~> 0.10.6)
     do_sqlite3 (0.10.17)
       data_objects (= 0.10.17)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
+    equalizer (0.0.11)
     erubis (2.7.0)
     espeak-ruby (1.0.4)
     eventmachine (1.0.9.1)
     execjs (2.7.0)
     fastercsv (1.5.5)
     filesize (0.1.1)
-    geoip (1.6.3)
+    geoip (1.6.4)
+    http (3.3.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.1.1)
     http_parser.rb (0.6.0)
     jsobfu (0.4.2)
       rkelly-remix
     json (1.8.6)
     json_pure (1.8.6)
-    libv8 (3.16.14.19)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
     metasm (1.0.3)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     mojo_magick (0.5.6)
     msfrpc-client (1.1.1)
       msgpack (~> 1)
       rex (~> 2)
-    msgpack (1.1.0)
-    multi_json (1.12.2)
-    nokogiri (1.8.1)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    mustermann (1.0.2)
+    naught (1.1.0)
+    netrc (0.11.0)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     parseconfig (1.0.8)
-    public_suffix (3.0.0)
+    public_suffix (3.0.3)
     qr4r (0.4.1)
       mojo_magick
       rqrcode
-    rack (1.6.8)
-    rack-protection (1.5.3)
+    rack (2.0.5)
+    rack-protection (2.0.3)
       rack
-    rainbow (2.2.2)
-      rake
-    rake (12.1.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
     rb-readline (0.5.5)
-    ref (2.0.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rex (2.0.11)
       filesize
       jsobfu (~> 0.4.1)
@@ -86,23 +105,42 @@ GEM
       eventmachine (~> 1.0.0)
       rexec (~> 1.6.2)
     rubyzip (1.2.1)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    rushover (0.3.0)
+      json
+      rest-client
+    simple_oauth (0.3.1)
+    sinatra (2.0.3)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.3)
+      tilt (~> 2.0)
+    slack-notifier (2.3.2)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
+    thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.15.0)
-    uglifier (3.2.0)
+    tins (1.16.3)
+    twitter (6.2.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      equalizer (~> 0.0.11)
+      http (~> 3.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+      memoizable (~> 0.4.0)
+      multipart-post (~> 2.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
+    uglifier (4.1.18)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    xmlrpc (0.3.0)
 
 PLATFORMS
   ruby
@@ -126,14 +164,19 @@ DEPENDENCIES
   nokogiri (>= 1.7)
   parseconfig
   qr4r
-  rack (~> 1.6.5)
+  rack (~> 2.0)
+  rack-protection (~> 2.0)
+  rake
   rubydns (~> 0.7.3)
   rubyzip (>= 1.2.1)
-  sinatra
+  rushover
+  sinatra (~> 2.0)
+  slack-notifier
   term-ansicolor
-  therubyracer
   thin
+  twitter (>= 5.0.0)
   uglifier
+  xmlrpc
 
 BUNDLED WITH
-   1.15.4
+   1.14.6