3 files changed, 26 insertions, 20 deletions
diff --git a/network/sqlninja/README b/network/sqlninja/README
index d7e1edb176..b891811c07 100644
--- a/network/sqlninja/README
+++ b/network/sqlninja/README
@@ -5,9 +5,15 @@ environment. It should be used by penetration testers to help automate the
 process of taking over a DB Server when a SQL Injection vulnerability has been
 discovered.
 
-This version includes Raul Siles' patch for better Metasploit Framework
-integration which adds two new timers ($client_delay (30 secs) and
-$server_delay (5 secs)).
+Since version 0.2.5, sqlninja will upload .exe files by default instead of
+.scr ones. If you want to upload .scr files instead, the original sqlninja
+files are distributed inside /usr/lib$LIBDIRSUFFIX/sqlninja/scripts/ .
+
+Raul Siles' patch for better Metasploit Framework interaction has been
+discontinued since it was released for an old version of sqlninja only. The
+patch added two new timers ($client_delay (30 secs) and $server_delay (5
+secs)) to use within sqlninja. Since it could be still somehow handy it has
+been included in the package documentation directory.
 
 This requires perl-Net-DNS, perl-Net-Pcap, perl-IO-Socket-SSL, Net-SSLeay,
 perl-NetPacket, and perl-Net-RawIP.
diff --git a/network/sqlninja/sqlninja.SlackBuild b/network/sqlninja/sqlninja.SlackBuild
index 69ae4ccb30..8127ff70d8 100644
--- a/network/sqlninja/sqlninja.SlackBuild
+++ b/network/sqlninja/sqlninja.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for sqlninja
 
-# 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,8 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sqlninja
-SRCVERSION=0.2.3-r1
-VERSION=$(echo ${SRCVERSION}p | tr - _)
+VERSION=0.2.5
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,7 +42,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE README dnstun/ sqlninja-howto.html"
+DOCS="LICENSE README sqlninja-howto.html"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -65,32 +64,33 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tgz
-cd $PRGNAM-$SRCVERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 
-# Add Raul Siles' patch for better Metasploit integration
-patch sqlninja -i $CWD/sqlninja.patch
+## Add Raul Siles' patch for better Metasploit integration
+#patch sqlninja -i $CWD/sqlninja.patch
 
 # Fix paths
-sed -i -e "s:sqlninja.conf:/etc/sqlninja.conf:g" sqlninja.conf
-sed -i -e "s:$uplfile = \"scripts/nc.scr\";:$uplfile = \"/usr/lib$LIBDIRSUFFIX/sqlninja/scripts/nc.scr\";:g" sqlninja
-sed -i -e "s:$uplfile = \"scripts/dnstun.scr\";:$uplfile = \"/usr/lib$LIBDIRSUFFIX/sqlninja/scripts/dnstun.scr\";:g" sqlninja
-sed -i -e "s:./makescr.pl:/usr/bin/makescr.pl:g" sqlninja
+sed -i -e "s:sqlninja.conf:/etc/sqlninja.conf:g" sqlninja
+sed -i -e "s:apps/:/usr/lib$LIBDIRSUFFIX/sqlninja/apps/:g" sqlninja
 
 # Install the program
 install -d \
   $PKG/etc/ \
   $PKG/usr/bin/ \
+  $PKG/usr/lib$LIBDIRSUFFIX/sqlninja/apps/ \
   $PKG/usr/lib$LIBDIRSUFFIX/sqlninja/scripts/
 install -m 0644 sqlninja.conf $PKG/etc/sqlninja.conf.new
+install -m 0644 apps/* $PKG/usr/lib$LIBDIRSUFFIX/sqlninja/apps/
 install -m 0644 scripts/* $PKG/usr/lib$LIBDIRSUFFIX/sqlninja/scripts/
 install -m 0755 sqlninja $PKG/usr/bin/
-install -m 0755 makescr.pl $PKG/usr/bin/
 
 # Copy over important docs and scripts
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION/
+# Add the discontinued patch for interested users
+cp -a ${CWD}/sqlninja.patch $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/sqlninja/sqlninja.info b/network/sqlninja/sqlninja.info
index b220043ced..f325670772 100644
--- a/network/sqlninja/sqlninja.info
+++ b/network/sqlninja/sqlninja.info
@@ -1,10 +1,10 @@
 PRGNAM="sqlninja"
-VERSION="0.2.3-r1p"
+VERSION="0.2.5"
 HOMEPAGE="http://sqlninja.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sqlninja/sqlninja-0.2.3-r1.tgz"
-MD5SUM="7989a055785d9ede1c8fa331235f57bc"
+DOWNLOAD="http://downloads.sourceforge.net/sqlninja/sqlninja-0.2.5.tgz"
+MD5SUM="95acfd9c5bc2305f239596c613d4ffc7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Marco Bonetti"
 EMAIL="sid77@slackware.it"
-APPROVED="rworkman"
+APPROVED="rworkman,Erik Hanson"