Version bump; still suffers from sec bug 90007, so use taviso's patch. Tidy old ebuilds.

(Portage version: 2.0.51.20-r4)

11 files changed, 22 insertions, 291 deletions

diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 423371bc0b24..a552c4cd65e3 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,15 @@
 # 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.37 2005/04/25 19:25:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.38 2005/04/26 11:45:49 ka0ttic Exp $
+
+*rkhunter-1.2.4 (26 Apr 2005)
+
+  26 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/rkhunter-1.1.9-specify-logfile.patch,
+  -files/rkhunter-1.2.0-specify-logfile.patch, -rkhunter-1.1.9.ebuild,
+  -rkhunter-1.2.1.ebuild, -rkhunter-1.2.3.ebuild, +rkhunter-1.2.4.ebuild:
+  Version bump; still suffers from sec bug 90007, so use taviso's patch. Tidy
+  old ebuilds.
 
   25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
   rkhunter-1.2.3-r1.ebuild:
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 67c70e3d6606..1043e2562be3 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,27 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f987ce02af290bd27173142e6eb6733c ChangeLog 7838
+MD5 51b3343a08d563627194f42bd7c6488a rkhunter-1.2.4.ebuild 1867
+MD5 d95ad083c5a4db684e81f41dda90f6f9 ChangeLog 8204
 MD5 f1608c19ea0727ee36b2a692b1f3470b metadata.xml 264
-MD5 6eec7981570045ac62b848a28f444b28 rkhunter-1.2.1.ebuild 1743
-MD5 ae76c95d3c50fbfa26ff883345c0e1ed rkhunter-1.2.3.ebuild 1745
 MD5 d0e7eabdfcfb8017992044405d22a3f0 rkhunter-1.2.3-r1.ebuild 1801
-MD5 023a96c68f424d636a21e1b2cba1f17f rkhunter-1.1.9.ebuild 1697
+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 c8d3c0a3f16a749c915f20be1047f683 files/digest-rkhunter-1.2.1 66
-MD5 a8206bcb42fdb2f63d50390afe76a7be files/digest-rkhunter-1.1.9 66
-MD5 d07a47cbe2364dc010d37ead80ff8f4b files/rkhunter-1.2.1-create-tmpdir.diff 551
+MD5 d551e890ccdac4b11627b01ee12c1d19 files/digest-rkhunter-1.2.4 66
 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 d07a47cbe2364dc010d37ead80ff8f4b files/rkhunter-1.2.1-create-tmpdir.diff 551
 MD5 20350356b04e1a9a2a4ec768692c925b files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff 3114
-MD5 ee665b743b036686877333dd0af7fda7 files/digest-rkhunter-1.2.3 66
-MD5 9b82f88f42c67bf2a8b855a851d3cdd7 files/rkhunter-1.2.0-specify-logfile.patch 2439
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbURbKf2g/qXtneoRAlolAKCxBoLPDMyGN8DI3xWG09SFg6jlAgCeOJhd
-HVQNkziHZN4AuZ64URowATk=
-=O5mQ
------END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.1.9 b/app-forensics/rkhunter/files/digest-rkhunter-1.1.9
deleted file mode 100644
index cb3a531b86db..000000000000
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e24806cb1267124fba6132009e30f1b rkhunter-1.1.9.tar.gz 115254
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.1 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.1
deleted file mode 100644
index 8ea579b18081..000000000000
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5591b84c41a736b1e0ae64947f65b76 rkhunter-1.2.1.tar.gz 119709
diff --git a/app-forensics/rkhunter/files/digest-rkhunter-1.2.3 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.3
deleted file mode 100644
index 8b5bf2898959..000000000000
--- a/app-forensics/rkhunter/files/digest-rkhunter-1.2.3
+++ /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.4 b/app-forensics/rkhunter/files/digest-rkhunter-1.2.4
new file mode 100644
index 000000000000..b14e33886d52
--- /dev/null
+++ b/app-forensics/rkhunter/files/digest-rkhunter-1.2.4
@@ -0,0 +1 @@
+MD5 d3f653233376af34bcdd2837cff56a3a rkhunter-1.2.4.tar.gz 170394
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
deleted file mode 100644
index 82dfe1fa9474..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.1.9-specify-logfile.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/files/rkhunter-1.2.0-specify-logfile.patch b/app-forensics/rkhunter/files/rkhunter-1.2.0-specify-logfile.patch
deleted file mode 100644
index 64d5f24715c0..000000000000
--- a/app-forensics/rkhunter/files/rkhunter-1.2.0-specify-logfile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --exclude='*~' -urN rkhunter.orig/files/development/rkhunter.8 rkhunter/files/development/rkhunter.8
---- rkhunter.orig/files/development/rkhunter.8	2005-02-10 22:35:07.000000000 -0500
-+++ rkhunter/files/development/rkhunter.8	2005-02-11 00:16:43.261318112 -0500
-@@ -60,9 +60,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 --exclude='*~' -urN rkhunter.orig/files/rkhunter rkhunter/files/rkhunter
---- rkhunter.orig/files/rkhunter	2005-02-10 22:35:07.000000000 -0500
-+++ rkhunter/files/rkhunter	2005-02-11 00:46:10.174706448 -0500
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- #################################################################################
- #
-@@ -151,6 +151,11 @@
-       --createlogfile | --createlog | --create-log | --create-logfile)
- 	  DEBUG=1
-           DEBUGLOG=1
-+	  if [[ "$2" != -* ]]
-+	    then
-+		shift
-+		LOGFILE=$1
-+	    fi
- 	  ;;
-       --dbdir)
-           shift
-@@ -230,9 +235,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"
-@@ -4982,7 +4997,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.9.ebuild b/app-forensics/rkhunter/rkhunter-1.1.9.ebuild
deleted file mode 100644
index 7bf963cacb0a..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.1.9.ebuild
+++ /dev/null
@@ -1,63 +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.1.9.ebuild,v 1.6 2005/02/11 10:46:56 dragonheart 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
-}
diff --git a/app-forensics/rkhunter/rkhunter-1.2.1.ebuild b/app-forensics/rkhunter/rkhunter-1.2.1.ebuild
deleted file mode 100644
index 27765d8315ef..000000000000
--- a/app-forensics/rkhunter/rkhunter-1.2.1.ebuild
+++ /dev/null
@@ -1,64 +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.1.ebuild,v 1.5 2005/04/01 20:11:58 hansmi 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}/${P}-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.3.ebuild b/app-forensics/rkhunter/rkhunter-1.2.4.ebuild
index 4a9637ccc5a7..4b077fd9ff11 100644
--- a/app-forensics/rkhunter/rkhunter-1.2.3.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.2.4.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.3.ebuild,v 1.2 2005/04/21 18:49:17 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.2.4.ebuild,v 1.1 2005/04/26 11:45:49 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
@@ -24,7 +24,9 @@ S="${WORKDIR}/${PN}/files"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-specify-logfile.patch
+	# security bug 90007 - insecure tmp file creation
+	epatch ${FILESDIR}/${PN}-1.2.3-fix-insecure-tmp-creation.diff
+	epatch ${FILESDIR}/${PN}-1.2.3-specify-logfile.patch
 	epatch ${FILESDIR}/${PN}-1.2.1-create-tmpdir.diff
 }