Update to 1.2.3

Submitted by:	maintainer
PR:		ports/79149

5 files changed, 34 insertions, 49 deletions

diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index 149e8dd818c2..1e07c4092755 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	rkhunter
-PORTVERSION=	1.1.9
+PORTVERSION=	1.2.3
 CATEGORIES=	security
 MASTER_SITES=	http://downloads.rootkit.nl/
 
 MAINTAINER=	vaidab@safe-mail.net
 COMMENT=	Rootkit detection tool
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+
+# Wget has security holes, and rkhunter can use /usr/bin/fetch instead
+#		wget:${PORTSDIR}/ftp/wget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5=	yes
diff --git a/security/rkhunter/distinfo b/security/rkhunter/distinfo
index 7d2fc24544c8..630df059a0c3 100644
--- a/security/rkhunter/distinfo
+++ b/security/rkhunter/distinfo
@@ -1,2 +1,2 @@
-MD5 (rkhunter-1.1.9.tar.gz) = 2e24806cb1267124fba6132009e30f1b
-SIZE (rkhunter-1.1.9.tar.gz) = 115254
+MD5 (rkhunter-1.2.3.tar.gz) = 404ae3f5cde3ede8e3be1ee1f04f52d5
+SIZE (rkhunter-1.2.3.tar.gz) = 169545
diff --git a/security/rkhunter/files/patch-installer.sh b/security/rkhunter/files/patch-installer.sh
index d94e5d421388..a3ca88786967 100644
--- a/security/rkhunter/files/patch-installer.sh
+++ b/security/rkhunter/files/patch-installer.sh
@@ -1,6 +1,6 @@
---- installer.sh.orig	Fri Aug 20 15:11:04 2004
-+++ installer.sh	Sun Aug 29 23:56:46 2004
-@@ -120,15 +120,12 @@
+--- installer.sh.orig	Sat Mar 19 22:04:43 2005
++++ installer.sh	Wed May 18 17:42:29 2005
+@@ -119,15 +119,12 @@
  overwrite:programs_good.dat:/db/programs_good.dat:Database%%Program%%versions
  overwrite:defaulthashes.dat:/db/defaulthashes.dat:Database%%Default%%file%%hashes
  overwrite:md5blacklist.dat:/db/md5blacklist.dat:Database%%MD5%%blacklisted%%files
@@ -13,23 +13,22 @@
  INSTALLFILES2="
 -nooverwrite:rkhunter.conf:/usr/local/etc/rkhunter.conf:RK%%Hunter%%configuration%%file
 -overwrite:rkhunter:/usr/local/bin/rkhunter:RK%%Hunter%%binary
-+overwrite:rkhunter.conf:/etc/rkhunter.conf.sample:RK%%Hunter%%configuration%%file
-+overwrite:rkhunter:/bin/rkhunter:RK%%Hunter%%binary
++nooverwrite:rkhunter.conf:${INSTALLDIR}/etc/rkhunter.conf:RK%%Hunter%%configuration%%file
++overwrite:rkhunter:${INSTALLDIR}/bin/rkhunter:RK%%Hunter%%binary
  "
  
  # Create directories (only if they do not exist)
-@@ -137,10 +134,7 @@
+@@ -136,9 +133,7 @@
  ${INSTALLDIR}/etc
  ${INSTALLDIR}/bin
  ${INSTALLDIR}/lib/rkhunter/db
 -${INSTALLDIR}/lib/rkhunter/docs
  ${INSTALLDIR}/lib/rkhunter/scripts
 -${INSTALLDIR}/lib/rkhunter/tmp
--/usr/local/etc
+ /usr/local/etc
+ /usr/local/bin
  "
- 
- CHECKDIR="/usr/local"
-@@ -347,9 +341,6 @@
+@@ -397,9 +392,6 @@
  #################################################################################
  
  
@@ -39,36 +38,27 @@
  echo "${INSTALLER_NAME} ${INSTALLER_VERSION} (${INSTALLER_COPYRIGHT})"
  echo $ECHOOPT "---------------"
  echo "Starting installation/update"
