4 files changed, 26 insertions, 10 deletions
diff --git a/network/sqlmap/doinst.sh b/network/sqlmap/doinst.sh
new file mode 100644
index 0000000000000..62cfb92237f67
--- /dev/null
+++ b/network/sqlmap/doinst.sh
@@ -0,0 +1,13 @@
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config opt/sqlmap/sqlmap.conf.new
diff --git a/network/sqlmap/sqlmap b/network/sqlmap/sqlmap
index c582f458ec3e7..7ecad6a8b60c7 100644
--- a/network/sqlmap/sqlmap
+++ b/network/sqlmap/sqlmap
@@ -1,4 +1,4 @@
 #!/bin/sh
-( cd /opt/sqlmap-0.7
+( cd /opt/sqlmap
   ./sqlmap.py $@
 )
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index c5551917b6a12..2167b033651c1 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sqlmap.
 #
-# Copyright 2009-2010 Marco Bonetti <sid77@slackware.it>
+# Copyright 2010 Marco Bonetti <sid77@slackware.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlmap
-VERSION=${VERSION:-0.7}
+VERSION=${VERSION:-0.8}
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -41,25 +41,28 @@ mkdir -p $TMP $PKG $OUTPUT
 # Install sqlmap in /opt
 mkdir -p $PKG/opt
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -C $PKG/opt
-cd $PKG/opt/$PRGNAM-$VERSION
+cd $PKG/opt/$PRGNAM
 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 {} \;
+# rename sqlmap.conf
+mv sqlmap.conf sqlmap.conf.new
 
 # Install an application launcher
 mkdir -p $PKG/usr/bin
 install -m 0755 $CWD/sqlmap $PKG/usr/bin/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/sqlmap-$VERSION/doc/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/sqlmap-$VERSION/doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/$PRGNAM/doc/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/$PRGNAM/doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/sqlmap/sqlmap.info b/network/sqlmap/sqlmap.info
index 507b0dce03bbd..6e65fbc5cd46c 100644
--- a/network/sqlmap/sqlmap.info
+++ b/network/sqlmap/sqlmap.info
@@ -1,10 +1,10 @@
 PRGNAM="sqlmap"
-VERSION="0.7"
+VERSION="0.8"
 HOMEPAGE="http://sqlmap.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlmap/sqlmap-0.7.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/sqlmap/sqlmap-0.8.tar.bz2"
 DOWNLOAD_x86_64=""
-MD5SUM="30bc34f3462582b07898610e7587e705"
+MD5SUM="4290925414e56978bde2310cf12b8864"
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"