1 files changed, 22 insertions, 17 deletions
diff --git a/system/chkrootkit/chkrootkit.SlackBuild b/system/chkrootkit/chkrootkit.SlackBuild
index 1b4a598f41..bdc5aed1ce 100644
--- a/system/chkrootkit/chkrootkit.SlackBuild
+++ b/system/chkrootkit/chkrootkit.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for chkrootkit
 
-# Copyright  2007 Michiel van Wessem (http://michielvwessem.wordpress.com)
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,43 +22,45 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-set -e
-
 PRGNAM=chkrootkit
-VERSION=0.48
+VERSION=${VERSION:-0.49}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="ACKNOWLEDGMENTS COPYRIGHT README* chkrootkit.lsm"
+set -e 
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM.tar.gz
+tar xvf $CWD/$PRGNAM.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 if [ "$ARCH" = "i486" ]; then
     sed -i 's#-DHAVE_LASTLOG_H#-O2 -march=i486 -mtune=i686#' Makefile
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
     sed -i 's#-DHAVE_LASTLOG_H#-O2 -march=i686 -mtune=i686#' Makefile
+    LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+    sed -i 's#-DHAVE_LASTLOG_H#-O2 -fPIC#' Makefile
+    LIBDIRSUFFIX="64"
 fi
 
 SCFLAGS="$SLKCFLAGS" make
-# Lets make our own fancy make install 
-DESTDIR=$PKG/usr/lib/chkrootkit/bin
+# Lets make our own fancy make install
+DESTDIR=$PKG/usr/lib${LIBDIRSUFFIX}/chkrootkit/bin
 mkdir -p $DESTDIR
-for BINPRG in $(ls -l | grep "rwx\|\-x" | grep -v "\." | awk '{ print $8 }'); do 
-    install -m0755 $BINPRG $DESTDIR
+for BINPRG in $(ls -l | grep "rwx\|\-x" | grep -v "\." | awk '{ print $8 }'); do
+    install -m 0755 $BINPRG $DESTDIR
 done
 
 # Thanks to Erik Jan Tromp (alphageek) for the suggestion on this
@@ -67,22 +69,25 @@ mkdir -p $PKG/usr/sbin
 cat << EOF > $PKG/usr/sbin/chkrootkit
 #!/bin/sh
 PRGNAM=chkrootkit
-PRGDIR=/usr/lib/\$PRGNAM/bin
+PRGDIR=/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/bin
 cd \$PRGDIR && exec ./$PRGNAM \$*
 EOF
 chmod 0755 $PKG/usr/sbin/$PRGNAM
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ACKNOWLEDGMENTS COPYRIGHT README* chkrootkit.lsm \
+  $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
 
 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}