4 files changed, 140 insertions, 16 deletions
diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index b0256735b9d8..4c8323fd9af4 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.89 2012/01/12 00:09:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.90 2012/04/09 03:43:46 darkside Exp $
+
+*rkhunter-1.3.8-r1 (09 Apr 2012)
+
+  09 Apr 2012; Jeremy Olexa <darkside@gentoo.org> +rkhunter-1.3.8-r1.ebuild,
+  +files/rkhunter-1.3.8-file-compat.patch:
+  Revision bump to add upstream patch for sys-apps/file compatibility
 
   12 Jan 2012; Tim Harder <radhermit@gentoo.org> -files/rkhunter-ppc64.patch,
   -rkhunter-1.3.4-r3.ebuild, -rkhunter-1.3.6.ebuild:
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index b9c96a429064..8f1524c6adb4 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX rkhunter-1.3.8-file-compat.patch 2631 RMD160 a178f8e2202738061d52a8140180605aae772f36 SHA1 9786d9ab2cd5028260201bccd62aa77091b2f6ea SHA256 a73563311e29321730a8afd619822f34d8b685f6202bc61ac8e5b81d947a2ede
 AUX rkhunter-1.3.cron 4050 RMD160 b1c567e64fe523ccdde04d13320c2d26e9eebe07 SHA1 fb909c818805d7f65a1c23b5727f0912bf813157 SHA256 011216f98936daa079a7c9db4bec8620b0dae793b2de7649f532bbc15c16f751
 AUX rkhunter.bash-completion 2628 RMD160 f408877f6b8d38bfb17af6074e5a1fbecc134cd6 SHA1 a0a007ecda0de61d5e8044672048c6f406183cfb SHA256 d99776d6b300697cb6571e409e6c93bc96e68980922ee22b76eda56f26d0d970
 AUX rkhunter.conf.patch 786 RMD160 6d645ca67b77e3c6abacbc2c0de259e5e6204852 SHA1 9dbb80960b2273a7fb8d4fcd1b4ccb758b91c5cc SHA256 2ca73ff5b9e7b6b3b1c65948813f5124662b8fb6087108adebccd9aa5e4a19d8
 DIST rkhunter-1.3.8.tar.gz 241551 RMD160 7c013fd68675d5f859db0430c04673154209a64e SHA1 f4b0c3f149213aa50e00c9658ad8a4a79861621f SHA256 fb1fb8bac53bab476142b5556140c59d589bc0f45d3dc058f400f2edada77a33
+EBUILD rkhunter-1.3.8-r1.ebuild 1626 RMD160 3a4feddb1cd3b69eb0d2a2e17ccd53594270d0e7 SHA1 9fbcb49ac2390efbc5635734a783947bc5cb47fe SHA256 595d5911b00813e0bcaabc71da75dfd9b52ff75a60faa28a3e36202ecb250ada
 EBUILD rkhunter-1.3.8.ebuild 1573 RMD160 414a1f7f999893de87b361b06fc4162c54ea7dc3 SHA1 76417428b76b8d8aca417cef93c03826ea83c317 SHA256 168d0cedaecde7b6e708ef6c6cdea35bf68ddce951f1c3f0957890483ac7f21b
-MISC ChangeLog 15349 RMD160 e6b85c44416b76ed683ed7f3d4baa24c5bd8da08 SHA1 f36ccca0cc0bfa4574e22881c33cf889b3980f7b SHA256 c52bc84d938a90d878c35f34fb75b189f8c3587b3ce478daa78e649513a541b5
+MISC ChangeLog 15573 RMD160 f3bd853b4d9b67907536905c6cb2bb0ce12a1bd9 SHA1 31bcdcbf3f64f01df7eaee76cc4d1784174b7c8f SHA256 3cacade13c89cbb32fb357420babb452c8d6e9d08c9cc5185e4a170d66d64d55
 MISC metadata.xml 164 RMD160 7cd3bffc39aa87dceaef97342b19343323175238 SHA1 97b9dc021ecbad46bf0f3a99aeb204f45792faeb SHA256 e8d7dfabbaf13302703ccc3428fa0ecedf5d444e0c58692ebbd03c5bd0d9240f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPDiTMAAoJEEqz6FtPBkyjnmUIALS4sW5b5qnXKoT2tYoARimQ
