network/framework: Updated for version 3.3.2

5 files changed, 67 insertions, 47 deletions

diff --git a/network/framework/README b/network/framework/README
index b8e95701c2250..1b19ae69d93a9 100644
--- a/network/framework/README
+++ b/network/framework/README
@@ -1,20 +1,16 @@
-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 tarball you get from the
-Metasploit download page. To succesfully run the framework web 
-interface, install the rubygems package (avalaible on SlackBuilds.org) 
-and then get the Ruby On Rails gem via the commannd:
+This is just a repackaged version of the installer you get from the Metasploit
+download page. As the framework now depends on ruby-1.9, which is not yet
+mainstream, the Rapid7 Metasploit team decided to distribute an all-in-one
+installer with everything needed inside it, both for the ruby side and the
+subversion one.
 
-# gem install -v=1.2.2 rails
-
-If you want to use the Autopwn feature of metasploit, install the
-PostgreSQL database server (also avalaible on SlackBuilds.org) and
-create a "metasploit3" database.
-Finally, if you want to run the selfupdate feature, be sure you 
-have subversion installed.
+An optional cron script to keep the framework up to date is distributed inside
+the /usr/doc/framework-3.3 directory. Also, note that the install directory
+has been switched to /opt/metasploit3.
diff --git a/network/framework/framework.SlackBuild b/network/framework/framework.SlackBuild
index 11520b0cf8c74..7fa623f7683fa 100644
--- a/network/framework/framework.SlackBuild
+++ b/network/framework/framework.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for Metasploit Framework
-#
+
 # Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=framework
-VERSION=${VERSION:-3.2}
-ARCH=${ARCH:-noarch}
+VERSION=${VERSION:-3.3.2}
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -33,38 +33,58 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+BASEINSTDIR="opt"
+INSTDIR="$BASEINSTDIR/metasploit3"
+
+if [ "$ARCH" = "i486" ]; then
+  INSTALLERARCH="i686"
+elif [ "$ARCH" = "i686" ]; then
+  INSTALLERARCH="i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  INSTALLERARCH="x86_64"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
-# Install the framework in /opt
-mkdir -p $PKG/opt
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PKG/opt
-cd $PKG/opt/$PRGNAM-$VERSION
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+# Unpack the installer
+sh $CWD/framework-$VERSION-linux-$INSTALLERARCH.run --noexec --keep --target $TMP/$PRGNAM-$VERSION
+
+# Install the framework under /opt/metasploit3
+( cd $TMP/$PRGNAM-$VERSION
+  mkdir -p $PKG/$INSTDIR
+  echo "Extracting the Metasploit operating environment..."
+  tar --directory=$PKG/$BASEINSTDIR -xf metasploit.tar
+  cp run.sh env.sh $PKG/$INSTDIR/
+  cp msfupdate $PKG/$INSTDIR/app/
+  echo ""
 
-# According to the framework user guide is ok to just link the binaries
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin
-  for file in $(ls ../../opt/$PRGNAM-$VERSION/msf*); do
-    ln -sf $file $(basename $file)
-  done
-)
+  echo "Extracting the Metasploit Framework..."
+  tar --directory=$PKG/$INSTDIR -xf msf3.tar
+  echo ""
+
+  echo "Installing links into /usr/bin..."
+  mkdir -p $PKG/usr/bin
+  ( cd $PKG/usr/bin
+    for file in $(ls ../../$INSTDIR/bin/msf*); do
+      ln -sf $file $(basename $file)
+    done
+  )
+  echo ""
+) || exit 1
 
 # Every useful doc is included inside the framework folder, just copy over the
-# README which contains the important copyright disclaimer
+# README which contains the important copyright disclaimer and the cron script
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/$PRGNAM-$VERSION/README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/$INSTDIR/msf3/README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/msfupdate.sh > $PKG/usr/doc/$PRGNAM-$VERSION/msfupdate.sh
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+chown -R root:root .
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/framework/framework.info b/network/framework/framework.info
index e6fa44f7e01bf..ca5647ec82ae6 100644
--- a/network/framework/framework.info
+++ b/network/framework/framework.info
@@ -1,8 +1,10 @@
 PRGNAM="framework"
-VERSION="3.2"
-HOMEPAGE="http://metasploit.com/framework/"
-DOWNLOAD="http://spool.metasploit.com/releases/framework-3.2.tar.gz"
-MD5SUM="d543bda031b36a247912aa9c6a0f74d9"
+VERSION="3.3.2"
+HOMEPAGE="http://www.metasploit.com/framework/"
+DOWNLOAD="http://www.metasploit.com/releases/framework-3.3.2-linux-i686.run"
+DOWNLOAD_x86_64="http://www.metasploit.com/releases/framework-3.3.2-linux-x86_64.run"
+MD5SUM="f0625953ea28702764b79e6d2cacf651"
+MD5SUM_x86_64="428e00719132fb4f1302ea59ee12b11d"
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/network/framework/msfupdate.sh b/network/framework/msfupdate.sh
new file mode 100644
index 0000000000000..b7e95054db298
--- /dev/null
+++ b/network/framework/msfupdate.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/msfupdate > /var/log/msfupdate.log 2>&1
diff --git a/network/framework/slack-desc b/network/framework/slack-desc
index da99fab2d1290..ddc2bd0831baa 100644
--- a/network/framework/slack-desc
+++ b/network/framework/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-framework: The Metasploit Framework (http://metasploit/framework/)
+framework: The Metasploit Framework (http://www.metasploit/framework/)
 framework:
 framework: The Metasploit Framework is a development platform for creating
 framework: security tools and exploits. The framework is used by network