Fixed 1.3.4-r1 ebuild. Fixes bug #254100 and thanks to Christian Ruppert <spooky85@gmail.com> for the patches

(Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)

5 files changed, 154 insertions, 1 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 730c5bacfe77..580e4275cf3f 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.64 2009/01/05 17:26:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.65 2009/01/17 20:55:16 patrick Exp $
+
+*rkhunter-1.3.4-r1 (17 Jan 2009)
+
+  17 Jan 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/rkhunter.conf.patch, +files/rkhunter.cron.patch,
+  +files/rkhunter-ppc64.patch, +rkhunter-1.3.4-r1.ebuild:
+  Fixed 1.3.4-r1 ebuild. Fixes bug #254100 and thanks to Christian Ruppert
+  <spooky85@gmail.com> for the patches
 
 *rkhunter-1.3.4 (05 Jan 2009)
 
diff --git a/app-forensics/rkhunter/files/rkhunter-ppc64.patch b/app-forensics/rkhunter/files/rkhunter-ppc64.patch
new file mode 100644
index 000000000000..70a5896abf77
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-ppc64.patch
@@ -0,0 +1,7 @@
+--- rkhunter.orig/files/os.dat	2007-06-15 04:51:07.000000000 +0800
++++ rkhunter/files/os.dat	2008-05-04 00:11:31.000000000 +0800
+@@ -233,3 +233,4 @@
+ 988:Debian stable (arm):/usr/bin/md5sum:/bin:
+ 989:Debian stable (powerpc):/usr/bin/md5sum:/bin:
+ 990:Debian stable (x86_64):/usr/bin/md5sum:/bin:
++991:Gentoo Linux 1.6 (powerpc64):/usr/bin/md5sum:/bin:
diff --git a/app-forensics/rkhunter/files/rkhunter.conf.patch b/app-forensics/rkhunter/files/rkhunter.conf.patch
new file mode 100644
index 000000000000..0b5465590c2a
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter.conf.patch
@@ -0,0 +1,31 @@
+--- rkhunter.conf.old	2009-01-07 17:33:11.000000000 +0100
++++ rkhunter.conf	2009-01-07 17:36:58.000000000 +0100
+@@ -19,6 +19,7 @@
+ # describing the option will say if this is so.
+ #
+ 
++INSTALLDIR=/usr
+ 
+ #
+ # If this option is set to 1, it specifies that the mirrors file
+@@ -84,17 +85,17 @@ MAIL_CMD=mail -s "[rkhunter] Warnings fo
+ # important files will be written to this directory, so be
+ # sure that the directory permissions are tight.
+ #
+-#TMPDIR=/var/lib/rkhunter/tmp
++TMPDIR=/var/lib/rkhunter/tmp
+ 
+ #
+ # Specify the database directory to use.
+ #
+-#DBDIR=/var/lib/rkhunter/db
++DBDIR=/var/lib/rkhunter/db
+ 
+ #
+ # Specify the script directory to use.
+ #
+-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
++SCRIPTDIR=/usr/lib/rkhunter/scripts
+ 
+ #
+ # Specify the root directory to use.
diff --git a/app-forensics/rkhunter/files/rkhunter.cron.patch b/app-forensics/rkhunter/files/rkhunter.cron.patch
new file mode 100644
index 000000000000..87dced7509a1
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter.cron.patch
@@ -0,0 +1,40 @@
+--- files/rkhunter.cron	2005-09-02 12:05:27.000000000 +0200
++++ files/rkhunter.cron	2009-01-12 17:57:10.000000000 +0100
+@@ -1,12 +1,13 @@
+ #!/bin/bash
+-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/files/rkhunter.cron.patch,v 1.1 2009/01/17 20:55:15 patrick Exp $
++# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/files/rkhunter.cron.patch,v 1.1 2009/01/17 20:55:15 patrick Exp $
+ # original author: Aaron Walker <ka0ttic@gentoo.org>
+ 
+ ########################## Begin Configuration ###############################
+ 
+ # Default options - more options may be added depending on the
+ # configuration variables you set below
+-RKHUNTER_OPTS="-c --cronjob --skip-keypress"
++# --cronjob implies -c, --nocolor, --sk
++RKHUNTER_OPTS="--cronjob --summary"
+ 
+ # Set this to 'yes' to enable ; this script does nothing otherwise
+ ENABLE=no
+@@ -60,7 +61,7 @@ fi
+ 
+ # moved this out of config section since it'll
+ # probably never need to be changed
+-RKHUNTER_EXEC="/usr/bin/rkhunter"
++RKHUNTER_EXEC="/usr/sbin/rkhunter"
+ 
+ # sanity check
+ if [[ ! -x "${RKHUNTER_EXEC}" ]] ; then
+@@ -91,9 +92,9 @@ case "${VERBOSITY}" in
+ 	# warnings and errors only
+ 	1)	RKHUNTER_OPTS="${RKHUNTER_OPTS} --quiet" ;;
+ 	# default rkhunter output (no extra options)
+-	2)	;;
+-	# default to option 3 (report-mode)
+-	*)	RKHUNTER_OPTS="${RKHUNTER_OPTS} --report-mode"	;;
++#	2)	;;
++	# default to option 3
++	*)	;;
+ esac
+ 
+ # save old log
diff --git a/app-forensics/rkhunter/rkhunter-1.3.4-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..77a7ae8b7d91
--- /dev/null
+++ b/app-forensics/rkhunter/rkhunter-1.3.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.4-r1.ebuild,v 1.1 2009/01/17 20:55:16 patrick Exp $
+
+EAPI=2
+
+inherit eutils bash-completion
+
+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="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/mta
+	app-shells/bash
+	dev-lang/perl
+	sys-process/lsof"
+
+S="${WORKDIR}/${P}/files"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}.conf.patch"
+	epatch "${FILESDIR}/${PN}-ppc64.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 || die "failed to install ${PN}.conf"
+
+	exeinto /usr/lib/${PN}/scripts
+	doexe *.pl || die "failed to install scripts"
+
+	insinto /var/lib/${PN}/db
+	doins *.dat || die "failed to install dat files"
+
+	insinto /var/lib/${PN}/db/i18n
+	doins i18n/*
+
+	doman ${PN}.8 || die "doman failed"
+	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README WISHLIST || die "dodoc failed"
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}/${PN}.cron" ${PN} || \
+		die "failed to install cron script"
+
+	dobashcompletion "${FILESDIR}/${PN}.bash-completion"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "A cron script has been installed to /etc/cron.daily/rkhunter."
+	einfo "To enable it, edit /etc/cron.daily/rkhunter and follow the"
+	einfo "directions."
+	einfo
+	bash-completion_pkg_postinst
+}
+