From 6e5b81854b079e562c3aaae315f7d636e08288e9 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Fri, 7 Aug 2020 11:59:08 +0800
Subject: [PATCH] nikto-2.1.6_p20200726.ebuild

---
 net-analyzer/nikto/Manifest                   |  3 +-
 net-analyzer/nikto/nikto-2.1.6-r1.ebuild      |  2 +-
 .../nikto/nikto-2.1.6_p20181021.ebuild        | 50 -------------------
 ...22.ebuild => nikto-2.1.6_p20200726.ebuild} | 13 ++---
 4 files changed, 9 insertions(+), 59 deletions(-)
 delete mode 100644 net-analyzer/nikto/nikto-2.1.6_p20181021.ebuild
 rename net-analyzer/nikto/{nikto-2.1.6_p20180122.ebuild => nikto-2.1.6_p20200726.ebuild} (76%)

diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 98269f7b3..48fd4e617 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,4 +1,3 @@
 DIST nikto-2.1.6.tar.gz 490743 BLAKE2B 81947a90552e98ac06a72476e353335347c65165a493b209ca31e970aa0afbb0ab41dddcf714f8af2782507c3e7bef20b09a24ad2f0796cd8daa1c367559ac71 SHA512 13632018ef6862de7dc53c674d7266fcfb7e164bcf3070327c103cbf8737720ffb710ccc8949acc920a6e0a85da1bb7575d073ee245bc2ba3a8a292ad1695e69
-DIST nikto-2.1.6_p20180122.tar.gz 511615 BLAKE2B 0937a5a52ae79e00da5bc53b089166cb2fc5cdf8311c4db55e421ddb44c22e31a9a964b02d75995c74b144d8fe05046895c4e54cfa7500aecd5d36787105a417 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91
-DIST nikto-2.1.6_p20181021.tar.gz 514852 BLAKE2B 0bda0c600d57125c8691cce08034f441881cd246fbf800584253a0e6702e8860040a482d8cbadc99c67714a6cdbb4e86abbf61614ec698fab7ad3536858f9e44 SHA512 3d242187381e008cf6167ed52911c53de2e8f21e4499153be186e0421461723688df9ee95eae9fbb982137aaa2e1b7975c2de5bbce9f25ebc81ad8f27fcf132e
 DIST nikto-2.1.6_p20190508.tar.gz 515878 BLAKE2B 10d1361ae123843995ea30e9be990f8f2968b41331622a8dc3bedcada785c9fa6159d178906c7a37b88069dd2d4e3e2d65a12b5715ecfdcfcbe8b469da77b471 SHA512 af09895b81054c788d070b13db0b22b403d1a0ac9b402a635676a185ab433c03faef6a47c882cbae62d608fa6c2f27594884fdc2838b8c540627b8b7f1fb570f
+DIST nikto-2.1.6_p20200726.tar.gz 521440 BLAKE2B ae8630b6821e0dcddd5b0293d53e9f032eb4036f103a5d238d263314404ddc021e18b8adb3ce2af4dc302eb2a6962e78302b7e57cc516c7aafa447d80817a755 SHA512 a4b93c764c26ba23c781fa4f0fbce9b7359e67b5cae0a78a66b98a917310413fb532bf10030001f18b0fe79e0791ab3e61ebc9e390b18108dac307e6641655a4
diff --git a/net-analyzer/nikto/nikto-2.1.6-r1.ebuild b/net-analyzer/nikto/nikto-2.1.6-r1.ebuild
index 84167d62a..9414342e1 100644
--- a/net-analyzer/nikto/nikto-2.1.6-r1.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sullo/nikto/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20181021.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20181021.ebuild
deleted file mode 100644
index 36b18b5e1..000000000
--- a/net-analyzer/nikto/nikto-2.1.6_p20181021.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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="7d5cff390f43bb5ceef4dfd436d600a57c2c79ee"
-MY_P="${PN}-${COMMIT}"
-SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-#nikto provie its own libwhisker, do no use net-libs/libwhisker[ssl]
-RDEPEND="dev-lang/perl
-	virtual/perl-JSON-PP
-	net-analyzer/nmap
-	ssl? (
-		dev-libs/openssl
-		dev-perl/Net-SSLeay
-	)
-"
-
-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/nikto/nikto-2.1.6_p20180122.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20200726.ebuild
similarity index 76%
rename from net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
rename to net-analyzer/nikto/nikto-2.1.6_p20200726.ebuild
index 6287de960..c5e25e5be 100644
--- a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.6_p20200726.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Web server vulnerability scanner"
 HOMEPAGE="http://www.cirt.net/Nikto2"
-COMMIT="b8454661c4dc9249cb515311cb2a80906a0a4b7a"
+COMMIT="ffc7efe436d9816ec92e36b69506dd1be3242822"
 MY_P="${PN}-${COMMIT}"
 SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
@@ -29,21 +29,22 @@ 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
+	sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die
+	sed -i -e 's:NIKTODTD=docs:NIKTODTD=/usr/share/nikto/docs:' nikto.conf.default || die
 
 	default
 }
 
 src_install() {
 	insinto /etc/nikto
-	doins nikto.conf
+	newins nikto.conf.default 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
+	doins -r docs plugins templates databases
 
 	dodoc docs/*.txt
 	dodoc docs/nikto_manual.html