-@@ -469,7 +460,7 @@
-       echo "Skipped (no overwrite)"
-     else
-       #error redirection in .rkhunter it's just for a clear display if user run not as root
--      cp -f ${INSTALLPREFIX}${CURFILE} ${NEWFILE} 2> ~/.rkhunter.log
-+      cp -f ${INSTALLPREFIX}${CURFILE} "${INSTALLDIR}/${NEWFILE}" 2> ~/.rkhunter.log
-       if [ $? -eq 0 ]
-         then
- 	  echo $E "OK"
-@@ -483,11 +474,11 @@
+@@ -532,11 +524,11 @@
  done
  
  # Installation dir to configuration file
 -INSTALLDIRCHECK=`cat /usr/local/etc/rkhunter.conf | grep "INSTALLDIR="`
-+INSTALLDIRCHECK=`cat $INSTALLDIR/etc/rkhunter.conf.sample | grep "INSTALLDIR="`
++INSTALLDIRCHECK=`cat ${INSTALLDIR}/etc/rkhunter.conf | grep "INSTALLDIR="`
  if [ "${INSTALLDIRCHECK}" = "" ]
    then
 -    echo "" >> /usr/local/etc/rkhunter.conf
 -    echo "INSTALLDIR=${INSTALLDIR}" >> /usr/local/etc/rkhunter.conf
-+    echo "" >> $INSTALLDIR/etc/rkhunter.conf.sample
-+    echo "INSTALLDIR=${INSTALLDIR}" >> $INSTALLDIR/etc/rkhunter.conf.sample
++    echo "" >> ${INSTALLDIR}/etc/rkhunter.conf
++    echo "INSTALLDIR=${INSTALLDIR}" >> ${INSTALLDIR}/etc/rkhunter.conf
      echo "Configuration updated with installation path (${INSTALLDIR})"
    else
      echo "Configuration already updated."
-@@ -497,7 +488,7 @@
+@@ -546,7 +538,7 @@
  then
  	echo ""
  	echo $E "$t17"
 -	echo "$t18 (/usr/local/bin/rkhunter)"
-+	echo "$t18 ($INSTALLDIR/bin/rkhunter)"
++	echo "$t18 (${INSTALLDIR}/rkhunter)"
  else
  	echo ""
  	echo $E "$t19"
diff --git a/security/rkhunter/files/patch-rkhunter.conf b/security/rkhunter/files/patch-rkhunter.conf
index 3c84b3a4bb29..6e256a915cfa 100644
--- a/security/rkhunter/files/patch-rkhunter.conf
+++ b/security/rkhunter/files/patch-rkhunter.conf
@@ -1,18 +1,11 @@
---- files/rkhunter.conf	Fri Aug 20 15:02:59 2004
-+++ files/rkhunter.conf	Sun Aug 29 23:22:13 2004
-@@ -14,7 +14,7 @@
- 
- # Use a custom temporary directory (you can override it with the
- # --tmpdir parameter)
--#TMPDIR=/tmp
-+TMPDIR=/tmp
- 
- # Use a custom database directory (you can override it with the
- # --dbdir parameter)
-@@ -25,4 +25,4 @@
- #MD5WHITELIST=/bin/ps:9bd8bf260adc81d3a43a086fce6b430a
- #MD5WHITELIST=/bin/ps:404583a6b166c2f7ac1287445a9de6b3
- 
--# The End
-\ No newline at end of file
-+# The End
+--- files/rkhunter.conf.old	Wed Mar 23 03:34:19 2005
++++ files/rkhunter.conf	Wed Mar 23 03:41:50 2005
+@@ -18,7 +18,7 @@
+ # Note: don't use /tmp as your temporary directory, because some
+ # important files will be written to this directory. Be sure
+ # you have setup your permissions very tight.
+-#TMPDIR=/usr/local/rkhunter/lib/rkhunter/tmp
++TMPDIR=/root
+
+  # Use a custom database directory (you can override it with the
+  # --dbdir parameter)
diff --git a/security/rkhunter/pkg-plist b/security/rkhunter/pkg-plist
index df68dfff63fe..9f51984e1711 100644
--- a/security/rkhunter/pkg-plist
+++ b/security/rkhunter/pkg-plist
@@ -1,4 +1,4 @@
-etc/rkhunter.conf.sample
+etc/rkhunter.conf
 bin/rkhunter
 lib/rkhunter/db/backdoorports.dat
 lib/rkhunter/db/mirrors.dat