3 files changed, 35 insertions, 20 deletions
diff --git a/system/chkrootkit/chkrootkit.SlackBuild b/system/chkrootkit/chkrootkit.SlackBuild
index 1b4a598f41c2..bdc5aed1cecf 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}
diff --git a/system/chkrootkit/chkrootkit.info b/system/chkrootkit/chkrootkit.info
index 0334590ead41..c9cde0f8cadf 100644
--- a/system/chkrootkit/chkrootkit.info
+++ b/system/chkrootkit/chkrootkit.info
@@ -1,8 +1,10 @@
 PRGNAM="chkrootkit"
-VERSION="0.48"
+VERSION="0.49"
 HOMEPAGE="http://www.chkrootkit.org"
-DOWNLOAD="ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz"
-MD5SUM="de8b8b5013e7faa2b66c0e33c59677e8" 
+DOWNLOAD="http://slackbuilds.org/sources/13.0/chkrootkit.tar.gz"
+MD5SUM="304d840d52840689e0ab0af56d6d3a18"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
 APPROVED="rworkman"
diff --git a/system/chkrootkit/slack-desc b/system/chkrootkit/slack-desc
index a697ea4f9a5c..330d5079b746 100644
--- a/system/chkrootkit/slack-desc
+++ b/system/chkrootkit/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
 chkrootkit: chkrootkit (Check Rootkit) 
 chkrootkit:
 chkrootkit: chkrootkit is a common unix-based program intended to help system