wpscan: v2.9.3 bump, issue #221

This commit is contained in:
blshkv 2017-07-21 05:47:23 +08:00
parent 3560231ddc
commit 2592930b7a
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
4 changed files with 47 additions and 11 deletions

View file

@ -0,0 +1,37 @@
--- lib/common/common_helper.rb.orig 2017-07-19 21:24:32.000000000 +0800
+++ lib/common/common_helper.rb 2017-07-21 05:34:32.895006934 +0800
@@ -2,16 +2,16 @@
LIB_DIR = File.expand_path(File.join(__dir__, '..'))
ROOT_DIR = File.expand_path(File.join(LIB_DIR, '..')) # expand_path is used to get "wpscan/" instead of "wpscan/lib/../"
-DATA_DIR = File.join(ROOT_DIR, 'data')
-CONF_DIR = File.join(ROOT_DIR, 'conf')
-CACHE_DIR = File.join(ROOT_DIR, 'cache')
+DATA_DIR = File.expand_path('~/.wpscan/data')
+CONF_DIR = File.expand_path('~/.wpscan/conf')
+CACHE_DIR = File.expand_path('~/.wpscan/cache')
WPSCAN_LIB_DIR = File.join(LIB_DIR, 'wpscan')
UPDATER_LIB_DIR = File.join(LIB_DIR, 'updater')
COMMON_LIB_DIR = File.join(LIB_DIR, 'common')
MODELS_LIB_DIR = File.join(COMMON_LIB_DIR, 'models')
COLLECTIONS_LIB_DIR = File.join(COMMON_LIB_DIR, 'collections')
-DEFAULT_LOG_FILE = File.join(ROOT_DIR, 'log.txt')
+DEFAULT_LOG_FILE = File.expand_path('~/.wpscan/log.txt')
# Plugins directories
COMMON_PLUGINS_DIR = File.join(COMMON_LIB_DIR, 'plugins')
--- wpscan.rb.orig 2017-07-19 21:24:32.000000000 +0800
+++ wpscan.rb 2017-07-21 05:36:38.692010812 +0800
@@ -9,6 +9,11 @@
def main
begin
+
+ unless File.directory?(DATA_DIR)
+ FileUtils.mkdir_p(DATA_DIR)
+ end
+
wpscan_options = WpscanOptions.load_from_arguments
$log = wpscan_options.log

View file

@ -4,7 +4,7 @@
EAPI=6
USE_RUBY="ruby21 ruby22 ruby23"
USE_RUBY="ruby23 ruby24"
inherit eutils ruby-ng
@ -19,12 +19,11 @@ IUSE="test"
RUBY_DEPS="dev-ruby/rubygems
dev-ruby/typhoeus:1
>=dev-ruby/nokogiri-1.6.7.2
>dev-ruby/yajl-ruby-1.2.0
dev-ruby/addressable
>=dev-ruby/nokogiri-1.7.0.1
>=dev-ruby/addressable-2.5.0
>=dev-ruby/yajl-ruby-1.3.0
>=dev-ruby/terminal-table-1.6.0
>=dev-ruby/ruby-progressbar-1.6.0
>=dev-ruby/webmock-1.7.2:0
>=dev-ruby/ruby-progressbar-1.8.1
dev-ruby/bundler
"
@ -38,6 +37,7 @@ ruby_add_rdepend "${RUBY_DEPS}"
# )"
each_ruby_prepare() {
rm Gemfile.lock
MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
}
@ -45,9 +45,9 @@ each_ruby_prepare() {
#src_prepare() {
all_ruby_prepare() {
#https://github.com/wpscanteam/wpscan/issues/706
epatch "${FILESDIR}/${PN}"-2.5.1_regular_user.patch
epatch "${FILESDIR}/${PN}"-2.9.3_regular_user.patch
rm -r README.md
# sed -i "/require 'bundler\/setup'/d" lib/environment.rb
if ! use test; then
sed -i -e "/^group :test do/,/^end$/d" Gemfile || die

View file

@ -62,7 +62,6 @@ dev-ruby/activemodel:4.2
dev-ruby/i18n:0.7
~dev-ruby/memcache-client-1.8.5
~dev-ruby/yajl-ruby-1.1.0
~dev-ruby/right_http_connection-1.3.0
~dev-ruby/haml-3.1.8
~dev-util/cucumber-2.4.0
@ -218,7 +217,7 @@ dev-ruby/pdf-reader:2
=dev-ruby/ethon-0.9*
~dev-ruby/addressable-2.3.8
~dev-ruby/yard-0.8.3
~dev-ruby/yajl-ruby-1.2.1
=dev-ruby/yajl-ruby-1.3*
=dev-ruby/ruby-progressbar-1.8*
#beef

View file

@ -1,7 +1,7 @@
~net-analyzer/owtf-2.0a
~net-analyzer/w3af-1.6.54
~net-analyzer/wpscan-2.9.2
~net-analyzer/wpscan-2.9.3
=net-analyzer/set-6*
net-analyzer/dnsenum