6 files changed, 57 insertions, 62 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 69623ec0e410..88718ca4f2cc 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index e627858db3b8..9d2915aa4b16 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,5 +1,5 @@
 DIST nikto-1.36.tar.gz 206921 BLAKE2B ed6cc343ddccd8d35a7df566c5facb91b31fa9ec1697bb962fb7a0fdf3bc396a95c60997267fdca929b6af2e599f1535a223bf04ccb53da485ce409f8bc4391f SHA512 e340eebc8323a689b1fe8358626f90d822f4eea4aaeba44c64f68c758fccdec7c3d5896b93739128b1b53429967d4e66ccb08b880066e0c63bed4e2748f94a45
-DIST nikto-2.1.5.tar.bz2 311580 BLAKE2B 5441953ed4f778efd06c784a5f608f4a00f61f1462a6fd637b5d490b84aecf4fc0d39cb2780469e00ba1a5c75c2ead63c2cb45a6f4b7c59ad243a671122264db SHA512 623b0fa923c05ecc4b69087321b544941f09b4d84fb7a32f6970e2ea42b2018f2c4e2d1cd0fabfc1c99a2ca7b57fd8c0d9f5f13c86e7eb102f00bdfd3062a95f
+DIST nikto-2.1.6_p20180122.tar.gz 511615 BLAKE2B 0937a5a52ae79e00da5bc53b089166cb2fc5cdf8311c4db55e421ddb44c22e31a9a964b02d75995c74b144d8fe05046895c4e54cfa7500aecd5d36787105a417 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91
 EBUILD nikto-1.36.ebuild 1270 BLAKE2B ba842c80fd091430066d6acefdb09530991264a797abc068fd7a18b27f00ae35f34e62ab795314e7f5deeca189247f0702323f064998238fdc2e3a4a489c3500 SHA512 0dee0f4e120434266ac23a0ad1611f9ca2367026166538aa584f00f26da50d1b89981d7d86ed665bc60ddec07091a1d361d6383d5e5c7c7b878083005c8e97df
