1 files changed, 9 insertions, 19 deletions
diff --git a/system/rkhunter/rkhunter.SlackBuild b/system/rkhunter/rkhunter.SlackBuild
index 5f3dd5c484291..bfccc5e1bdc5e 100644
--- a/system/rkhunter/rkhunter.SlackBuild
+++ b/system/rkhunter/rkhunter.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Michael Johnson (youngmug@animeneko.net)
 
 PRGNAM=rkhunter
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.3.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -38,27 +41,16 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-#Patch installer.sh to fix paths for Slackware (we don't use /usr/local, and we don't use /usr/share)
-zcat $CWD/install_path_fix.diff.gz | patch -p0 --verbose
+# Patch installer.sh to fix paths for Slackware
+patch -p1 < $CWD/install_path_fix.diff
 
-#Set the installer to build in our package directory
-#Yes, this isn't an RPM, but it was the easiest way to get pathing working correctly
+# Set the installer to build in our package directory
+# Yes, this isn't an RPM, but it was the easiest way to get pathing working correctly
 RPM_BUILD_ROOT=$PKG \
 ./installer.sh \
   --layout RPM \
   --install
 
-#We don't want the manpages or docs in /usr/share, we want them in /usr
-( cd $PKG
-  mv usr/share/* usr
-  rmdir usr/share
-)
-
-#We don't want /usr/var, we want /var
-( cd $PKG
-  mv usr/var .
-)
-
 # Compress man pages
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -71,11 +63,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 # Don't clobber existing config file.
 mv $PKG/etc/rkhunter.conf $PKG/etc/rkhunter.conf.new
 
-# Copy the slack-desc into ./install
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Make the package
 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}