9 files changed, 86 insertions, 103 deletions
diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index e5ff7416b182..d2284989c5e4 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/rkhunter
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.27 2005/03/19 14:26:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.28 2005/03/22 13:15:00 ka0ttic Exp $
+
+*rkhunter-1.2.3 (22 Mar 2005)
+
+  22 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/rkhunter-1.2.2-fix-broken-test.diff,
+  +files/rkhunter-1.2.3-specify-logfile.patch, -rkhunter-1.2.0.ebuild,
+  -rkhunter-1.2.2.ebuild, +rkhunter-1.2.3.ebuild:
+  Version bump; tidy old ebuilds.
 
 *rkhunter-1.2.2 (19 Mar 2005)
 
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index c7c33d88ece9..6fac3947093f 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ef857bb85b1db91d75c5ccc20ec0db77 rkhunter-1.2.0.ebuild 1697
+MD5 2b05b519244f431e22c4d9202b0ce0d1 rkhunter-1.2.3.ebuild 1748
 MD5 023a96c68f424d636a21e1b2cba1f17f rkhunter-1.1.9.ebuild 1697
-MD5 fc49f5a87c05552e0920245c1035857e rkhunter-1.2.2.ebuild 1801
-MD5 084fda699571e872fc01a011d89dcd9a ChangeLog 6539
+MD5 63ba849d4e5692a1b047367ad83e00cc ChangeLog 6821
 MD5 f1608c19ea0727ee36b2a692b1f3470b metadata.xml 264
 MD5 6540238f284620f1b9e679a34d34ae35 rkhunter-1.2.1.ebuild 1747
 MD5 9b82f88f42c67bf2a8b855a851d3cdd7 files/rkhunter-1.2.0-specify-logfile.patch 2439
-MD5 7a80610ccd08ff160d990ae57cae3a81 files/rkhunter-1.2.2-fix-broken-test.diff 647
+MD5 f620bf00896d60c4a4a47ace8956f8ac files/rkhunter-1.2.3-specify-logfile.patch 2481
 MD5 4aace52e301a67ef5b8b23d8d2c5ba46 files/rkhunter.cron 3855
 MD5 2473ff095ea8aa159a379872571b5d43 files/rkhunter.bash-completion 2628
 MD5 a67c10cf68af091e9f17ad100b38ee7c files/rkhunter-1.1.9-specify-logfile.patch 2379
 MD5 a8206bcb42fdb2f63d50390afe76a7be files/digest-rkhunter-1.1.9 66
-MD5 109877c6e8a34dfc0c80865daf3102f0 files/digest-rkhunter-1.2.0 66
 MD5 c8d3c0a3f16a749c915f20be1047f683 files/digest-rkhunter-1.2.1 66
-MD5 9e37d314e5ae875453e463680b85616e files/digest-rkhunter-1.2.2 66
+MD5 ee665b743b036686877333dd0af7fda7 files/digest-rkhunter-1.2.3 66
 MD5 d07a47cbe2364dc010d37ead80ff8f4b files/rkhunter-1.2.1-create-tmpdir.diff 551
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCPDajEZCkKN40op4RAsRyAJwI6TltM5HwtwRKhthm4v58LRnSqgCfZOGz
-5c6dd5fYtfYXVZQvM8gXwMs=
-=/fyt
------END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.0 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.0
deleted file mode 100644
index a90a197b912b..000000000000
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 126001b10d5cb8c2eca8c3cd7c34d67d rkhunter-1.2.0.tar.gz 116932
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.2 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.2
deleted file mode 100644
index 8b007d366603..000000000000
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07c6f9450b9af22c63a3821d96f7e1c9 rkhunter-1.2.2.tar.gz 121868
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.3 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.3
new file mode 100644
index 000000000000..8b5bf2898959
--- /dev/null
+++ b/app-forensics/rkhunter/files/digest-rkhunter-1.2.3
@@ -0,0 +1 @@
+MD5 404ae3f5cde3ede8e3be1ee1f04f52d5 rkhunter-1.2.3.tar.gz 169545
diff --git a/app-forensics/rkhunter/files/rkhunter-1.2.2-fix-broken-test.diff b/app-forensics/rkhunter/files/rkhunter-1.2.2-fix-broken-test.diff
deleted file mode 100644
index a634766f132f..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.2.2-fix-broken-test.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- rkhunter.orig	2005-03-19 09:21:45.000000000 -0500
-+++ rkhunter	2005-03-19 09:20:24.000000000 -0500
-@@ -1,5 +1,6 @@
- #!/bin/bash
- 
-+
- #################################################################################
- #
- #  Rootkit Hunter 
-@@ -3865,7 +3866,7 @@
- 	      USER=`echo "${I}" | cut -d ':' -f1`
- 	      PASSWORD=`echo "${I}" | cut -d ':' -f2`
- 	      # Exclude NIS-user (+::::::)
--	      if [ ! ${USER} = "+" -a "${PASSWORD}" = "" ]; then
-+	      if [ ${USER} != "+" ] && [ "${PASSWORD}" = "" ]; then
- 	        FOUND=1
- 		logtext "Warning! Found passwordless account (${USER})"
- 		logtext "Check this account and give it a password."
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
new file mode 100644
index 000000000000..a3f166e0ddc3
--- /dev/null
+++ b/app-forensics/rkhunter/files/rkhunter-1.2.3-specify-logfile.patch
@@ -0,0 +1,70 @@
+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/rkhunter-1.2.2.ebuild b/app-forensics/rkhunter/rkhunter-1.2.2.ebuild
deleted file mode 100644
index dd8104c9b5f2..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.2.2.ebuild,v 1.1 2005/03/19 14:26:37 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}/${PN}-1.2.0-specify-logfile.patch
-	epatch ${FILESDIR}/${PN}-1.2.1-create-tmpdir.diff
-	epatch ${FILESDIR}/${P}-fix-broken-test.diff
-}
-
-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
-}
diff --git a/app-forensics/rkhunter/rkhunter-1.2.0.ebuild b/app-forensics/rkhunter/rkhunter-1.2.3.ebuild
index 34bc1fb8ffae..f74f4a31d3f6 100644
--- a/app-forensics/rkhunter/rkhunter-1.2.0.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.2.0.ebuild,v 1.1 2005/02/11 10:51:54 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.2.3.ebuild,v 1.1 2005/03/22 13:15:00 ka0ttic Exp $
 
 inherit eutils bash-completion
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-specify-logfile.patch
+	epatch ${FILESDIR}/${PN}-1.2.1-create-tmpdir.diff
 }
 
 src_install() {