1 files changed, 30 insertions, 13 deletions
diff --git a/network/w3af/w3af.SlackBuild b/network/w3af/w3af.SlackBuild
index 648be40a7e..6f2b59f442 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}