network/w3af: Updated for version 1.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

9 files changed, 73 insertions, 24 deletions

diff --git a/network/w3af/README b/network/w3af/README
index cae105d437cb..edf4d3980f20 100644
--- a/network/w3af/README
+++ b/network/w3af/README
@@ -1,7 +1,8 @@
-w3af is a Web Application Attack and Audit Framework. The project's goal is to
-create a framework to find and exploit web application vulnerabilities that is
-easy to use and extend.
+w3af is a Web Application Attack and Audit Framework. The project's goal is
+to create a framework to find and exploit web application vulnerabilities
+that is easy to use and extend.
 
-The console app requires fpconst, pygoogle, nltk, SOAPpy, pyPdf, BeautifulSoup,
-PyOpenSSL, json-py, scapy, SocksiPy, and python-cluster.
-The graphical interface requires graphviz and xdot.
+The console app requires SOAPpy, nltk, pyOpenSSL, lxml, pysvn and scapy.
+The graphical interface requires graphviz and pygtksourceview.
+
+Take a look at README.SLACKWARE for additional information.
diff --git a/network/w3af/README.SLACKWARE b/network/w3af/README.SLACKWARE
new file mode 100644
index 000000000000..d32799af6cfd
--- /dev/null
+++ b/network/w3af/README.SLACKWARE
@@ -0,0 +1,8 @@
+Starting from w3af 1.0-stable, auto updates are automatically enabled. They
+will not work unless you start w3af as root, however there is an optional cron
+script to keep the distribution up to date. It is distributed inside the
+/usr/doc/w3af-${VERSION} directory and it's called "w3afupdate.sh", there also
+is a logrotate config file called "w3afupdate.logrotate" which can be useful.
+You should also edit ~/.w3af/startup.conf and set:
+  auto-update = false
+inside [STARTUP_CONFIG].
diff --git a/network/w3af/slack-desc b/network/w3af/slack-desc
index c6e411a84d1c..808b14fb6d2d 100644
--- a/network/w3af/slack-desc
+++ b/network/w3af/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-    |-----handy-ruler-------------------------------------------------------|
+    |-----handy-ruler------------------------------------------------------|
 w3af: w3af (Web Application Attack and Audit Framwork)
 w3af:
 w3af: w3af is a Web Application Attack and Audit Framework. The project's 
diff --git a/network/w3af/w3af.SlackBuild b/network/w3af/w3af.SlackBuild
index 648be40a7ef5..6f2b59f44275 100644
--- a/network/w3af/w3af.SlackBuild
+++ b/network/w3af/w3af.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for w3af.
 
-# Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
+# Copyright 2009-2011 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=w3af
-VERSION=${VERSION:-1.0_rc3}
+VERSION=${VERSION:-1.0}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=$(echo $VERSION | tr _ -)
+SRCVERSION="1.0-stable"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -45,7 +45,12 @@ mkdir -p $TMP $PKG $OUTPUT
 # Install w3af in /opt
 mkdir -p $PKG/opt
 tar xvf $CWD/${PRGNAM}-${SRCVERSION}.tar.bz2 -C $PKG/opt
-cd $PKG/opt/$PRGNAM
+# Version the installation directory to allow easier upgrades
+( cd $PKG/opt
+  mv $PRGNAM $PRGNAM-$VERSION
+  ln -sf $PRGNAM-$VERSION $PRGNAM
+)
+cd $PKG/opt/$PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,22 +58,34 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Remove extlib: users do not need w3af's dependencies sources
-rm -r extlib
+# We can't remove extlib anymore: the autoupdate feature (very similar to
+# Metasploit Framework own autoupdate feature) will break down as it is
+# subversion based
+#
+## Remove extlib: users do not need w3af's dependencies sources
+#rm -r extlib
 
 # Add launchers in /usr/bin
-install -Dm0755 $CWD/w3af_console $PKG/usr/bin/w3af_console
-install -Dm0755 $CWD/w3af_gui $PKG/usr/bin/w3af_gui
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin
+  cat $CWD/w3af_console > w3af_console
+  cat $CWD/w3af_gui > w3af_gui
+  chmod 755 w3af_*
+)
 
 # Every useful doc is included inside the w3af/readme folder, just copy over the
-# GPL and README
+# GPL and README and the cron scripts
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $PKG/opt/$PRGNAM/readme/
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+( cd $PKG/opt/$PRGNAM-$VERSION/readme/
+  cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+)
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/w3afupdate.sh > $PKG/usr/doc/$PRGNAM-$VERSION/w3afupdate.sh
+cat $CWD/w3afupdate.logrotate > $PKG/usr/doc/$PRGNAM-$VERSION/w3afupdate.logrotate
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/w3af/w3af.info b/network/w3af/w3af.info
index 63e8ead3b027..d246c6c6c46c 100644
--- a/network/w3af/w3af.info
+++ b/network/w3af/w3af.info
@@ -1,10 +1,10 @@
 PRGNAM="w3af"
-VERSION="1.0-rc3"
+VERSION="1.0"
 HOMEPAGE="http://w3af.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/w3af/w3af/w3af%201.0-rc3%20%5Bmoyogui%5D/w3af-1.0-rc3.tar.bz2"
-MD5SUM="0a6e803636ab3b46ec950c07e6d4baf5"
+DOWNLOAD="http://downloads.sourceforge.net/project/w3af/w3af/w3af%201.0-stable/w3af-1.0-stable.tar.bz2"
+MD5SUM="4ac1fb2cfcbbefb8c0caa813dd822723"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="dsomero"
+APPROVED="Niels Horn"
diff --git a/network/w3af/w3af_console b/network/w3af/w3af_console
index 925f61b1c292..4289d98cc756 100644
--- a/network/w3af/w3af_console
+++ b/network/w3af/w3af_console
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -e
+
 ( cd /opt/w3af
   ./w3af_console $@
 )
diff --git a/network/w3af/w3af_gui b/network/w3af/w3af_gui
index d035199c0ad5..cba1980cad91 100644
--- a/network/w3af/w3af_gui
+++ b/network/w3af/w3af_gui
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -e
+
 ( cd /opt/w3af
   ./w3af_gui $@
 )
diff --git a/network/w3af/w3afupdate.logrotate b/network/w3af/w3afupdate.logrotate
new file mode 100644
index 000000000000..e7c9fc1c0494
--- /dev/null
+++ b/network/w3af/w3afupdate.logrotate
@@ -0,0 +1,10 @@
+/var/log/w3afupdate.log {
+  daily
+  rotate 5
+  compress
+  delaycompress
+  missingok
+  notifempty
+  create 0644 root root
+}
+
diff --git a/network/w3af/w3afupdate.sh b/network/w3af/w3afupdate.sh
new file mode 100644
index 000000000000..5f2aaf9f78b8
--- /dev/null
+++ b/network/w3af/w3afupdate.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+( cd /opt/w3af
+  svn up >> /var/log/w3afupdate.log 2>&1
+)