1 files changed, 13 insertions, 26 deletions
diff --git a/system/ulogd/ulogd.SlackBuild b/system/ulogd/ulogd.SlackBuild
index 74f7582737..28dfb97ae0 100644
--- a/system/ulogd/ulogd.SlackBuild
+++ b/system/ulogd/ulogd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ulogd
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=ulogd
 VERSION=1.24
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -33,9 +33,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-WITH_MYSQL=${WITH_MYSQL:-yes}
-WITH_SQLITE=${WITH_SQLITE:-yes}
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -47,18 +44,6 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-if [ "$WITH_MYSQL" != "yes" ]; then
-  do_mysql="--without-mysql"
-else
-  do_mysql="--with-mysql"
-fi
-
-if [ "$WITH_SQLITE" != "yes" ]; then
-  do_sqlite="--without-sqlite3"
-else
-  do_sqlite="--with-sqlite3"
-fi
-
 set -e
 
 rm -rf $PKG 
@@ -70,31 +55,33 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
+# Add large file support
+patch -p1 < $CWD/configure.in.diff
+autoconf
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --build=$ARCH-slackware-linux \
-  $do_mysql \
-  $do_sqlite
+  --with-sqlite3 \
+  --with-mysql \
+  --build=$ARCH-slackware-linux
 
 # "mysql_config --libs" shows -rdynamic, but it causes the mysql plugin
 # to barf on compilation (and running too, according to bug reports in 
 # other distributions), so we'll remove that flag
-if [ "$WITH_MYSQL" = "yes" ]; then
-  sed -i 's%-rdynamic %%' Rules.make
-fi
+sed -i 's%-rdynamic %%' Rules.make
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 install -D -m 0755 $CWD/rc.ulogd $PKG/etc/rc.d/rc.ulogd.new
@@ -121,4 +108,4 @@ 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}