network/metasploit: Updated for version 4.6.0.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

4 files changed, 30 insertions, 9 deletions

diff --git a/network/metasploit/README b/network/metasploit/README
index 08d23d9bea2c7..66ad72a6d8042 100644
--- a/network/metasploit/README
+++ b/network/metasploit/README
@@ -1,5 +1,5 @@
-The Metasploit Framework is a development platform for creating security 
-tools and exploits. The framework is used by network security professionals
+The Metasploit Framework is a development platform for creating security
+tools and exploits. The framework is used by network  security professionals
 to perform penetration tests, system administrators to verify patch
 installations, product vendors to perform regression testing, and security
 researchers world-wide. The framework is written in the Ruby programming
@@ -7,7 +7,7 @@ language and includes components written in C and assembler.
 
 This is just a repackaged version of the installer you get from the Metasploit
 download page. This is an all-in-one installer with Metasploit's own versions
-of Ruby, Java, and PostgreSQL.
+of Ruby, Java and PostgreSQL.
 
 Take a look at README.SLACKWARE for important build requirements and upgrading
 suggestions.
diff --git a/network/metasploit/README.SLACKWARE b/network/metasploit/README.SLACKWARE
index 7e4396e081ac2..276887a723b5f 100644
--- a/network/metasploit/README.SLACKWARE
+++ b/network/metasploit/README.SLACKWARE
@@ -23,6 +23,19 @@ like:
   fi
 
 to /etc/rc.d/rc.local_shutdown to stop the service.
+
+Please note that rc.metasploit only starts the framework's PostrgreSQL database.
+In latest releases, Rapid7 introduced a product key mechanism to the framework.
+In order to run pro applications included, the user requires a valid product key
+released by Rapid7; those are disabled for running by default. Upgrading the
+whole binary distribution is also not possible without the key, altough msf3
+core directory (which contains the exploits' code as well as all the other modules)
+will be upgraded by "msfupdate" as expected.
+Product key is therefore not required in any way to use the full capabilities
+of the framework, as well as upgrading correctly the core directory through git.
+In case you want to obtain a valid product key, it is possible to register the
+Metasploit Community Edition for free.
+
 Default database server listening port is 7175, if you want to use another
 port, just export the PG_PORT variable when running the SlackBuild, like this:
 
diff --git a/network/metasploit/metasploit.SlackBuild b/network/metasploit/metasploit.SlackBuild
index 4ce29d37994a4..2c846a468c6b4 100644
--- a/network/metasploit/metasploit.SlackBuild
+++ b/network/metasploit/metasploit.SlackBuild
@@ -23,8 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# If you want to build a different version from the one defined in the VERSION
+# variable just try to launch the script redefining this.
+
 PRGNAM=metasploit
-VERSION=${VERSION:-4.5.2}
+VERSION=${VERSION:-4.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -85,6 +88,7 @@ mkdir -p $TMP $PKG $OUTPUT
 echo "Installing the Metasploit Framework..."
 chown root:root $CWD/metasploit-$VERSION-linux$INSTALLERARCH-installer.run
 chmod 755 $CWD/metasploit-$VERSION-linux$INSTALLERARCH-installer.run
+
 $CWD/metasploit-$VERSION-linux$INSTALLERARCH-installer.run \
   --mode unattended \
   --unattendedmodeui none \
@@ -104,6 +108,7 @@ mv /$INSTDIR $PKG/$BASEINSTDIR/
 # the uninstall script anyway, so no problem if we made it more Slackware-ish
 echo "Fixing Metasploit Framework init script..."
 mkdir -p $PKG/etc/rc.d
+rm -f /etc/rc.d/rc?.d/S80metasploit /etc/rc.d/rc?.d/K30metasploit
 mv /etc/init.d/$INITSCRIPT $PKG/etc/rc.d/rc.$INITSCRIPT.new
 chown root:root $PKG/etc/rc.d/rc.$INITSCRIPT.new
 chmod 755 $PKG/etc/rc.d/rc.$INITSCRIPT.new
@@ -136,6 +141,9 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Create a symbolic link to msf3 core directory for convenience
+ln -s apps/pro/msf3 $PKG/$INSTDIR/msf3
+
 # Do NOT chown -R root:root or it will bork the shipped PostgreSQL
 # installation: the bitrock installer should have taken care of permissions
 cd $PKG
diff --git a/network/metasploit/metasploit.info b/network/metasploit/metasploit.info
index b3bc17a8e21f7..243067e564487 100644
--- a/network/metasploit/metasploit.info
+++ b/network/metasploit/metasploit.info
@@ -1,10 +1,10 @@
 PRGNAM="metasploit"
-VERSION="4.5.2"
+VERSION="4.6.0"
 HOMEPAGE="http://www.metasploit.com/"
-DOWNLOAD="http://downloads.metasploit.com/data/releases/archive/metasploit-4.5.2-linux-installer.run"
-MD5SUM="ae927cd94b7140c9ee559951f18941e5"  
-DOWNLOAD_x86_64="http://downloads.metasploit.com/data/releases/archive/metasploit-4.5.2-linux-x64-installer.run"
-MD5SUM_x86_64="2472c672951d6a1171c3c352a6577301"
+DOWNLOAD="http://downloads.metasploit.com/data/releases/archive/metasploit-4.6.0-linux-installer.run"
+MD5SUM="40d403f044085a6bd65e229d17b0e6b0"
+DOWNLOAD_x86_64="http://downloads.metasploit.com/data/releases/archive/metasploit-4.6.0-linux-x64-installer.run"
+MD5SUM_x86_64="85acd97cbdb730ba03e8016bc169b9c0"
 REQUIRES=""
 MAINTAINER="Andrea Villa"
 EMAIL="andreakarimodm@gmail.com"