Version bump thanks to Charles Marcus (bug #295433). RDEPEND on virtual/cron and virtual/mailx thanks to p0 (bug #301707).

(Portage version: 2.2_rc67/cvs/Linux i686)

6 files changed, 20 insertions, 186 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 771f87f30ed0..682e81a15434 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.76 2010/01/19 22:37:48 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.77 2010/07/08 04:25:34 jer Exp $
+
+*rkhunter-1.3.6 (08 Jul 2010)
+
+  08 Jul 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/rkhunter-1.2.1-create-tmpdir.diff,
+  -files/rkhunter-1.2.3-specify-logfile.patch, -rkhunter-1.2.9-r1.ebuild,
+  -files/rkhunter-1.2.9-ppc64.patch, -rkhunter-1.3.4-r2.ebuild,
+  +rkhunter-1.3.6.ebuild:
+  Version bump thanks to Charles Marcus (bug #295433). RDEPEND on
+  virtual/cron and virtual/mailx thanks to p0 (bug #301707).
 
   19 Jan 2010; Tiago Cunha <tcunha@gentoo.org> rkhunter-1.3.4-r3.ebuild:
   stable sparc, bug 287269
diff --git a/app-forensics/rkhunter/files/rkhunter-1.2.1-create-tmpdir.diff b/app-forensics/rkhunter/files/rkhunter-1.2.1-create-tmpdir.diff
deleted file mode 100644
index ab0ec495cc7a..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.2.1-create-tmpdir.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --exclude='*~' -urN rkhunter.orig/files/rkhunter rkhunter/files/rkhunter
---- rkhunter.orig/files/rkhunter	2005-02-21 23:22:16.277815344 -0500
-+++ rkhunter/files/rkhunter	2005-02-21 23:25:43.586299664 -0500
-@@ -2072,8 +2072,8 @@
- 	  then
- 	    logtext "Info: using ${TMPDIR} as temporary directory"
- 	  else
--	    logtext "Fatal: temporary directory ${TMPDIR} doesn't exist." >> ${DEBUGFILE}
--	    exit 1
-+	    logtext "Info: ${TMPDIR} not present.  Creating it." >> ${DEBUGFILE}
-+	    mkdir -p ${TMPDIR}
- 	fi
- 
- 	if [ `${BINPREFIX}id -u` = "0" ]
diff --git a/app-forensics/rkhunter/files/rkhunter-1.2.3-specify-logfile.patch b/app-forensics/rkhunter/files/rkhunter-1.2.3-specify-logfile.patch
deleted file mode 100644
index a3f166e0ddc3..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.2.3-specify-logfile.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --exclude='*~' -urN rkhunter.orig/files/development/rkhunter.8 rkhunter/files/development/rkhunter.8
---- rkhunter.orig/files/development/rkhunter.8	2005-03-22 00:08:59.000000000 -0500
-+++ rkhunter/files/development/rkhunter.8	2005-03-22 00:11:41.000000000 -0500
-@@ -60,9 +60,10 @@
- Use another configuration file, instead of the default one
- .TP
- .B
----createlogfile
--A plain text file summarizing \fBrkhunter\fP's findings. Default file
--is /var/log/rkhunter.log.
-+--createlogfile <file>
-+A plain text file summarizing \fBrkhunter\fP's findings will be
-+output to the path/filename specified after the switch.  If no
-+filename is specified, a default of /var/log/rkhunter.log is used.
- .TP
- .B
- --cronjob
-diff --exclude='*~' -urN rkhunter.orig/files/rkhunter rkhunter/files/rkhunter
---- rkhunter.orig/files/rkhunter	2005-03-22 00:08:59.000000000 -0500
-+++ rkhunter/files/rkhunter	2005-03-22 00:09:22.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- #################################################################################
- #
-@@ -156,6 +156,11 @@
-       --createlogfile | --createlog | --create-log | --create-logfile)
- 	  DEBUG=1
-           DEBUGLOG=1
-+	  if [[ "$2" != -* ]]
-+	    then
-+		shift
-+		LOGFILE=$1
-+	    fi
- 	  ;;
-       --dbdir)
-           shift
-@@ -235,9 +240,19 @@
-     # Through the drain...
-     DEBUGFILE="/dev/null"
-   else
--    if [ -d "/var/log" ]
-+    if [[ -n "${LOGFILE}" ]]
-       then
--        DEBUGFILE="/var/log/rkhunter.log"
-+	if ( [[ "${LOGFILE}" == */* ]] && [ -d "${LOGFILE%/*}" ] ) || [ -w ./ ]
-+	    then
-+		DEBUGFILE="${LOGFILE}"
-+	    fi
-+
-+      elif [[ -d "/var/log" ]]
-+        then
-+	    DEBUGFILE="/var/log/rkhunter.log"
-+	    [[ -n "${LOGFILE}" ]] && echo \
-+		"${LOGFILE%/*} doesn't exist... trying ${DEBUGFILE}"
-+	
-       else
-         echo "/var/log doesn't exists... no log file created"
- 	DEBUGFILE="/dev/null"
-@@ -5005,7 +5020,8 @@
-     echo $ECHOOPT ""
-     echo $ECHOOPT "Valid parameters:"
-     echo $ECHOOPT "--checkall (-c)           : Check system"
--    echo $ECHOOPT "--createlogfile*          : Create logfile"
-+    echo $ECHOOPT "--createlogfile <file>*   : Create logfile (file is optional, defaults to"
-+    echo $ECHOOPT "			     : /var/log/rkhunter.log)"
-     echo $ECHOOPT "--cronjob                 : Run as cronjob (removes colored layout)"
-     echo $ECHOOPT "--display-logfile         : Show logfile at end of the output"    
-     echo $ECHOOPT "--help (-h)               : Show this help"
diff --git a/app-forensics/rkhunter/files/rkhunter-1.2.9-ppc64.patch b/app-forensics/rkhunter/files/rkhunter-1.2.9-ppc64.patch
deleted file mode 100644
index 27c7363aa52d..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.2.9-ppc64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru rkhunter-1.2.9.orig/files/os.dat rkhunter-1.2.9/files/os.dat
---- rkhunter-1.2.9.orig/files/os.dat	2006-09-30 12:16:27.000000000 +1000
-+++ rkhunter-1.2.9/files/os.dat	2007-02-18 22:05:23.000000000 +1100
-@@ -181,3 +181,5 @@
- 722:Red Hat Enterprise Linux ES release 3 (Taroon Update 8):/usr/bin/md5sum:/bin:
- 722:Red Hat Enterprise Linux WS release 3 (Taroon Update 8):/usr/bin/md5sum:/bin:
- 722:Red Hat Enterprise Linux AS release 3 (Taroon Update 8):/usr/bin/md5sum:/bin:
-+723:Gentoo Linux 1.6 (powerpc64):/usr/bin/md5sum:/bin:
-+
-diff -ru rkhunter-1.2.9.orig/files/rkhunter rkhunter-1.2.9/files/rkhunter
---- rkhunter-1.2.9.orig/files/rkhunter	2007-02-18 21:59:23.000000000 +1100
-+++ rkhunter-1.2.9/files/rkhunter	2007-02-18 22:05:48.000000000 +1100
-@@ -2055,11 +2055,12 @@
- 	    version=`cat /etc/gentoo-release | awk '{ print $5 }' | cut -d '.' -f1,2`
- 	    uname_model=`uname -m`
- 		case $uname_model in
--		    i[0-9]86) architecture=i386;    ;;
--		    ppc)      architecture=powerpc; ;;
--		    sparc)    architecture=sparc;   ;;
--		    sparc64)  architecture=sparc64; ;;
--		    x86_64)   architecture=x86_64;  ;;
-+		    i[0-9]86) architecture=i386;      ;;
-+		    ppc)      architecture=powerpc;   ;;
-+		    ppc64)    architecture=powerpc64; ;;
-+		    sparc)    architecture=sparc;     ;;
-+		    sparc64)  architecture=sparc64;   ;;
-+		    x86_64)   architecture=x86_64;    ;;
- 		esac	  
- 		logtext "Architecture ${uname_model} (->${architecture})"
- 
diff --git a/app-forensics/rkhunter/rkhunter-1.2.9-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.2.9-r1.ebuild
deleted file mode 100644
index ab7376d62365..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.2.9-r1.ebuild,v 1.1 2009/02/15 11:27:02 patrick Exp $
-
-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/rkhunter/${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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.1-create-tmpdir.diff
-	epatch "${FILESDIR}"/${PN}-1.2.9-ppc64.patch
-}
-
-src_install() {
-	insinto /usr/lib/rkhunter/db
-	doins *.dat || die "failed to install dat files"
-
-	exeinto /usr/lib/rkhunter/scripts
-	doexe *.pl check_update.sh || die "failed to install scripts"
-
-	dosbin rkhunter || die "failed to install rkhunter script"
-
-	insinto /etc
-	doins rkhunter.conf || die "failed to install rkhunter.conf"
-	dosed 's:^#\(DBDIR=.*\)local\(.*\)$:\1lib\2\nINSTALLDIR=/usr:' \
-		/etc/rkhunter.conf || die "sed rkhunter.conf failed"
-
-	doman development/rkhunter.8 || die "doman failed"
-	dodoc CHANGELOG LICENSE README WISHLIST || die "dodoc failed"
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/rkhunter.cron rkhunter || \
-		die "failed to install cron script"
-	dobashcompletion ${FILESDIR}/${PN}.bash-completion
-}
-
-pkg_postinst() {
-	echo
-	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."
-	echo
-	bash-completion_pkg_postinst
-}
-
-pkg_prerm() {
-	rm -rf /usr/lib/rkhunter/tmp
-}
diff --git a/app-forensics/rkhunter/rkhunter-1.3.4-r2.ebuild b/app-forensics/rkhunter/rkhunter-1.3.6.ebuild
index 9759c43b5821..3201c98346f5 100644
--- a/app-forensics/rkhunter/rkhunter-1.3.4-r2.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r2.ebuild,v 1.3 2009/07/29 15:50:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.3.6.ebuild,v 1.1 2010/07/08 04:25:34 jer Exp $
 
 EAPI=2
 
@@ -12,19 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="virtual/mta
+RDEPEND="
 	app-shells/bash
 	dev-lang/perl
-	sys-process/lsof"
+	sys-process/lsof
+	virtual/cron
+	virtual/mailx
+"
 
 S="${WORKDIR}/${P}/files"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}.conf.patch"
-	epatch "${FILESDIR}/${PN}-ppc64.patch"
 }
 
 src_install() {
@@ -47,7 +49,7 @@ src_install() {
 	doins i18n/*
 
 	doman ${PN}.8 || die "doman failed"
-	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README WISHLIST || die "dodoc failed"
+	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README || die "dodoc failed"
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}/${PN}-1.3.cron" ${PN} || \