Commit ad83c3e0 authored by Sophie Brun's avatar Sophie Brun

Refresh patches and remove obsolete patches

parent 1f122a9d
Description: Disable dns extension
Current version of ruby-rubydns in kali is incompatible with beef-xss (it
uses an oler version). We disable dns extension until upstream fixes
this.
Origin: upstream, https://github.com/beefproject/beef/issues/1249
Bug: https://github.com/beefproject/beef/issues/1249
Last-Update: 2016-06-09
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/config.yaml
+++ b/config.yaml
@@ -164,8 +164,10 @@ beef:
ipec:
enable: true
# this is still experimental..
+ # Disable it in kali because it doesn't work with the current
+ # version of ruby-rubydns (older version is required by beef-xss)
dns:
- enable: true
+ enable: false
# this is still experimental..
dns_rebinding:
enable: false
......@@ -7,37 +7,32 @@ Last-Update: 2014-06-13
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/core/loader.rb
+++ b/core/loader.rb
@@ -6,8 +6,6 @@
@@ -6,14 +6,14 @@
# @note Include here all the gems we are using
require 'rubygems'
-require 'bundler/setup'
+#require 'bundler/setup'
# For some reason, on Ruby 2.5+, msgpack needs to be loaded first,
# else metasploit integration dies due to undefined `to_msgpack`.
# Works fine on Ruby 2.4
require 'msgpack'
-Bundler.require(:default)
+#Bundler.require(:default)
require 'cgi'
require 'yaml'
require 'singleton'
@@ -16,6 +14,24 @@ require 'base64'
require 'xmlrpc/client'
require 'openssl'
require 'rubydns'
+require 'eventmachine'
+require 'thin'
@@ -39,6 +39,11 @@ require 'optparse'
require 'resolv'
require 'digest'
require 'zip'
+require 'sinatra'
+require 'rack'
+require 'em-websocket'
+require 'uglifier'
+require 'therubyracer'
+require 'execjs'
+require 'ansi'
+require 'term/ansicolor'
+require 'dm-core'
+require 'json'
+require 'data_objects'
+require 'dm-sqlite-adapter'
+require 'parseconfig'
+require 'erubis'
+require 'dm-migrations'
+require 'dm-sqlite-adapter'
+require 'msfrpc-client'
require 'mime/types'
# @note Include the filters
require 'core/filters'
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@
# See the file 'doc/COPYING' for copying permission
#
-0.4.6.1-alpha
+0.4.7.0-alpha
--- a/config.yaml
+++ b/config.yaml
@@ -6,7 +6,7 @@
# BeEF Configuration file
beef:
- version: '0.4.6.1-alpha'
+ version: '0.4.7.0-alpha'
# More verbose messages (server-side)
debug: false
# More verbose messages (client-side)
tweak-gemfile
update-config
drop-bundler.diff
disable-dns.patch
fix-version.patch
Description: Change specific versions in Gemfile
Author: Sophie Brun <sophie@freexian.com>
Bug: https://github.com/beefproject/beef/issues/1025
Reviewed-by: Raphaël Hertzog <raphael@freexian.com>
Last-Update: <2014-06-17>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Gemfile
+++ b/Gemfile
@@ -10,8 +10,8 @@ gem 'eventmachine'
gem 'thin'
gem 'sinatra'
gem 'rack'
-gem 'em-websocket', '~> 0.3.6' # WebSocket support
-gem 'uglifier', '~> 2.2.1'
+gem 'em-websocket', '>= 0.3.6' # WebSocket support
+gem 'uglifier', '>= 2.2.1'
gem 'mime-types'
@@ -22,7 +22,7 @@ if RUBY_PLATFORM.downcase.include?('mswi
gem 'execjs'
gem 'win32console'
elsif !RUBY_PLATFORM.downcase.include?('darwin')
- gem 'therubyracer', '0.11.3'
+ gem 'therubyracer', '>= 0.11.3'
gem 'execjs'
end
......@@ -3,7 +3,7 @@ Author: Raphaël Hertzog <hertzog@debian.org>
--- a/config.yaml
+++ b/config.yaml
@@ -98,7 +98,7 @@ beef:
@@ -103,7 +103,7 @@ beef:
driver: "sqlite"
# db_file is only used for sqlite
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment