1 files changed, 26 insertions, 9 deletions
diff --git a/network/snort/snort.SlackBuild b/network/snort/snort.SlackBuild
index 37e1b34f99..88b11aadaf 100644
--- a/network/snort/snort.SlackBuild
+++ b/network/snort/snort.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2006-2009, Alan Hicks, Lizella, GA,
 # Copyright 2009, Thomas York, Beech Grove, In.
@@ -25,26 +25,36 @@
 # Modified by the SlackBuilds.org project
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=snort
-VERSION=${VERSION:-2.9.11.1}
+VERSION=${VERSION:-2.9.17}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,7 +73,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+# respecting content-disposition may include cgi params in the filename
+TARBALL=$CWD/$PRGNAM-$VERSION.tar.gz
+if [ ! -e $TARBALL ]; then
+  TARBALL="$(/bin/ls $TARBALL\?* | head -1)"
+fi
+tar xvf $TARBALL
 cd $PRGNAM-$VERSION
 
 # The Makefiles do not respect the --libdir setting, which causes the libs to
@@ -87,6 +102,7 @@ if [ "${NON_ETHER:-yes}" = 'no' ]; then
   NON_ETHERNET_DECODERS=''
 fi
 
+CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc/" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -98,7 +114,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-pthread \
   --enable-linux-smp-stats \
-  --enable-zlib \
   ${NON_ETHERNET_DECODERS} \
   --build=$ARCH-slackware-linux
 
@@ -146,9 +161,11 @@ cp -a COPYING ChangeLog LICENSE RELEASE.NOTES \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
+rm -f $PKG/usr/lib*/*.la
+
 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE