network/metasploit: Updated for version 4.7.0.

Indented text at 70 chars

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 55 insertions, 43 deletions

diff --git a/network/metasploit/README b/network/metasploit/README
index 66ad72a6d804..e11c8a25ab78 100644
--- a/network/metasploit/README
+++ b/network/metasploit/README
@@ -1,13 +1,14 @@
-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
-language and includes components written in C and assembler.
+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 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.
+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 own versions of Ruby, Java and PostgreSQL.
 
-Take a look at README.SLACKWARE for important build requirements and upgrading
-suggestions.
+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 78859573d498..730756ff6b0a 100644
--- a/network/metasploit/README.SLACKWARE
+++ b/network/metasploit/README.SLACKWARE
@@ -1,8 +1,8 @@
 Please run the SlackBuild script as root user.
 
-You will need "postgres" user and group before running the installer, if you
-haven't installed SlackBuilds PostgreSQL you should run these commands to be
-compatible:
+You will need "postgres" user and group before running the installer,
+if you haven't installed SlackBuilds PostgreSQL you should run these
+commands to be compatible:
 
   # groupadd -g 209 postgres
   # useradd -u 209 -g 209 -d /var/lib/pgsql postgres
@@ -14,8 +14,8 @@ otherwise, you're already setup. Also, remember to add something like:
     /etc/rc.d/rc.metasploit start
   fi
 
-to /etc/rc.d/rc.local to start the shipped PostgreSQL daemon and something
-like:
+to /etc/rc.d/rc.local to start the shipped PostgreSQL daemon and
+something like:
 
   # Stop Metasploit Framework PostgreSQL
   if [ -x /etc/rc.d/rc.metasploit ]; then
@@ -24,24 +24,28 @@ like:
 
 to /etc/rc.d/rc.local_shutdown to stop the service.
 
-Please note that rc.metasploit only starts the framework's PostgreSQL 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:
+Please note that rc.metasploit only starts the framework's PostgreSQL
+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:
 
   # PG_PORT="5454" ./metasploit.SalckBuild
 
-An optional cron script to keep the framework up to date is distributed inside
-the /usr/doc/metasploit-${VERSION} directory and it's called "msfupdate.sh",
-there also is a logrotate config file called "msfupdate.logrotate" which can
-be useful.
+An optional cron script to keep the framework up to date is
+distributed inside the /usr/doc/metasploit-${VERSION} directory and
+it's called "msfupdate.sh", there also is a logrotate config file
+called "msfupdate.logrotate" which can be useful.
diff --git a/network/metasploit/metasploit.SlackBuild b/network/metasploit/metasploit.SlackBuild
index 2c846a468c6b..3a7d6458fd67 100644
--- a/network/metasploit/metasploit.SlackBuild
+++ b/network/metasploit/metasploit.SlackBuild
@@ -27,7 +27,7 @@
 # variable just try to launch the script redefining this.
 
 PRGNAM=metasploit
-VERSION=${VERSION:-4.6.0}
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -97,7 +97,13 @@ $CWD/metasploit-$VERSION-linux$INSTALLERARCH-installer.run \
 # Stop Metasploit Framework PostgreSQL
 echo "Stopping Metasploit Framework..."
 INITSCRIPT=metasploit
-/etc/init.d/$INITSCRIPT stop
+if ! /etc/init.d/$INITSCRIPT stop; then
+	echo "Waiting for PostgreSQL to finish deferred work..."
+	PSPID=$(head -1 /$INSTDIR/postgresql/data/postmaster.pid)
+	while kill -0 $PSPID 2>/dev/null; do
+		sleep 1;
+	done
+fi
 
 # Move install dir
 mkdir -p $PKG/$BASEINSTDIR
@@ -112,10 +118,11 @@ 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
-# Default installation makes pro stuff, starting metasploit_SCRIPT and PROSVC_SCRIPT. Disable this...
-# We want only to start framework's PostgresSQL
+# Default installation makes pro stuff, starting METASPLOIT_SCRIPT, PROSVC_SCRIPT and WORKER_SCRIPT. Disable this...
+# We want only to start framework's PostgreSQL
 chmod -x $PKG/$INSTDIR/apps/pro/ui/scripts/ctl.sh 
 chmod -x $PKG/$INSTDIR/apps/pro/engine/scripts/ctl.sh 
+chmod -x $PKG/$INSTDIR/apps/pro/ui/scripts/worker_ctl.sh
 
 # Install /usr/bin links
 mkdir -p $PKG/usr/bin
diff --git a/network/metasploit/metasploit.info b/network/metasploit/metasploit.info
index 243067e56448..cfd18981fea8 100644
--- a/network/metasploit/metasploit.info
+++ b/network/metasploit/metasploit.info
@@ -1,10 +1,10 @@
 PRGNAM="metasploit"
-VERSION="4.6.0"
+VERSION="4.7.0"
 HOMEPAGE="http://www.metasploit.com/"
-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"
+DOWNLOAD="http://downloads.metasploit.com/data/releases/archive/metasploit-4.7.0-linux-installer.run"
+MD5SUM="9d4abba0e05bb972ba805e6e0e63cea0"
+DOWNLOAD_x86_64="http://downloads.metasploit.com/data/releases/archive/metasploit-4.7.0-linux-x64-installer.run"
+MD5SUM_x86_64="b36d8c7282f91e8bcb0138f2feb702cf"
 REQUIRES=""
 MAINTAINER="Andrea Villa"
 EMAIL="andreakarimodm@gmail.com"