-mRC4mdWG4L1QMFGjewTT0mDyXdFJV69Tq9V+NGvWPR2l0OGt5d5iq3nD16xacer8
-mcTMyDFWKWwZ068MJIKG4bxDyLZ4lbyrXFZhx1utrrhYFzuzWgHorEebHBc8U5+D
-IkXsBQXHEcAU7a/VgJ4AkAtkBiDfZdaRYZNgn4VSE1QjecDL8Tj4iMq3ygEvvhtY
-vzjUNQtR9FGXydkd8Wx23r4hQQH7P/5SYEbY0tBLQZGKjYo+yY6ekoTJnGs3bW8d
-xseG9qk5vRxsq89GPeoabQY4pW7KeFpaCLBTghsj4cfd1nwlzBBJrXmcuFjNZXU=
-=bAdY
------END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/rkhunter-1.3.8-file-compat.patch b/app-forensics/rkhunter/files/rkhunter-1.3.8-file-compat.patch
new file mode 100644
index 000000000000..595e99f60147
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-1.3.8-file-compat.patch
@@ -0,0 +1,62 @@
+Applied upstream repo @
+http://rkhunter.cvs.sourceforge.net/viewvc/rkhunter/rkhunter/files/rkhunter?r1=1.396&r2=1.397
+
+--- rkhunter	2011/04/11 22:29:08	1.396
++++ rkhunter	2011/06/01 21:49:23	1.397
+@@ -3,7 +3,7 @@
+ #
+ # rkhunter -- Scan the system for rootkits and other known security issues.
+ #
+-# Copyright (c) 2003-2010, Michael Boelen ( michael AT rootkit DOT nl )
++# Copyright (c) 2003-2011, Michael Boelen ( michael AT rootkit DOT nl )
+ #
+ #     This program is free software; you can redistribute it and/or modify
+ #     it under the terms of the GNU General Public License as published by
+@@ -725,7 +725,7 @@
+ 	#
+ 
+ 	if [ $STRICT -eq 1 ]; then
+-		if [ -n "`echo \"${RKHTMPVAR}\" | grep '[][?*{}]'`" ]; then
++		if [ -n "`echo \"${RKHTMPVAR}\" | grep '[][?*]'`" ]; then
+ 			ERRCODE=1
+ 			test $CONFIG_CHECK -eq 1 && RET_CODE=1
+ 			echo "Invalid ${OPT_NAME} configuration option: Invalid pathname: ${RKHTMPVAR}"
+@@ -3987,7 +3987,7 @@
+ 		HASH_CMD=`echo "${HASH_FUNC}" | cut -d' ' -f1`
+ 
+ 		# Stop globbing from being expanded.
+-		if [ -z "`echo \"${HASH_CMD}\" | grep '[][*?{}]'`" ]; then
++		if [ -z "`echo \"${HASH_CMD}\" | grep '[][*?]'`" ]; then
+ 			HASH_FUNC=`echo ${HASH_FUNC}`
+ 		else
+ 			LEAVE=1
+@@ -4756,7 +4756,7 @@
+ 
+ 		test -z "${FNAME}" && break
+ 
+-		if [ -n "`echo \"${FNAME}\" | grep '^[^/]*[][*?{}][^/]*$'`" ]; then
++		if [ -n "`echo \"${FNAME}\" | grep '^[^/]*[][*?][^/]*$'`" ]; then
+ 			ERRCODE=1
+ 			echo "Invalid USER_FILEPROP_FILES_DIRS configuration option: Invalid pathname: ${FNAME}"
+ 		fi
+@@ -9898,9 +9898,9 @@
+ 					test -n "${BASENAME_CMD}" && RKHTMPVAR=`${BASENAME_CMD} ${FNAME}` || RKHTMPVAR=`echo "${FNAME}" | sed -e 's:^.*/::'`
+ 
+ 					if [ "${RKHTMPVAR}" = "rkhunter" ]; then
+-						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i -v '(shell|/bin/sh) script( |$)'`
++						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i -v '(shell|/bin/sh) script( |,|$)'`
+ 					else
+-						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i ' script( |$)'`
++						SYSSCRIPT=`${FILE_CMD} ${FNAME} 2>&1 | tr -s '	' ' ' | cat -v | egrep -i ' script( |,|$)'`
+ 					fi
+ 
+ 					test -n "${SYSSCRIPT}" && TEST_RESULT="${TEST_RESULT} script"
+@@ -16508,7 +16508,7 @@
+ PROGRAM_NAME="Rootkit Hunter"
+ PROGRAM_version="1.3.9"
+ PROGRAM_copyright_owner="Michael Boelen"
+-PROGRAM_copyright="Copyright (c) 2003-2010, ${PROGRAM_copyright_owner}"
++PROGRAM_copyright="Copyright (c) 2003-2011, ${PROGRAM_copyright_owner}"
+ PROGRAM_blurb="
+ Currently under active development by the ${PROGRAM_NAME} project team.
+ Please review your rkhunter.conf before using.
diff --git a/app-forensics/rkhunter/rkhunter-1.3.8-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..5b6456983fd2
--- /dev/null
+++ b/app-forensics/rkhunter/rkhunter-1.3.8-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.8-r1.ebuild,v 1.1 2012/04/09 03:43:46 darkside Exp $
+
+EAPI=4
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers."
+HOMEPAGE="http://rkhunter.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-shells/bash
+	dev-lang/perl
+	sys-process/lsof
+	virtual/cron
+"
+
+S="${WORKDIR}/${P}/files"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}.conf.patch"
+	epatch "${FILESDIR}/${P}-file-compat.patch"
+}
+
+src_install() {
+	# rkhunter requires to be root
+	dosbin ${PN}
+
+	# rkhunter doesn't create it by itself
+	dodir /var/lib/${PN}/tmp
+
+	insinto /etc
+	doins ${PN}.conf
+
+	exeinto /usr/lib/${PN}/scripts
+	doexe *.pl
+
+	insinto /var/lib/${PN}/db
+	doins *.dat
+
+	insinto /var/lib/${PN}/db/i18n
+	doins i18n/*
+
+	doman ${PN}.8
+	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/${PN}-1.3.cron" ${PN}
+
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
+}
+
+pkg_postinst() {
+	elog "A cron script has been installed to /etc/cron.daily/rkhunter."
+	elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
+	elog "directions."
+	elog "If you want ${PN} to send mail, you will need to install"
+	elog "virtual/mailx or alter the EMAIL_CMD variable in the"
+	elog "cron script and possibly the MAIL_CMD variable in the"
+	elog "${PN}.conf file to use another mail client."
+}