system/rkhunter: Updated for version 1.3.6.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 13 insertions, 40 deletions

diff --git a/system/rkhunter/install_path_fix.diff b/system/rkhunter/install_path_fix.diff
deleted file mode 100644
index 88ba0d3f01eb..000000000000
--- a/system/rkhunter/install_path_fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur rkhunter-1.3.4.orig/installer.sh rkhunter-1.3.4/installer.sh
---- rkhunter-1.3.4.orig/installer.sh	2008-12-30 15:23:00.000000000 -0600
-+++ rkhunter-1.3.4/installer.sh	2009-07-14 00:36:40.755149686 -0500
-@@ -171,7 +171,7 @@
- 				esac
- 				;;
- 			RPM)	if [ -n "${RPM_BUILD_ROOT}" ]; then
--					PREFIX="${RPM_BUILD_ROOT}/usr/local"
-+					PREFIX="${RPM_BUILD_ROOT}/usr"
- 				else
- 					echo "RPM prefix chosen but \$RPM_BUILD_ROOT variable not found, exiting."
- 					exit 1
-@@ -227,7 +227,7 @@
- 					LIBDIR="${PREFIX}/lib"
- 				fi
- 				VARDIR="${RPM_BUILD_ROOT}/var"
--				SHAREDIR="${PREFIX}/share"; BINDIR="${PREFIX}/bin"
-+				SHAREDIR="${PREFIX}"; BINDIR="${PREFIX}/bin"
- 				;;
- 			DEB)
- 				LIBDIR="${PREFIX}/lib"
diff --git a/system/rkhunter/rkhunter.SlackBuild b/system/rkhunter/rkhunter.SlackBuild
index cb8bd46e9bfc..b29dc4820e90 100644
--- a/system/rkhunter/rkhunter.SlackBuild
+++ b/system/rkhunter/rkhunter.SlackBuild
@@ -5,16 +5,14 @@
 # Written by Michael Johnson (youngmug@animeneko.net)
 
 PRGNAM=rkhunter
-VERSION=${VERSION:-1.3.4}
+VERSION=${VERSION:-1.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -53,28 +51,24 @@ 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
-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
-RPM_BUILD_ROOT=$PKG \
+TGZ_BUILD_ROOT=$PKG \
 ./installer.sh \
-  --layout RPM \
+  --layout TGZ \
   --install
 
-# Compress man pages
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-# Copy SlackBuild script to documentation directory
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Put docs and manual pages in the correct place
+mv $PKG/usr/share/* $PKG/usr
+rmdir $PKG/usr/share
 
 # Don't clobber existing config file.
 mv $PKG/etc/rkhunter.conf $PKG/etc/rkhunter.conf.new
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/system/rkhunter/rkhunter.info b/system/rkhunter/rkhunter.info
index f59ca2302ade..2c00f361cb94 100644
--- a/system/rkhunter/rkhunter.info
+++ b/system/rkhunter/rkhunter.info
@@ -1,8 +1,8 @@
 PRGNAM="rkhunter"
-VERSION="1.3.4"
+VERSION="1.3.6"
 HOMEPAGE="http://rootkit.nl/projects/rootkit_hunter.html"
-DOWNLOAD="http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.4.tar.gz"
-MD5SUM="31eaacc4d01ad138d1a4283f105088e6"
+DOWNLOAD="http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.6.tar.gz"
+MD5SUM="41bd92b1ea0803401c4a45215c8293a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michael Johnson"