- Update to 1.3.6 [1]

PR:		ports/142962
Submitted by:	Sergiy Borodych <bor univ.kiev.ua>
[1] Done by:	jadawin@ (myself)

4 files changed, 49 insertions, 50 deletions

diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index 032f1a0b75f4..2482d44cdd33 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rkhunter
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.6
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -26,7 +26,8 @@ SUB_FILES=	415.rkhunter
 MAN8=		rkhunter.8
 MANCOMPRESSED=	no
 
-PORTDOCS=	CHANGELOG README WISHLIST
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	ACKNOWLEDGMENTS CHANGELOG FAQ LICENSE README
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/rkhunter/distinfo b/security/rkhunter/distinfo
index 1151a05c4bdc..b3057ff75206 100644
--- a/security/rkhunter/distinfo
+++ b/security/rkhunter/distinfo
@@ -1,3 +1,3 @@
-MD5 (rkhunter-1.3.4.tar.gz) = 31eaacc4d01ad138d1a4283f105088e6
-SHA256 (rkhunter-1.3.4.tar.gz) = d85d179850fee8ab04bc1733680c9c6dd8a1577975c12554db9c52bf4f7c50ba
-SIZE (rkhunter-1.3.4.tar.gz) = 275653
+MD5 (rkhunter-1.3.6.tar.gz) = 41bd92b1ea0803401c4a45215c8293a2
+SHA256 (rkhunter-1.3.6.tar.gz) = e3f5e21307e4876da4bc4a1521a86f1cda93ad22d4c77366876d7c170dcefc10
+SIZE (rkhunter-1.3.6.tar.gz) = 217691
diff --git a/security/rkhunter/files/patch-installer.sh b/security/rkhunter/files/patch-installer.sh
index 6c9fdb7c0732..981af3ce1c1b 100644
--- a/security/rkhunter/files/patch-installer.sh
+++ b/security/rkhunter/files/patch-installer.sh
@@ -1,28 +1,26 @@
---- installer.sh.orig	Wed Oct 17 13:38:52 2007
-+++ installer.sh	Wed Oct 17 13:40:59 2007
-@@ -399,7 +399,7 @@
+--- installer.sh.orig	2010-01-23 12:14:34.000000000 +0000
++++ installer.sh	2010-01-23 12:14:51.000000000 +0000
+@@ -657,22 +657,7 @@
+ 		esac
+ 	done
  
- # Perl will be found in Rkhunter itself.
+-
+-	# Application documents
+-	for FILE in ${RKHINST_DOC_FILES}; do
+-		cp -f ./files/"${FILE}" "${RKHINST_DOC_DIR}"
+-		ERRCODE=$?
+-
+-		if [ $ERRCODE -eq 0 ]; then
+-			echo " Installing ${FILE}: OK"
+-			chmod "${RKHINST_MODE_RWR}" "${RKHINST_DOC_DIR}/${FILE}"
+-		else
+-			echo " Installing ${FILE}: FAILED: Code $ERRCODE: exiting."
+-			exit 1
+-		fi
+-	done
+-
+-
++	
+ 	# Language support files
+ 	ERRCODE=0
  
--RKHINST_DIRS="$RKHINST_DOC_DIR $RKHINST_MAN_DIR $RKHINST_ETC_DIR $RKHINST_BIN_DIR"
-+RKHINST_DIRS="$RKHINST_ETC_DIR $RKHINST_BIN_DIR"
- RKHINST_DIRS_EXCEP="$RKHINST_SCRIPT_DIR $RKHINST_DB_DIR $RKHINST_TMP_DIR $RKHINST_LANG_DIR"
- 
- echo "Starting installation/update"
-@@ -526,11 +526,11 @@
- done
- 
- # Application documents
--for FILE in ${RKHINST_DOC_FILES}; do
--	echo $N " Installing ${FILE}: "
--	cp -f ./files/"${FILE}" "${RKHINST_DOC_DIR}"; retValChk
--	chmod "${RKHINST_MODE_RWR}" "${RKHINST_DOC_DIR}/${FILE}"
--done
-+#for FILE in ${RKHINST_DOC_FILES}; do
-+#	echo $N " Installing ${FILE}: "
-+#	cp -f ./files/"${FILE}" "${RKHINST_DOC_DIR}"; retValChk
-+#	chmod "${RKHINST_MODE_RWR}" "${RKHINST_DOC_DIR}/${FILE}"
-+#done
- 
- # Language support files
- echo $N " Installing language support files: "
diff --git a/security/rkhunter/pkg-plist b/security/rkhunter/pkg-plist
index bd537c32be3f..763fe61173af 100644
--- a/security/rkhunter/pkg-plist
+++ b/security/rkhunter/pkg-plist
@@ -1,31 +1,31 @@
 bin/rkhunter
 etc/periodic/security/415.rkhunter
 etc/rkhunter.conf
+lib/rkhunter/scripts/check_modules.pl
+lib/rkhunter/scripts/filehashmd5.pl
+lib/rkhunter/scripts/filehashsha.pl
+lib/rkhunter/scripts/filehashsha1.pl
+lib/rkhunter/scripts/readlink.sh
+lib/rkhunter/scripts/stat.pl
 var/lib/rkhunter/db/backdoorports.dat
-var/lib/rkhunter/db/defaulthashes.dat
-var/lib/rkhunter/db/md5blacklist.dat
+var/lib/rkhunter/db/i18n/cn
+var/lib/rkhunter/db/i18n/de
+var/lib/rkhunter/db/i18n/en
+var/lib/rkhunter/db/i18n/zh
+var/lib/rkhunter/db/i18n/zh.utf8
 var/lib/rkhunter/db/mirrors.dat
-var/lib/rkhunter/db/os.dat
 var/lib/rkhunter/db/programs_bad.dat
 var/lib/rkhunter/db/suspscan.dat
-var/lib/rkhunter/db/programs_good.dat
-var/lib/rkhunter/db/i18n/cn
-var/lib/rkhunter/db/i18n/en
 var/lib/rkhunter/tmp/group
 var/lib/rkhunter/tmp/passwd
-lib/rkhunter/scripts/check_modules.pl
-lib/rkhunter/scripts/check_port.pl
-lib/rkhunter/scripts/check_update.sh
-lib/rkhunter/scripts/filehashmd5.pl
-lib/rkhunter/scripts/filehashsha1.pl
-lib/rkhunter/scripts/showfiles.pl
-lib/rkhunter/scripts/readlink.sh
-lib/rkhunter/scripts/stat.pl
-@dirrm lib/rkhunter/scripts
-@dirrm lib/rkhunter
-@dirrm var/lib/rkhunter/db/i18n
-@dirrm var/lib/rkhunter/db
 @dirrm var/lib/rkhunter/tmp
-@dirrm var/lib/rkhunter
+@dirrm var/lib/rkhunter/db/i18n
 @dirrmtry etc/periodic/security
 @dirrmtry etc/periodic
+@dirrm var/lib/rkhunter/db
+@dirrm var/lib/rkhunter
+@dirrm var/lib
+@dirrm var
+@dirrm share/doc/rkhunter-1.3.6
+@dirrm lib/rkhunter/scripts
+@dirrm lib/rkhunter