Revision bump; fix cron job to use mktemp. Keeping keywords. Tidy old ebuilds

(Portage version: 2.0.51.22-r2)

7 files changed, 24 insertions, 95 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 29df1ac6cbe5..83a4af57ac18 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,13 @@
 # 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.48 2005/08/03 18:58:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.49 2005/09/02 09:58:35 ka0ttic Exp $
+
+*rkhunter-1.2.7-r1 (02 Sep 2005)
+
+  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> files/rkhunter.cron,
+  -rkhunter-1.2.3-r1.ebuild, -rkhunter-1.2.7.ebuild,
+  +rkhunter-1.2.7-r1.ebuild:
+  Revision bump; fix cron job to use mktemp.  Keeping keywords. Tidy old ebuilds
 
   03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.2.7.ebuild:
   Stable on alpha.
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index f8c69d390dab..830730e767f3 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ddf4109493c7d8e6181d39a5a093fdaf ChangeLog 9315
+MD5 00dd34bf8d9bcdc76d0c94bc24680073 ChangeLog 9583
 MD5 f1608c19ea0727ee36b2a692b1f3470b metadata.xml 264
-MD5 624673b0f1744eef73e9fc3b02536a9f rkhunter-1.2.7.ebuild 1754
-MD5 d0e7eabdfcfb8017992044405d22a3f0 rkhunter-1.2.3-r1.ebuild 1801
-MD5 ecbc10aed5cbe2c9d0dfcb0df424556e files/digest-rkhunter-1.2.7 66
+MD5 624673b0f1744eef73e9fc3b02536a9f rkhunter-1.2.7-r1.ebuild 1754
+MD5 f620bf00896d60c4a4a47ace8956f8ac files/rkhunter-1.2.3-specify-logfile.patch 2481
+MD5 eebdd27d1012c9798e3b616e352b343a files/rkhunter.cron 3881
 MD5 2473ff095ea8aa159a379872571b5d43 files/rkhunter.bash-completion 2628
+MD5 ecbc10aed5cbe2c9d0dfcb0df424556e files/digest-rkhunter-1.2.7-r1 66
 MD5 d07a47cbe2364dc010d37ead80ff8f4b files/rkhunter-1.2.1-create-tmpdir.diff 551
-MD5 ee665b743b036686877333dd0af7fda7 files/digest-rkhunter-1.2.3-r1 66
-MD5 4aace52e301a67ef5b8b23d8d2c5ba46 files/rkhunter.cron 3855
-MD5 f620bf00896d60c4a4a47ace8956f8ac files/rkhunter-1.2.3-specify-logfile.patch 2481
 MD5 20350356b04e1a9a2a4ec768692c925b files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff 3114
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8RQGKf2g/qXtneoRArgiAJ4+f6pJ9yhSCtLh8qFljnNw9TKezwCeI2FI
-qjehzHyoaIDkovVso0Wg2pA=
-=+pdi
------END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.3-r1 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.3-r1
deleted file mode 100644
index 8b5bf2898959..000000000000
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 404ae3f5cde3ede8e3be1ee1f04f52d5 rkhunter-1.2.3.tar.gz 169545
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.7 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.7-r1
index e058f9ded9c2..e058f9ded9c2 100644
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.2.7
+++ b/app-forensics/rkhunter/files/digest-rkhunter-1.2.7-r1
diff --git a/app-forensics/rkhunter/files/rkhunter.cron b/app-forensics/rkhunter/files/rkhunter.cron
index 15a4dcf46a7a..d5a763d37fe6 100644
--- a/app-forensics/rkhunter/files/rkhunter.cron
+++ b/app-forensics/rkhunter/files/rkhunter.cron
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/files/rkhunter.cron,v 1.2 2004/12/07 10:33:36 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/files/rkhunter.cron,v 1.3 2005/09/02 09:58:35 ka0ttic Exp $
 # original author: Aaron Walker <ka0ttic@gentoo.org>
 
 ########################## Begin Configuration ###############################
@@ -49,21 +49,21 @@ VERBOSITY=3
 ########################### End Configuration ################################
 
 # exit immediately, unless enabled
-[[ "${ENABLE}" != "yes" ]] && exit 0
+[[ "${ENABLE}" == "yes" ]] || exit 0
 
 # debug mode?  (mainly for my benefit)
-if [ -n "$1" ] && [ "$1" = "-d" ] ; then
+if [[ -n "${1}" ]] && [[ ${1} = "-d" ]] ; then
 	set -o verbose -o xtrace
 fi
 
-[ -z "${LOGFILE}" ] && LOGFILE="/var/log/rkhunter.log"
+[[ -z "${LOGFILE}" ]] && LOGFILE="/var/log/rkhunter.log"
 
 # moved this out of config section since it'll
 # probably never need to be changed
 RKHUNTER_EXEC="/usr/bin/rkhunter"
 
 # sanity check
-if [ ! -x "${RKHUNTER_EXEC}" ] ; then
+if [[ ! -x "${RKHUNTER_EXEC}" ]] ; then
 	echo "${RKHUNTER_EXEC} does not exist or is not executable!"
 	exit 1
 fi
@@ -73,7 +73,7 @@ fi
 umask 0077
 
 # all output goes to this temp file
-_tmpout="/tmp/rkhunter.cron.${RANDOM}"
+_tmpout=$(mktemp /tmp/rkhunter.cron.XXXXXX)
 exec > ${_tmpout} 2>&1
 
 # update data files
@@ -98,8 +98,8 @@ esac
 
 # save old log
 if [[ "${LOG}" == "yes" && "${SAVE_OLD_LOGS}" == "yes" ]] ; then
-	if [ -e "${LOGFILE}" ] ; then
-		_tmpfile="${LOGFILE}.${RANDOM}"
+	if [[ -e "${LOGFILE}" ]] ; then
+		_tmpfile=$(mktemp ${LOGFILE}.XXXXXX)
 		mv -f ${LOGFILE} ${_tmpfile}
 		echo -e "--\nrkhunter.cron commencing at: $(date)\n--" >> ${_tmpfile}
 	fi
@@ -117,14 +117,14 @@ if [[ "${SEND_EMAIL}" == "yes" ]] ; then
 fi
 
 # remove temp file
-[ -n "${_tmpout}" ] && rm -f ${_tmpout}
+[[ -n "${_tmpout}" ]] && rm -f ${_tmpout}
 
 [[ "${LOG}" != "yes" ]] && exit ${RV}
 
 # from this point on, we can assume logging is enabled
 
 # append new log to old log and restore
-if [ -n "${_tmpfile}" ] ; then
+if [[ -n "${_tmpfile}" ]] ; then
 	cat ${LOGFILE} >> ${_tmpfile}
 	mv ${_tmpfile} ${LOGFILE}
 fi
diff --git a/app-forensics/rkhunter/rkhunter-1.2.3-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.2.3-r1.ebuild
deleted file mode 100644
index 874cd3e295b3..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.2.3-r1.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.3-r1.ebuild,v 1.5 2005/04/25 19:25:43 kloeri 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}-fix-insecure-tmp-creation.diff
-	epatch ${FILESDIR}/${P}-specify-logfile.patch
-	epatch ${FILESDIR}/${PN}-1.2.1-create-tmpdir.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.7.ebuild b/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild
index 3ad024c57c2f..f1bb7c65087e 100644
--- a/app-forensics/rkhunter/rkhunter-1.2.7.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.2.7-r1.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.7.ebuild,v 1.7 2005/08/03 18:58:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild,v 1.1 2005/09/02 09:58:35 ka0ttic Exp $
 
 inherit eutils bash-completion