nikto-2.1.1 added patch to remove bundled LW2.pm

(Portage version: 2.1.7.17/git/Linux x86_64)
 (Signed Manifest commit)

5 files changed, 44 insertions, 17 deletions

diff --git a/net-analyzer/nikto/ChangeLog b/net-analyzer/nikto/ChangeLog
index fc244b2af..aa52f19cc 100644
--- a/net-analyzer/nikto/ChangeLog
+++ b/net-analyzer/nikto/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.24 2009/03/20 16:02:06 dertobi123 Exp $
 
+  22 Feb 2010; David Abbott <dabbott@gentoo.org> nikto-2.1.1.ebuild,
+  +files/nikto-2.1.1-PL.patch, -files/nikto.conf.patch:
+  Removing bundled LW2.pm
+
 *nikto-2.1.1 (20 Feb 2010)
 
   20 Feb 2010; David Abbott <dabbott@gentoo.org> -nikto-2.1.0.ebuild,
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 748b6d0ac..3d0db4d99 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX nikto-2.1.1-PL.patch 905 RMD160 43d90235c48e85733fd3743e622bdc06a39b1aa8 SHA1 9bd8f86b7f6287ce252e5c116d51c02f7fa9cf48 SHA256 702843f093edc5676bb49578fa74688246e36c83031079527123252f34cb53d3
 AUX nikto.conf 2742 RMD160 f369a60ff661ab64d0b27e817761dc7446869ec6 SHA1 3624fce0b76130035456481e6a7e607005c75eff SHA256 c6d677faad81f2d62d19a3de4d363c0934e7c731cf89f6827ed92d1490b6e986
-AUX nikto.conf.patch 480 RMD160 cd1ef2fd9bd266c5ea0bfee7c9babdb34f39cfff SHA1 a7753ba9f498349a8d8de3404440c46e7f1b4732 SHA256 326fc58bd2bf8038d2f94130acf4327df282b44c054a80055e13e9a1a1288d03
 DIST nikto-2.1.1.tar.bz2 262100 RMD160 16d4c897798f9831944b79cb9b487e2a719e2c89 SHA1 f1c4faf11d658376212ed9eb47b55e8f76bc9cbf SHA256 11443267c33ebdc696e39a9e76f5a842f5dc568afc7351d22310991ee900c29d
-EBUILD nikto-2.1.1.ebuild 1325 RMD160 dd4bd840b86e02cddac76f7446eff32f3046a1a0 SHA1 bed8adf79c490e5a64444a64be4a72f76bcea1f3 SHA256 6e7770f92be99ca7a1d53fc0ea3217859c284b8841b8289fa99fba3a0b3f032c
-MISC ChangeLog 3967 RMD160 db19ee14530447cc980229b9430359ee580da879 SHA1 c12713419b5625ccfc8352308bb00772abf64a55 SHA256 2afa4f776420cec12f254ba5147e4468c518b6df606b92bf372094197f3ba1d2
+EBUILD nikto-2.1.1.ebuild 1430 RMD160 b17dc0f31393f06790fd255f7fb88d917fd0b4c6 SHA1 a3c9d14c6c0d956bced488429deaf64ed0babe33 SHA256 1c2a8b488758cf027dd519892b7c19d5539eba627bbd50ffa0b81538ef0434cc
+MISC ChangeLog 4119 RMD160 4f0474dcdc3cff0c8d00fae9419a1905a74375d6 SHA1 13ac4d5eab73ab19e9ce9458923b0b9e52757350 SHA256 d3211b4a13231bf626dd397c9336b4643bd2b3b40232b2450786df3383daa34d
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuC8YYACgkQcZ+z4vAcSsybzwCfUUFszykS3Ter1rWiKh8UsGe9
+ApIAn2yZAHy/biuJ3EZa7CmGL5Q/kB4h
+=oHAI
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nikto/files/nikto-2.1.1-PL.patch b/net-analyzer/nikto/files/nikto-2.1.1-PL.patch
new file mode 100644
index 000000000..31d1b6f0e
--- /dev/null
+++ b/net-analyzer/nikto/files/nikto-2.1.1-PL.patch
@@ -0,0 +1,22 @@
+--- nikto.pl.orig	2010-02-02 14:28:54.000000000 -0500
++++ nikto.pl	2010-02-22 15:22:19.000000000 -0500
+@@ -49,7 +49,7 @@
+ $NIKTO{'DIV'}        = "-" x 75;
+ $NIKTO{'version'}    = "2.1.1";
+ $NIKTO{'name'}       = "Nikto";
+-$NIKTO{'configfile'} = "/etc/nikto.conf";    ### Change this line if your setup is having trouble finding it
++$NIKTO{'configfile'} = "/etc/nikto/nikto.conf";    ### Change this line if your setup is having trouble finding it
+ 
+ # read the --config option
+ {
+@@ -85,9 +85,7 @@
+ require "$NIKTOCONFIG{'PLUGINDIR'}/nikto_core.plugin";
+ nprint("T:$starttime: Starting", "d");
+ require "$NIKTOCONFIG{'PLUGINDIR'}/nikto_single.plugin";
+-require "$NIKTOCONFIG{'PLUGINDIR'}/LW2.pm";
+-
+-# use LW2;                   ### Change this line to use a different installed version
++use LW2;
+ 
+ ($a, $b) = split(/\./, $LW2::VERSION);
+ die("- You must use LW2 2.4 or later\n") if ($a != 2 || $b < 4);
diff --git a/net-analyzer/nikto/files/nikto.conf.patch b/net-analyzer/nikto/files/nikto.conf.patch
deleted file mode 100644
index 9b0c4d001..000000000
--- a/net-analyzer/nikto/files/nikto.conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nikto.pl.orig	2010-02-02 14:28:54.000000000 -0500
-+++ nikto.pl	2010-02-18 16:20:21.000000000 -0500
-@@ -49,7 +49,7 @@
- $NIKTO{'DIV'}        = "-" x 75;
- $NIKTO{'version'}    = "2.1.1";
- $NIKTO{'name'}       = "Nikto";
--$NIKTO{'configfile'} = "/etc/nikto.conf";    ### Change this line if your setup is having trouble finding it
-+$NIKTO{'configfile'} = "/etc/nikto/nikto.conf";    ### Change this line if your setup is having trouble finding it
- 
- # read the --config option
- {
diff --git a/net-analyzer/nikto/nikto-2.1.1.ebuild b/net-analyzer/nikto/nikto-2.1.1.ebuild
index 010c72e05..115b818dd 100644
--- a/net-analyzer/nikto/nikto-2.1.1.ebuild
+++ b/net-analyzer/nikto/nikto-2.1.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
 
-RDEPEND="dev-lang/perl
+DEPEND="dev-lang/perl
 		net-analyzer/nmap
 		ssl? (
 			dev-libs/openssl
@@ -23,11 +23,11 @@ RDEPEND="dev-lang/perl
 		)
 		>=net-libs/libwhisker-2.5"
 
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	rm docs/._* || die "removing osx files failed"
-	epatch "${FILESDIR}"/${PN}.conf.patch || die "patch failed"
+	epatch "${FILESDIR}"/${PF}-PL.patch || die "patch failed"
 }
 
 src_install() {
@@ -53,5 +53,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	einfo "Removing bundled LW2.pm"
+	rm /var/lib/nikto/plugins/LW2.pm || die "removing bundled library failed"
 	elog 'Default configuration file is "/etc/nikto/nikto.conf"'
 }