system/rkhunter: Updated for version 1.3.4

6 files changed, 41 insertions, 31 deletions

diff --git a/system/rkhunter/README b/system/rkhunter/README
index 08c444a425..59397054be 100644
--- a/system/rkhunter/README
+++ b/system/rkhunter/README
@@ -1,10 +1,6 @@
 RKHunter - A Security monitoring and analyzing tool
 
-RKHunter is a scanning tool that scans for rootkits, backdoors, and
-local exploits by running tests like:
-
-MD5 hash comparison, known rootkit files, incorrect permissions on
-binaries, suspect strings in LKM and LKD modules, and hidden files
-
-Rootkit Hunter is released as a GPL licensed project and is free for
-everyone to use.
+RKHunter is a scanning tool that scans for rootkits, backdoors, and local 
+exploits by running tests like MD5 hash comparison, known rootkit files, 
+incorrect permissions on binaries, suspect strings in LKM and LKD modules, 
+and hidden files.
diff --git a/system/rkhunter/doinst.sh b/system/rkhunter/doinst.sh
index 9a82df242e..4dc3528ce0 100644
--- a/system/rkhunter/doinst.sh
+++ b/system/rkhunter/doinst.sh
@@ -12,3 +12,4 @@ config() {
 }
 
 config etc/rkhunter.conf.new
+
diff --git a/system/rkhunter/install_path_fix.diff b/system/rkhunter/install_path_fix.diff
new file mode 100644
index 0000000000..88ba0d3f01
--- /dev/null
+++ b/system/rkhunter/install_path_fix.diff
@@ -0,0 +1,21 @@
+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/install_path_fix.diff.gz b/system/rkhunter/install_path_fix.diff.gz
deleted file mode 100644
index 94f07b7d1f..0000000000
--- a/system/rkhunter/install_path_fix.diff.gz
+++ /dev/null
diff --git a/system/rkhunter/rkhunter.SlackBuild b/system/rkhunter/rkhunter.SlackBuild
index 5f3dd5c484..bfccc5e1bd 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}
diff --git a/system/rkhunter/rkhunter.info b/system/rkhunter/rkhunter.info
index bd0606e4c9..f59ca2302a 100644
--- a/system/rkhunter/rkhunter.info
+++ b/system/rkhunter/rkhunter.info
@@ -1,8 +1,10 @@
 PRGNAM="rkhunter"
-VERSION="1.3.2"
+VERSION="1.3.4"
 HOMEPAGE="http://rootkit.nl/projects/rootkit_hunter.html"
-DOWNLOAD="http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.2.tar.gz"
-MD5SUM="a00ff64d7076d6ff47ef0c9f0b6202f2"
+DOWNLOAD="http://downloads.sourceforge.net/rkhunter/rkhunter-1.3.4.tar.gz"
+MD5SUM="31eaacc4d01ad138d1a4283f105088e6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michael Johnson"
 EMAIL="youngmug@animeneko.net"
-APPROVED="David Somero"
+APPROVED="rworkman"