wpscan: 3.3.1 bump, cleanup, bundler check

This commit is contained in:
blshkv 2018-10-02 23:20:59 +08:00
parent 187a402637
commit 0bf47c07b5
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
9 changed files with 32 additions and 298 deletions

View file

@ -1,4 +1,2 @@
DIST wpscan-2.9.2.tar.gz 1563377 BLAKE2B 3de1dc702c0cac406465eef2d749ccb3c5b4fcb37bd5266f58bcaf1310ed545c825fed94a5b485b5c020de91f70a2b45e7bf3e31fefa39b65032030d2a2aa53e SHA512 cc8ff69b4b4b7ad26a32b9627d44d9d8e647310763cf768d91eb400d86fcbbb98f7a5cd695f9f7b2df9e85d5b3c49f2336a8bcf9a14e2458ffe06e3d2be145d6
DIST wpscan-2.9.3.tar.gz 1734782 BLAKE2B a51835279afd48d938a395d31ae72e49034725060c4b5eab2fe9ae78bb1d24d39a30d25ee47ab3b7a46c280ef0b859462aab675386261f507b9f455192a37927 SHA512 95f18f78cc6ba94c0085700fa3c26a6e66441e0978ef7b492deb3b42e96d9b91c17bd07ef2d48e2c7a1428ebc280eba608a41032452c6c42791fc3c91012e490
DIST wpscan-2.9.4.tar.gz 1940596 BLAKE2B dd8fd491af14b2bf7c3da77fc7cd45712605f77967dba4589f33bb5b93e04acd10e0c7a6a85bab50002f6d65209834a4f73181ca30146bf2e6286715eb7184f1 SHA512 1ca5fd2e8bc5a7a368576351bce465039a7fdcea33d4abe86a168dbd2725922ae40362264a2f71e0839435e5085a9ebe74415bd3d40c316e3b4d654122a87e67
DIST wpscan-3.3.0.tar.gz 5781183 BLAKE2B f8ec77e961ad089dafd911a6ba2b6a15f421d7a1a63fd790dd4d5b9781ecfdd7de678022ee2d0b117f69c0f6dc05c3d9731fa8bd029b7888c421e5d3795fdb07 SHA512 17123bd697d97ec93325fd6524ddb2a4e5e76a96375e8e06be93f8b6a3d6935114bc3fdfd6a6b17ec32228678780e1c24bedbf147bf71812d1a885dc50eccac2
DIST wpscan-3.3.1.tar.gz 5781065 BLAKE2B 4f12e6ced7fdee1f42f676ff5d6009f30bf2ec3fbd5dd2eb33d7cb7d6ad606084fbc2292331f561a3a3fc903873fa646b70753339c4192259dbe416995a0158a SHA512 1b0dc3cf8d3459c2ae6a189f0ec45fe8ca80cc22cdd55c6f2122d474259c373aeb1577d3d8f3a24b31f51160b5a3f73c36c6e9c64d272e066c1b106047bff7a2

View file

@ -1,3 +0,0 @@
#!/bin/sh
ruby /usr/lib/wpscan/wpscan.rb $@

View file

@ -1,38 +0,0 @@
--- lib/common/common_helper.rb.orig 2014-10-07 14:58:38.187837867 +0800
+++ lib/common/common_helper.rb 2014-10-07 15:04:20.817834016 +0800
@@ -2,9 +2,9 @@
LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
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')
WPSTOOLS_LIB_DIR = File.join(LIB_DIR, 'wpstools')
UPDATER_LIB_DIR = File.join(LIB_DIR, 'updater')
@@ -12,7 +12,7 @@
MODELS_LIB_DIR = File.join(COMMON_LIB_DIR, 'models')
COLLECTIONS_LIB_DIR = File.join(COMMON_LIB_DIR, 'collections')
-LOG_FILE = File.join(ROOT_DIR, 'log.txt')
+LOG_FILE = File.expand_path('~/.wpscan/log.txt')
# Plugins directories
COMMON_PLUGINS_DIR = File.join(COMMON_LIB_DIR, 'plugins')
--- wpscan.rb.orig 2014-10-07 14:58:02.000000000 +0800
+++ wpscan.rb 2014-10-07 15:31:58.977815380 +0800
@@ -5,6 +5,11 @@
require File.dirname(__FILE__) + '/lib/wpscan/wpscan_helper'
def main
+
+ unless File.directory?(DATA_DIR)
+ FileUtils.mkdir_p(DATA_DIR)
+ end
+
# delete old logfile, check if it is a symlink first.
File.delete(LOG_FILE) if File.exist?(LOG_FILE) and !File.symlink?(LOG_FILE)

View file

@ -1,37 +0,0 @@
--- 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

@ -1,3 +0,0 @@
#!/bin/sh
ruby /usr/lib/wpscan/wpstools.rb $@

