Version bump, thank Alon Bar-Lev and Alex Efros for work, bug #205419. Fixed shell history anomalies, bug #226067, thank Horst Prote for report and fix. Remove old.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

8 files changed, 46 insertions, 235 deletions

diff --git a/app-forensics/chkrootkit/ChangeLog b/app-forensics/chkrootkit/ChangeLog
index da96c8389174..d87c5a81b8b9 100644
--- a/app-forensics/chkrootkit/ChangeLog
+++ b/app-forensics/chkrootkit/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-forensics/chkrootkit
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/ChangeLog,v 1.46 2008/03/12 09:47:31 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/ChangeLog,v 1.47 2008/10/06 19:38:01 pva Exp $
+
+*chkrootkit-0.48 (06 Oct 2008)
+
+  06 Oct 2008; Peter Volkov <pva@gentoo.org>
+  -files/chkrootkit-0.44-coreutils-static-falsepositive.patch,
+  -files/chkrootkit-0.45-makefile.diff,
+  -files/chkrootkit-0.46-add-missing-includes.diff,
+  +files/chkrootkit-0.48-shell-history-anomalies.diff,
+  -chkrootkit-0.44-r1.ebuild, -chkrootkit-0.45.ebuild,
+  -chkrootkit-0.46a.ebuild, +chkrootkit-0.48.ebuild:
+  Version bump, thank Alon Bar-Lev and Alex Efros for work, bug #205419.
+  Fixed shell history anomalies, bug #226067, thank Horst Prote for report
+  and fix. Remove old.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Robert Clark (hyakuhei, #154737) from metadata.xml.
diff --git a/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild b/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild
deleted file mode 100644
index 8584a0c0a57b..000000000000
--- a/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild,v 1.4 2007/01/24 03:16:55 genone Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="a tool to locally check for signs of a rootkit"
-HOMEPAGE="http://www.chkrootkit.org/"
-SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-
-LICENSE="AMS"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${P}-gentoo.diff || die "patch failed"
-	sed -i 's:${head} -:${head} -n :' chkrootkit || die "sed chkrootkit failed"
-	sed -i 's:/var/adm:/var/log:g' chklastlog.c || die "sed chklastlog.c failed"
-	epatch ${FILESDIR}/${P}-coreutils-static-falsepositive.patch || die "patch failed"
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		sense || die "emake sense failed"
-}
-
-src_install() {
-	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp ifpromisc \
-		strings-static || die
-	dodoc README README.chklastlog README.chkwtmp
-
-	exeinto /etc/cron.weekly
-	newexe ${FILESDIR}/${PN}.cron ${PN} || die
-}
-
-pkg_postinst() {
-	echo
-	elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
-	elog
-	elog "Some applications, such as portsentry, will cause chkrootkit"
-	elog "to produce false positives.  Read the chkrootkit FAQ at"
-	elog "http://www.chkrootkit.org/ for more information."
-	echo
-}
diff --git a/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild b/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild
deleted file mode 100644
index f318fa493f05..000000000000
--- a/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild,v 1.2 2007/01/24 03:16:55 genone Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="a tool to locally check for signs of a rootkit"
-HOMEPAGE="http://www.chkrootkit.org/"
-SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
-	mirror://gentoo/${PN}-0.45-gentoo.diff.bz2"
-
-LICENSE="AMS"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# we can use the gentoo patch for 0.45 but it needs one change to apply
-	# cleanly -- certainly not enough to warrant using a separate 32k patch.
-	sed -e 's|\(xlogin\)|\^\1|' ${WORKDIR}/${PN}-0.45-gentoo.diff > \
-								 ${WORKDIR}/${P}-gentoo.diff
-	epatch ${WORKDIR}/${P}-gentoo.diff
-
-	epatch ${FILESDIR}/${PN}-0.45-makefile.diff
-	epatch ${FILESDIR}/${PN}-0.46-add-missing-includes.diff
-
-	sed -i 's:${head} -:${head} -n :' chkrootkit || die "sed chkrootkit failed"
-	sed -i 's:/var/adm:/var/log:g' chklastlog.c || die "sed chklastlog.c failed"
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		sense || die "emake sense failed"
-}
-
-src_install() {
-	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc \
-		strings-static || die
-	dodoc ACKNOWLEDGMENTS README*
-
-	exeinto /etc/cron.weekly
-	newexe ${FILESDIR}/${PN}.cron ${PN} || die
-}
-
-pkg_postinst() {
-	echo
-	elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
-	elog
-	elog "Some applications, such as portsentry, will cause chkrootkit"
-	elog "to produce false positives.  Read the chkrootkit FAQ at"
-	elog "http://www.chkrootkit.org/ for more information."
-	echo
-}
diff --git a/app-forensics/chkrootkit/chkrootkit-0.45.ebuild b/app-forensics/chkrootkit/chkrootkit-0.48.ebuild
index 728e83ba3111..72c739aabf37 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.45.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.48.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.45.ebuild,v 1.11 2007/01/26 20:10:52 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.48.ebuild,v 1.1 2008/10/06 19:38:01 pva Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="a tool to locally check for signs of a rootkit"
 HOMEPAGE="http://www.chkrootkit.org/"
