msfweb actually doesn't exist anymore

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

5 files changed, 8 insertions, 40 deletions

diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index 5726b1bc4d5d..0d4a2100d005 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.52 2010/11/14 22:55:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.53 2010/11/14 23:16:38 patrick Exp $
+
+  14 Nov 2010; Patrick Lauer <patrick@gentoo.org> -files/msfweb3.5.confd,
+  metasploit-3.5.0.ebuild, -files/msfweb3.5.initd:
+  msfweb actually doesn't exist anymore
 
 *metasploit-3.5.0 (14 Nov 2010)
 
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index f7bf85e56962..e721b1d62d8a 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -6,8 +6,6 @@ AUX msfweb3.3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3b
 AUX msfweb3.3.initd 673 RMD160 b50f2ae6759f51b39d90431045b8a99459aa5ce9 SHA1 e910a022e658c6077474f9c8c2c8f9b6210511cc SHA256 a2d063bbcea8d5e4b5a1a5f62f57696d8ad8c62d1608cbc02a8585c1cd15e19c
 AUX msfweb3.4.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
 AUX msfweb3.4.initd 673 RMD160 37b0de42a08bb5ac25b8e0592fd77ab255a27448 SHA1 af608f5ef6830909bd8a736d97a443dc5ad666a5 SHA256 eacf33f458de1137555882ac8921880d58f5b89f9ac597ef91f6cf5ec78b2547
-AUX msfweb3.5.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
-AUX msfweb3.5.initd 673 RMD160 80392c5f938cc7a7db026e9f97eca17d73e2d1e3 SHA1 e3c12515f4cef616f6b7d27b57112ad90cc44c56 SHA256 19c08b3232f2e4322641a30eb5192dae94f2f2eec43ac0358b0d70dfd726c5b8
 AUX msfweb3.confd 234 RMD160 2cad154dc7ac4e836e8b4dd8c4366521742f90b3 SHA1 c3bac2879f00f56ff0a0737eea6a4d200f5761c9 SHA256 bc911b32a2c81d337135c7614e0982e102056fb174d274177cc2b8aca717e97f
 AUX msfweb3.initd 578 RMD160 47baabd2beb338fd8a067694830400801a028c1a SHA1 6a5ec10c2c82925e6e731c46f8b0fcfa607b9502 SHA256 79c74ded23d8541cf470e6c24aa2ebf45bcb4460e456c273ec0e1da4d156f066
 DIST framework-2.7.tar.gz 5800216 RMD160 cfdf2705522c845bb4405413207a7df0f3873b94 SHA1 da5d41dfa13e549aacd4fbf2994877cbe80ceed9 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f
@@ -19,6 +17,6 @@ EBUILD metasploit-2.7.ebuild 1451 RMD160 86b02866587de2829a1905ab274cbe4abdd4199
 EBUILD metasploit-3.3.3.ebuild 2919 RMD160 69d867f0c6e7448da1953fe157a28d57718e8235 SHA1 a7344a0baa68cd6a8717b94ef998066f90158e17 SHA256 d65d28b77e8326f9fde85225bef7f7a37e2327fd3f69075653bd13b440e3711b
 EBUILD metasploit-3.4.0.ebuild 2919 RMD160 0ea84526740db98f902db71e87aaaf73ac0db5ef SHA1 e2a5b180f53844ef927e4412296aaa1d0575fd2a SHA256 75eb237471c8d9cce33d1d48eda9ff0dfee316c1d8e954225e70243109ca0c47
 EBUILD metasploit-3.4.1.ebuild 2919 RMD160 a76cfa206a4fa634137d37291cb4b9aa9e7a0c00 SHA1 39236ae0616a7b7cc84e4b270ff5f464c9e1b355 SHA256 de08c9e20d364a10acfacb9e3f5b73e74598b63663f91ec73808941763c0e54c
-EBUILD metasploit-3.5.0.ebuild 2919 RMD160 48c458cdea7d9c500e444e51c0d158e67994125a SHA1 27f00aeb038f39f51be08a4f898d4bed1bf238a1 SHA256 8f7666201914b2f2a986bc16dd1c47e431711d8ca7b266746f6ddfa86eb033ee
-MISC ChangeLog 8998 RMD160 6382e3d4ac86c735d8c08f13de6e727eb0982d6f SHA1 2f0af234cd03f78bff0745d0f1af1acb2804f28b SHA256 2986d8afc664f2faa6987d6635361a4ea699e568614b1c89a64fb137d52eb8b3
+EBUILD metasploit-3.5.0.ebuild 2745 RMD160 4c520154549bd47c14cd22651fb4f39e320e395a SHA1 76fc5dc05e8ed3dddb966643a9d5cd5335acc92e SHA256 fa0a936f9a8d032b7f8ce8440ed77672e5b869ea710c34945886393e0ae1cc42
+MISC ChangeLog 9164 RMD160 402a9c80aa56967b7bcc62b21c6da8d1bf6542c5 SHA1 3c7bfd32c357194b3fa73a336cee0c88c40ba9f7 SHA256 003e2e9e324089033094141aebccc1ebed55dc868f0bfebf83e1fc488375462e
 MISC metadata.xml 864 RMD160 0843a578171a49e091f29d1b1c700bf45df48961 SHA1 024eeb7d6cf06fac61952e51af1e17f091e26e46 SHA256 8af2db5b683a4de1f16cf076ba1baa9ffc1c04897ca5c0f8c9e47ad64e85f0f7
diff --git a/net-analyzer/metasploit/files/msfweb3.5.confd b/net-analyzer/metasploit/files/msfweb3.5.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.5.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.5.initd b/net-analyzer/metasploit/files/msfweb3.5.initd
deleted file mode 100644
index bf8040c24710..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.5.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.5.initd,v 1.1 2010/11/14 22:55:42 patrick Exp $
-
-PIDFILE=/var/run/msfweb3.5.pid
-
-start() {
-	ebegin "Starting msfweb3.5"
-	start-stop-daemon --start --quiet --background --startas msfweb3.4 --exec /usr/lib/metasploit3.4/msfweb \
-		--pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
-	eend $?
-	einfo "Note: msfweb3.5 is started but needs some before it serves clients."
-}
-
-stop() {
-	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
-	eend $?
-}
diff --git a/net-analyzer/metasploit/metasploit-3.5.0.ebuild b/net-analyzer/metasploit/metasploit-3.5.0.ebuild
index 4cae814a7872..cf2c8b473c37 100644
--- a/net-analyzer/metasploit/metasploit-3.5.0.ebuild
+++ b/net-analyzer/metasploit/metasploit-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.5.0.ebuild,v 1.1 2010/11/14 22:55:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.5.0.ebuild,v 1.2 2010/11/14 23:16:38 patrick Exp $
 
 SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
 
@@ -49,10 +49,6 @@ src_install() {
 
 	chown -R root:0 "${D}"
 
-	newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
-		|| die "newinitd failed"
-	newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
-		|| die "newconfd failed"
 }
 
 pkg_postinst() {