View file

@ -1,71 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
USE_RUBY="ruby21 ruby22 ruby23"
inherit eutils ruby-ng
DESCRIPTION="Wordpress security scanner"
HOMEPAGE="http://wpscan.org/"
SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
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/terminal-table-1.6.0
>=dev-ruby/ruby-progressbar-1.6.0
>=dev-ruby/webmock-1.7.2:0
dev-ruby/bundler
"
ruby_add_bdepend "${RUBY_DEPS}"
ruby_add_rdepend "${RUBY_DEPS}"
# test? (
# >=dev-ruby/webmock-1.9.3
# dev-ruby/simplecov
# dev-ruby/rspec
# )"
each_ruby_prepare() {
MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
}
#src_prepare() {
all_ruby_prepare() {
#https://github.com/wpscanteam/wpscan/issues/706
epatch "${FILESDIR}/${PN}"-2.5.1_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
fi
unpack ./data.zip
rm ./data.zip
rm -r ./dev
default
}
#src_install() {
all_ruby_install() {
dodoc CHANGELOG.md CREDITS
rm CHANGELOG.md CREDITS
insinto /usr/$(get_libdir)/${PN}
doins -r *
dobin "${FILESDIR}"/wpscan
dobin "${FILESDIR}"/wpstools
}

View file

@ -1,71 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
USE_RUBY="ruby23 ruby24"
inherit eutils ruby-ng
DESCRIPTION="Wordpress security scanner"
HOMEPAGE="http://wpscan.org/"
SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
RUBY_DEPS="dev-ruby/rubygems
dev-ruby/typhoeus:1
>=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.8.1
dev-ruby/bundler
"
ruby_add_bdepend "${RUBY_DEPS}"
ruby_add_rdepend "${RUBY_DEPS}"
# test? (
# >=dev-ruby/webmock-1.9.3
# dev-ruby/simplecov
# dev-ruby/rspec
# )"
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
}
#src_prepare() {
all_ruby_prepare() {
#https://github.com/wpscanteam/wpscan/issues/706
epatch "${FILESDIR}/${PN}"-2.9.3_regular_user.patch
rm -r README.md
if ! use test; then
sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
fi
unpack ./data.zip
rm ./data.zip
rm -r ./dev
default
}
#src_install() {
all_ruby_install() {
dodoc CHANGELOG.md CREDITS
rm CHANGELOG.md CREDITS
insinto /usr/$(get_libdir)/${PN}
doins -r *
dobin "${FILESDIR}"/wpscan
dobin "${FILESDIR}"/wpstools
}

View file

@ -1,72 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby23 ruby24"
inherit eutils ruby-ng
DESCRIPTION="Wordpress security scanner"
HOMEPAGE="http://wpscan.org/"
SRC_URI="https://github.com/wpscanteam/wpscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RUBY_DEPS="
>=dev-ruby/addressable-2.5.0
>=dev-ruby/nokogiri-1.7.0.1
>=dev-ruby/ruby-progressbar-1.8.1
>=dev-ruby/rubyzip-1.2.1
>=dev-ruby/terminal-table-1.6.0
dev-ruby/typhoeus:1
>=dev-ruby/yajl-ruby-1.3.0
dev-ruby/rubygems
dev-ruby/bundler
"
ruby_add_bdepend "${RUBY_DEPS}"
ruby_add_rdepend "${RUBY_DEPS}"
# test? (
# >=dev-ruby/webmock-1.9.3
# dev-ruby/simplecov
# dev-ruby/rspec
# )"
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
}
#src_prepare() {
all_ruby_prepare() {
#https://github.com/wpscanteam/wpscan/issues/706
# epatch "${FILESDIR}/${PN}"-2.9.3_regular_user.patch
rm -r README.md
if ! use test; then
sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
fi
unpack ./data.zip
rm ./data.zip
rm -r ./dev
default
}
#src_install() {
all_ruby_install() {
dodoc CHANGELOG.md
rm CHANGELOG.md
insinto /usr/$(get_libdir)/${PN}
doins -r *
dobin "${FILESDIR}"/wpscan
dobin "${FILESDIR}"/wpstools
}

View file

@ -0,0 +1,31 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby23 ruby24"
RUBY_FAKEGEM_EXTRAINSTALL="app bin spec"
inherit ruby-fakegem
DESCRIPTION="Wordpress security scanner"
HOMEPAGE="http://wpscan.org/"
SRC_URI="https://github.com/wpscanteam/wpscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
ruby_add_rdepend "dev-ruby/cms_scanner
>=dev-ruby/addressable-2.5.0
dev-ruby/activesupport:5.2
>=dev-ruby/yajl-ruby-1.3.0
"
each_ruby_prepare() {
sed -i -e '/s.add_development_dependency/d' wpscan.gemspec
MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
}