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

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28 x86_64

6 files changed, 159 insertions, 2 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/Manifest b/app-forensics/rkhunter/Manifest
index 5d8742131813..6338e510bb05 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,8 +1,11 @@
 AUX rkhunter-1.2.1-create-tmpdir.diff 551 RMD160 dbcb928cba8fc847c118970ef613ebc49e4bd972 SHA1 a6a2430ed295ced12efd79224066fe8f314d89ec SHA256 900acac0077f0aaf61773c49c256ba0cc506e51e9a1c0dfdd9be00b35fa8a882
 AUX rkhunter-1.2.3-specify-logfile.patch 2481 RMD160 0a3450cd8f7799c63c4d78d8189d93ddf2eda02a SHA1 84db30b4f7319acd3bd4d1d7bdc63adff2349e7a SHA256 111be216f8b15876ef134e66905f665af722967f218bc401ac595cf89b4f2468
 AUX rkhunter-1.2.9-ppc64.patch 1462 RMD160 93abd74545ef5320716d882f4818ab2b05a2b642 SHA1 7a1a4698e78a543ae345f715e2bea704e60a5b9b SHA256 7106dfea15f063448476f657df4a9a17789ab77ab7d0e5526d3a659b8355f88b
+AUX rkhunter-ppc64.patch 353 RMD160 338c519108f8be28605ce4a1109bfd762fa4c90f SHA1 9219cba514785638e5977dd284dbdfb0f60ee813 SHA256 dfbb2fb8e54e405d935c9c0fefd5ee494b675c496eea97c3d08491641da68163
 AUX rkhunter.bash-completion 2628 RMD160 f408877f6b8d38bfb17af6074e5a1fbecc134cd6 SHA1 a0a007ecda0de61d5e8044672048c6f406183cfb SHA256 d99776d6b300697cb6571e409e6c93bc96e68980922ee22b76eda56f26d0d970
+AUX rkhunter.conf.patch 786 RMD160 6d645ca67b77e3c6abacbc2c0de259e5e6204852 SHA1 9dbb80960b2273a7fb8d4fcd1b4ccb758b91c5cc SHA256 2ca73ff5b9e7b6b3b1c65948813f5124662b8fb6087108adebccd9aa5e4a19d8
 AUX rkhunter.cron 3881 RMD160 6e4948187457f8000817583226ac9184a5911e1d SHA1 e73f69590ceddfbdbb0def6af32949fec7f33a70 SHA256 9482f706b930e11f27b11444005ff48efe830417f86303e9d1f68feb8cae2d49
+AUX rkhunter.cron.patch 1419 RMD160 3722f0e33ef09a8ef4cc4fd7c8190ee906530d6f SHA1 c7e32a7d4f42fe69a9bb94c21a0a98e68552b78d SHA256 2768049e1c49216eaa4473b3fc9fe179d188109eabf3f1e6c326bde5ce20c415
 DIST rkhunter-1.2.7.tar.gz 170732 RMD160 12262942d90bd4f42e7bd4ba19d9426a736c0d84 SHA1 1ef3eef721c6ab38c118d7ed92e587fc234b91b4 SHA256 469e0087f9ab460d901241b6d80b1ad341ba5827e643127c68c4b865bc9e1972
 DIST rkhunter-1.2.8.tar.gz 126314 RMD160 c0cc2fbe8d58bbf7a5f495d7c4fdcf993271796b SHA1 1a882ef4351214facffcad1d5c0e7acf1a9d875b SHA256 7a8c364fe1653c8f9d64054d07d2272ea239a5225ce2044024d79467df873c18
 DIST rkhunter-1.2.9.tar.gz 147123 RMD160 ffa89d3c953bd0f1d8266067ae1e99b829bdc504 SHA1 42d2125f5c145ee77c162d6d5cca50e06af7a3a0 SHA256 64d21cef13574338f49015127d369e1f02515fe4eb81cbda716d885ff4cd1278
@@ -10,6 +13,7 @@ DIST rkhunter-1.3.4.tar.gz 275653 RMD160 c4d4998c960e300a86fa0891f6da1bcc14d8eb4
 EBUILD rkhunter-1.2.7-r1.ebuild 1762 RMD160 0257fd6f4868e163527b886f5f13b953b10d8130 SHA1 b7d4330905c55ae765cee85fa962f8c53882a48f SHA256 67e5bada442898eb23a64701e77f577d3867882dca40a9bbd6c42dd1e5b070e0
 EBUILD rkhunter-1.2.8.ebuild 1765 RMD160 bf7a52d55663835646a869577238aff88ed7d332 SHA1 7608646479130fe51d6f6d34bac45567e3f2a214 SHA256 f549cf8097baa39b93625c4b1e6ceb8cb22dc1af33c10788a7f399525601c8d6
 EBUILD rkhunter-1.2.9.ebuild 1760 RMD160 aea4b84154e0ffae6fa443a2347604eb4d0abb59 SHA1 d124ff1901121094d878deb8c0f26ca034b2e09b SHA256 ae5bb0c997810824fea9ef013628a982d4b02ca8b0023ca41a13717663c1ec05
+EBUILD rkhunter-1.3.4-r1.ebuild 1636 RMD160 850743ea58f57a47f6493daca2afc252244b7c58 SHA1 313fb8d1e0cb3a13f2c85b4cbb247b9cd9a67adf SHA256 b00a2720558d32b2ad2561d508d194fa59af371332620e215cb3d4364ef6b840
 EBUILD rkhunter-1.3.4.ebuild 1769 RMD160 aa49cfa1fc93444bb38cc0639c179b80d0e5eb29 SHA1 0ae72a106d02ce6eea55b2959c06ff6c07798fab SHA256 504f99676d6a0eb98edfdba6728735bbd2be88225a421e805f6dd677b5aa13b2
-MISC ChangeLog 11506 RMD160 57ab7ba41bf36661a66a9ee6c4c76e27fe6445f4 SHA1 6c35ab35f65261075f21593c14596d2899e1f2d1 SHA256 81960ed3451d1224112770f8420f8d53c7d735d135f0d2ec7cf5d24e983a1e4f
+MISC ChangeLog 11821 RMD160 5dd280851402973ea2500aa2d26f305b262b5979 SHA1 c1573420ac2168eedcada11cc54f97ae02e0ee24 SHA256 4b871b596648388d3417b8c33aa26c5e471d78de9c36605797cfded219f8f0a8
 MISC metadata.xml 164 RMD160 7cd3bffc39aa87dceaef97342b19343323175238 SHA1 97b9dc021ecbad46bf0f3a99aeb204f45792faeb SHA256 e8d7dfabbaf13302703ccc3428fa0ecedf5d444e0c58692ebbd03c5bd0d9240f
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
+}
+