-EBUILD nikto-2.1.5.ebuild 1279 BLAKE2B 16132b7ac907e6a4746d0ff49b6adb44b680480a7a3b14a0ed5bc2e1dce28227d90c37fba488dd4586fac7685c9957006b3a25a4b704e5dce2136abd8b11fa7c SHA512 9022bfcaba0a09e0214ba450fb68574828d87ca48f948dedc484fc9d802046f8e0882c16a787c64d20bf41a8757052feecec532d78145320e2fe209359692005
+EBUILD nikto-2.1.6_p20180122.ebuild 1219 BLAKE2B f8e7f956842f8025f3d778b1b1acb0a5e719a5bf8b835e987c50313eeb1d0701258607adfe0cfbf7dc6e843525094053026324c16387e3ad3f432fed29cb0fc2 SHA512 03a896addbd469b9d79a908b19d6f2ff7d51778b05f1b4940922accf0e1c36ee71d7c7ebda8d623844c3c2d8e4ebc3101d09f69337703b90ce493ffafe9d8d44
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
deleted file mode 100644
index 3ee500e7eeb1..000000000000
--- a/net-analyzer/nikto/nikto-2.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Web Server vulnerability scanner"
-HOMEPAGE="http://www.cirt.net/Nikto2"
-SRC_URI="http://www.cirt.net/nikto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ssl"
-
-RDEPEND="
-	dev-lang/perl
-	>=net-libs/libwhisker-2.5
-	ssl? (
-		dev-libs/openssl:0=
-		dev-perl/Net-SSLeay
-	)"
-
-src_prepare() {
-	sed -i -e 's:config.txt:nikto.conf:g' plugins/* || die
-	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:;
-	s:# EXECDIR=/usr/local/nikto:EXECDIR=/usr/share/nikto:;
-	s:# use LW2:use LW2:;
-	s:require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":# require "$CONFIGFILE{'\''PLUGINDIR'\''}/LW2.pm":;' nikto.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	insinto "/etc/${PN}"
-	doins "${PN}.conf"
-
-	mv "${PN}.pl" "${PN}" || die
-	dobin "${PN}"
-
-	insinto /usr/share/nikto
-	doins -r plugins templates databases
-
-	local NIKTO_PMS=(
-		JSON-PP.pm
-	)
-
-	einfo "Symlinking ${NIKTO_PMS[@]} to ${VENDOR_LIB}"
-
-	for _PM in "${NIKTO_PMS[@]}"; do
-		_TARGET="${VENDOR_LIB}/${_PM}"
-		dosym "/usr/share/nikto/plugins/${_PM}" "${_TARGET}"
-	done
-
-	dodoc docs/*.txt
-	dohtml docs/nikto_manual.html
-}
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
new file mode 100644
index 000000000000..167752e379bc
--- /dev/null
+++ b/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Web server vulnerability scanner"
+HOMEPAGE="http://www.cirt.net/Nikto2"
+COMMIT="b8454661c4dc9249cb515311cb2a80906a0a4b7a"
+MY_P="${PN}-${COMMIT}"
+SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ssl"
+
+# nikto provie its own libwhisker, do no use net-libs/libwhisker[ssl]
+# https://bugs.gentoo.org/533900
+RDEPEND="
+	dev-lang/perl
+	virtual/perl-JSON-PP
+	net-analyzer/nmap
+	ssl? (
+		dev-libs/openssl:0=
+		dev-perl/Net-SSLeay
+	)
+"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}/program"
+
+src_prepare() {
+	sed -i -e 's:config.txt:nikto.conf:g' plugins/* || die
+	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die
+	sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf || die
+
+	default
+}
+
+src_install() {
+	insinto /etc/nikto
+	doins nikto.conf
+
+	dobin nikto.pl replay.pl
+	dosym nikto.pl /usr/bin/nikto
+
+	dodir /usr/share/nikto
+	insinto /usr/share/nikto
+	doins -r plugins templates databases
+
+	dodoc docs/*.txt
+	dodoc docs/nikto_manual.html
+}
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 2a81aa5e679c..dbbe432d960c 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -11,6 +11,6 @@ DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
 EBUILD nmap-7.40.ebuild 4322 BLAKE2B fa5c7e0f84dc27f65047a3522244199a7a7024fb76177a36a77a224ca46b5e15d9e5b3f2201d19c8a7550ef637a3713d3fc493d419ad929af4b229fa8eb4899a SHA512 24f62b8cc52020de46f5274d870a65a4e87be189d07d08deaed7d5767e0be7f44e3841e5edfc19bdbec48f11b236ef564cf870ec7068672cebbefb05673e5295
-EBUILD nmap-7.70.ebuild 4532 BLAKE2B ed7fea3fa5fc29787d080df6160c25415c2ab4680cf84f268bab482399222d2cfa7d5aae542a58fc008f2eabe5211ff68c375e3cdd413473343625745d01fc28 SHA512 48cb26866d7615eaaf39d1f092fb28d7789f9bfcbd481ee5ab073e55f7f614110aea81c868413a10310dc9738be2e02b2420a0b5f3f5aed16007bbe72b7106d3
+EBUILD nmap-7.70.ebuild 4531 BLAKE2B a6952342726615fd95c21a88c6bf667052fafbe1fb2d1ef1ece41f91eeb19448f647ba46459279a2b272d235663d1a461e7585bb95184964659b817af383d47d SHA512 b1b4add1dbb760bb2ec0fa68a09f22e06f4ed99f40eb9d77cda353784e435097935a08b58b9d661687e6ca0c7cf658625b92dfe2351a02fdf1a7c6e106040c7d
 EBUILD nmap-9999.ebuild 4315 BLAKE2B 7d83887400200359844f202b29e30cb358a6c35a35f23754c69455f1807fdb9e1e6739f856d5e575058a01b9f0a4686a83602e53f3d202d80fcd33e636264141 SHA512 c9b708642cf84cc3caa3555085779ae3f3d93a575f07b033f5e562ed2dd3bc4f94f17f27244a4baf5b15b98ebafa1432df292d11c991a357fed65d21af2def18
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 9aef014d5c70..1d627ed723ed 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua