New upstream release finally; now officially recognizes Gentoo 1.6 (>=sys-apps/baselayout-1.11.x) w/o whining about an unsupported OS at run-time. Marked 1.1.8-r1 stable on x86.

6 files changed, 151 insertions, 9 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 2f941f56b7ff..ddda8451cd12 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.16 2004/12/28 21:50:07 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.17 2004/12/29 10:43:54 ka0ttic Exp $
+
+*rkhunter-1.1.9 (29 Dec 2004)
+
+  29 Dec 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.1.9-specify-logfile.patch, rkhunter-1.1.8-r1.ebuild,
+  +rkhunter-1.1.9.ebuild:
+  New upstream release finally; now officially recognizes Gentoo 1.6
+  (>=sys-apps/baselayout-1.11.x) w/o whining about an unsupported OS at
+  run-time. Marked 1.1.8-r1 stable on x86.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 2b2973925d32..699fd00e0349 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,9 +1,12 @@
-MD5 c19dcf1d96f8489c3e74a1b9a55b3359 ChangeLog 4929
-MD5 96480362a2e9be199f1f2c885057ff22 rkhunter-1.1.8.ebuild 1548
-MD5 824b611f8625afac8de925079cddf2ac rkhunter-1.1.8-r1.ebuild 2127
+MD5 f8f77819b2b59b1d07bb7a90266d72ff rkhunter-1.1.8-r1.ebuild 2126
+MD5 edcaaec6bf1273afad931749e4c4b11f rkhunter-1.1.9.ebuild 1700
+MD5 47444b95421942553dc8b172c472b1e0 ChangeLog 5293
 MD5 f1608c19ea0727ee36b2a692b1f3470b metadata.xml 264
-MD5 f1345147c35da8e7f1f51ede053106e6 files/digest-rkhunter-1.1.8 66
-MD5 f1345147c35da8e7f1f51ede053106e6 files/digest-rkhunter-1.1.8-r1 66
-MD5 2473ff095ea8aa159a379872571b5d43 files/rkhunter.bash-completion 2628
+MD5 96480362a2e9be199f1f2c885057ff22 rkhunter-1.1.8.ebuild 1548
 MD5 4aace52e301a67ef5b8b23d8d2c5ba46 files/rkhunter.cron 3855
+MD5 2473ff095ea8aa159a379872571b5d43 files/rkhunter.bash-completion 2628
 MD5 46201344c0b062b490ed6e81dcbfc48f files/rkhunter-1.1.8-specify-logfile.patch 1633
+MD5 a67c10cf68af091e9f17ad100b38ee7c files/rkhunter-1.1.9-specify-logfile.patch 2379
+MD5 f1345147c35da8e7f1f51ede053106e6 files/digest-rkhunter-1.1.8 66
+MD5 a8206bcb42fdb2f63d50390afe76a7be files/digest-rkhunter-1.1.9 66
+MD5 f1345147c35da8e7f1f51ede053106e6 files/digest-rkhunter-1.1.8-r1 66
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.1.9 b/app-forensics/rkhunter/files/digest-rkhunter-1.1.9
new file mode 100644
index 000000000000..cb3a531b86db
--- /dev/null
+++ b/app-forensics/rkhunter/files/digest-rkhunter-1.1.9
@@ -0,0 +1 @@
+MD5 2e24806cb1267124fba6132009e30f1b rkhunter-1.1.9.tar.gz 115254
diff --git a/app-forensics/rkhunter/files/rkhunter-1.1.9-specify-logfile.patch b/app-forensics/rkhunter/files/rkhunter-1.1.9-specify-logfile.patch
new file mode 100644
index 000000000000..82dfe1fa9474
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-1.1.9-specify-logfile.patch
@@ -0,0 +1,66 @@
+diff -urN rkhunter.orig/files/development/rkhunter.8 rkhunter/files/development/rkhunter.8
+--- rkhunter.orig/files/development/rkhunter.8	2004-12-28 09:04:06.000000000 -0500
++++ rkhunter/files/development/rkhunter.8	2004-12-28 23:48:02.100576696 -0500
+@@ -54,9 +54,10 @@
+ Use another configuration file, instead of the default one
+ .TP
+ .B
+---createlogfile
++--createlogfile <file>
+ A plain text file summarizing \fBrkhunter\fP's findings will be
+-output to the path/filename specified after the switch
++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 -urN rkhunter.orig/files/rkhunter rkhunter/files/rkhunter
+--- rkhunter.orig/files/rkhunter	2004-12-28 12:45:21.000000000 -0500
++++ rkhunter/files/rkhunter	2004-12-28 23:26:33.507472624 -0500
+@@ -146,6 +146,11 @@
+       --createlogfile | --createlog | --create-log | --create-logfile)
+ 	  DEBUG=1
+           DEBUGLOG=1
++	  if [[ "$2" != -* ]]
++	    then
++		shift
++		LOGFILE=$1
++	    fi
+ 	  ;;
+       --dbdir)
+           shift
+@@ -225,12 +230,21 @@
+     # 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"
++	  DEBUGFILE="/dev/null"
+     fi
+     # Clear debug file
+     if [ -f ${DEBUGFILE} ]; then
+@@ -4949,7 +4963,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/rkhunter-1.1.8-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.1.8-r1.ebuild
index 7933d50cb86d..b62cdcfbbdbb 100644
--- a/app-forensics/rkhunter/rkhunter-1.1.8-r1.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.1.8-r1.ebuild,v 1.1 2004/12/07 10:33:36 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.1.8-r1.ebuild,v 1.2 2004/12/29 10:43:54 ka0ttic Exp $
 
 inherit eutils bash-completion
 
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.rootkit.nl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~alpha ~amd64 ~sparc"
 IUSE=""
 
 DEPEND="app-arch/tar
diff --git a/app-forensics/rkhunter/rkhunter-1.1.9.ebuild b/app-forensics/rkhunter/rkhunter-1.1.9.ebuild
new file mode 100644
index 000000000000..e3cbf6716865
--- /dev/null
+++ b/app-forensics/rkhunter/rkhunter-1.1.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.1.9.ebuild,v 1.1 2004/12/29 10:43:54 ka0ttic Exp $
+
+inherit eutils bash-completion
+
+DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers."
+HOMEPAGE="http://www.rootkit.org/"
+SRC_URI="http://downloads.rootkit.nl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~sparc"
+IUSE=""
+
+DEPEND="app-arch/tar
+	app-arch/gzip
+	virtual/mta"
+RDEPEND="app-shells/bash
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}/files"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-specify-logfile.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"
+
+	dobin 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
+	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
+	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."
+	bash-completion_pkg_postinst
+}
+
+pkg_prerm() {
+	rm -rf /usr/lib/rkhunter/tmp
+}