@@ -11,26 +11,20 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
 
 LICENSE="AMS"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.diff
-	epatch ${WORKDIR}/${P}-gentoo.diff
-	sed -i 's:${head} -:${head} -n :' chkrootkit || die "sed chkrootkit failed"
-	sed -i 's:/var/adm:/var/log:g' chklastlog.c || die "sed chklastlog.c failed"
+	cd "${S}"
+
+	epatch "${WORKDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-shell-history-anomalies.diff"
+	sed -i 's:/var/adm/:/var/log/:g' chklastlog.c || die "sed chklastlog.c failed"
 }
 
 src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		sense || die "emake sense failed"
+	emake CC=$(tc-getCC) STRIP=true sense || die "emake sense failed"
 }
 
 src_install() {
@@ -39,7 +33,7 @@ src_install() {
 	dodoc ACKNOWLEDGMENTS README*
 
 	exeinto /etc/cron.weekly
-	newexe ${FILESDIR}/${PN}.cron ${PN} || die
+	newexe "${FILESDIR}"/${PN}.cron ${PN} || die
 }
 
 pkg_postinst() {
diff --git a/app-forensics/chkrootkit/files/chkrootkit-0.44-coreutils-static-falsepositive.patch b/app-forensics/chkrootkit/files/chkrootkit-0.44-coreutils-static-falsepositive.patch
deleted file mode 100644
index 4aa692e775a7..000000000000
--- a/app-forensics/chkrootkit/files/chkrootkit-0.44-coreutils-static-falsepositive.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- chkrootkit.orig	2005-01-23 23:29:05.017022840 +0930
-+++ chkrootkit	2005-01-23 23:30:07.494524816 +0930
-@@ -1354,7 +1354,7 @@
- 
- chk_ls () {
-     STATUS=${NOT_INFECTED}
--LS_INFECTED_LABEL="/dev/ttyof|/dev/pty[pqrs]|/dev/hdl0|\.tmp/lsfile|/dev/hdcc|/dev/ptyxx|duarawkz|/prof|/dev/tux|/security|file\.h"
-+LS_INFECTED_LABEL="/dev/ttyof|/dev/pty[pqrs]|/dev/hdl0|\.tmp/lsfile|/dev/hdcc|/dev/ptyxx|duarawkz|^/prof|/dev/tux|/security|file\.h"
-     CMD=`loc ls ls $pth`
- 
-     if [ "${EXPERT}" = "t" ]; then
-@@ -1371,7 +1371,7 @@
- 
- chk_du () {
-     STATUS=${NOT_INFECTED}
--    DU_INFECTED_LABEL="/dev/ttyof|/dev/pty[pqrsx]|w0rm|/prof|/dev/tux|file\.h"
-+    DU_INFECTED_LABEL="/dev/ttyof|/dev/pty[pqrsx]|w0rm|^/prof|/dev/tux|file\.h"
-     CMD=`loc du du $pth`
- 
-     if [ "${EXPERT}" = "t" ]; then
diff --git a/app-forensics/chkrootkit/files/chkrootkit-0.45-makefile.diff b/app-forensics/chkrootkit/files/chkrootkit-0.45-makefile.diff
deleted file mode 100644
index 3a026e8e9f0c..000000000000
--- a/app-forensics/chkrootkit/files/chkrootkit-0.45-makefile.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --exclude='*~' -urN chkrootkit-0.45.orig/Makefile chkrootkit-0.45/Makefile
---- chkrootkit-0.45.orig/Makefile	2005-02-24 21:08:21.044113456 -0500
-+++ chkrootkit-0.45/Makefile	2005-02-24 21:17:06.437241560 -0500
-@@ -23,48 +23,37 @@
- #CFLAGS	 =
- 
- 
--SRCS   = chklastlog.c chkwtmp.c ifpromisc.c chkproc.c chkdirs.c check_wtmpx.c strings.c
-+SRCS   = chklastlog.c chkwtmp.c ifpromisc.c chkproc.c chkdirs.c strings.c
- 
--OBJS   = chklastlog.o chkwtmp.o ifpromisc.o chkproc.o chkdirs.o check_wtmpx.o strings-static.o
-+OBJS   = chklastlog.o chkwtmp.o ifpromisc.o chkproc.o chkdirs.o strings-static.o
- 
- all:
- 	@echo '*** stopping make sense ***'
- 	@exec make sense
- 
--sense: chklastlog chkwtmp ifpromisc chkproc chkdirs check_wtmpx strings-static chkutmp
-+sense: chklastlog chkwtmp ifpromisc chkproc chkdirs strings-static chkutmp
- 
- chklastlog:   chklastlog.c
--	${CC} ${CFLAGS} -o $@ chklastlog.c
--	@strip $@
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ chklastlog.c
- 
- chkwtmp:   chkwtmp.c
--	${CC} ${CFLAGS} -o $@ chkwtmp.c
--	@strip $@
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkwtmp.c
- 
- ifpromisc:   ifpromisc.c
- 	${CC} ${CFLAGS} ${LDFLAGS}  -D_FILE_OFFSET_BITS=64 -o $@ ifpromisc.c
--	@strip $@
- 
- chkproc:   chkproc.c
--	${CC} ${LDFLAGS} -o $@ chkproc.c
--	@strip $@
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkproc.c
- 
- chkdirs:   chkdirs.c
--	${CC} ${LDFLAGS} -o $@ chkdirs.c
--	@strip $@
--
--check_wtmpx:   check_wtmpx.c
--	${CC} ${LDFLAGS} -o $@ check_wtmpx.c
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkdirs.c
- 	@strip $@
- 
- chkutmp:   chkutmp.c
--	${CC} ${LDFLAGS} -o $@ chkutmp.c
--	@strip $@
--
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ chkutmp.c
- 
- strings-static:   strings.c
--	${CC} ${STATIC} ${LDFLAGS} -o $@ strings.c
--	@strip $@
-+	${CC} ${STATIC} ${CFLAGS} ${LDFLAGS} -o $@ strings.c
- 
- clean:
- 	rm -f ${OBJS} core chklastlog chkwtmp ifpromisc chkproc chkdirs check_wtmpx strings-static chkutmp
diff --git a/app-forensics/chkrootkit/files/chkrootkit-0.46-add-missing-includes.diff b/app-forensics/chkrootkit/files/chkrootkit-0.46-add-missing-includes.diff
deleted file mode 100644
index 99dc86ae0142..000000000000
--- a/app-forensics/chkrootkit/files/chkrootkit-0.46-add-missing-includes.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN chkrootkit-0.46.orig/chkproc.c chkrootkit-0.46/chkproc.c
---- chkrootkit-0.46.orig/chkproc.c	2005-10-27 08:29:26.000000000 -0400
-+++ chkrootkit-0.46/chkproc.c	2005-10-27 08:30:42.000000000 -0400
-@@ -43,6 +43,7 @@
- int main (){ return 0; }
- #else
- #include <stdio.h>
-+#include <string.h>
- #include <errno.h>
- #include <sys/types.h>
- #include <dirent.h>
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN chkrootkit-0.46.orig/chkwtmp.c chkrootkit-0.46/chkwtmp.c
---- chkrootkit-0.46.orig/chkwtmp.c	2005-10-27 08:29:26.000000000 -0400
-+++ chkrootkit-0.46/chkwtmp.c	2005-10-27 08:30:45.000000000 -0400
-@@ -21,6 +21,7 @@
- 
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
- #include <utmp.h>
diff --git a/app-forensics/chkrootkit/files/chkrootkit-0.48-shell-history-anomalies.diff b/app-forensics/chkrootkit/files/chkrootkit-0.48-shell-history-anomalies.diff
new file mode 100644
index 000000000000..0d58bd87d851
--- /dev/null
+++ b/app-forensics/chkrootkit/files/chkrootkit-0.48-shell-history-anomalies.diff
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/show_bug.cgi?id=226067
+
+*** /usr/sbin/chkrootkit.orig	Thu Jun 12 15:20:01 2008
+--- /usr/sbin/chkrootkit	Thu Jun 12 15:28:09 2008
+***************
+*** 1098,1104 ****
+          echo "Warning: \`${files}' file size is zero"
+        files1=`${find} ${ROOTDIR}${HOME} ${findargs} -name '.*history' \( -links 2 -o -type l \)`
+        [ ! -z "${files1}" ] && \
+!         echo "Warning: \`${files}' is linked to another file"
+     fi
+     if [ -z "${files}" -a -z "${files1}" ]; then
+        if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
+--- 1098,1104 ----
+          echo "Warning: \`${files}' file size is zero"
+        files1=`${find} ${ROOTDIR}${HOME} ${findargs} -name '.*history' \( -links 2 -o -type l \)`
+        [ ! -z "${files1}" ] && \
+!         echo "Warning: \`${files1}' is linked to another file"
+     fi
+     if [ -z "${files}" -a -z "${files1}" ]; then
+        if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi