Update chkrootkit to 0.44

- Fix false positive on NetBSD for "login".  Thanks to Richard Ibbotson for
  helping sort this out.
- Install main shell script and documentation.

chkwtmp.c
	fix: del counter (Thanks to Dietrich Raisin)
chkproc.c
	fix: better support for Linux threads
chkrootkit;
	new rootkit detected: Madalin rootkit
	top and find tests improved for Suse Linux
	more ports added in the bindshell test
	fix: FreeBSD false positives
	fix: slammer detection
	lots of minor bug fixes

4 files changed, 42 insertions, 7 deletions

diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index 3cf8a77d36d..4f2f93762e0 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/05/27 01:22:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/09/28 10:41:59 adrianp Exp $
 #
 
-DISTNAME=		chkrootkit-0.43
-PKGREVISION=		1
+DISTNAME=		chkrootkit-0.44
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.pangeia.com.br/pub/seg/pac/
 
@@ -17,6 +16,18 @@ USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 
 PROGRAMS=	chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static
+DOCDIR=		${PREFIX}/share/doc/chkrootkit
+
+SUBST_CLASSES=		helper
+SUBST_STAGE.helper=	post-patch
+SUBST_FILES.helper=	chkrootkit
+SUBST_SED.helper=	-e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"	\
+			-e "s|./chkproc|${PREFIX}/bin/chkproc|g" 	\
+			-e "s|./chkwtmp|${PREFIX}/bin/chkwtmp|g"	\
+			-e "s|./ifpromisc|${PREFIX}/bin/ifpromisc|g"	\
+			-e "s|./strings-static|${PREFIX}/bin/strings-static|g" \
+			-e "s|./chkdirs|${PREFIX}/bin/chkdirs|g" 	\
+			-e "s|/bin/sh|${SH}|g"
 
 .include "../../mk/compiler.mk"
 
@@ -39,5 +50,10 @@ INSTALLATION_DIRS+=	bin
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/chkrootkit ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/chkrootkit
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.chklastlog ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.chkwtmp ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/chkrootkit/PLIST b/security/chkrootkit/PLIST
index cec8404e14a..55fbf3f6c7d 100644
--- a/security/chkrootkit/PLIST
+++ b/security/chkrootkit/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/17 15:33:52 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/28 10:41:59 adrianp Exp $
 ${WTMPX}bin/check_wtmpx
 bin/chkdirs
 bin/chklastlog
 bin/chkproc
+bin/chkrootkit
 bin/chkwtmp
 bin/ifpromisc
 bin/strings-static
+share/doc/chkrootkit/README
+share/doc/chkrootkit/README.chklastlog
+share/doc/chkrootkit/README.chkwtmp
+@dirrm share/doc/chkrootkit
diff --git a/security/chkrootkit/distinfo b/security/chkrootkit/distinfo
index 95537de59ee..8596ec573ff 100644
--- a/security/chkrootkit/distinfo
+++ b/security/chkrootkit/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2004/05/27 01:22:55 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/09/28 10:41:59 adrianp Exp $
 
-SHA1 (chkrootkit-0.43.tar.gz) = 58e3693823a9b8ab9b6bb609d54b5716af332a00
-Size (chkrootkit-0.43.tar.gz) = 33355 bytes
+SHA1 (chkrootkit-0.44.tar.gz) = 54610d8dac4d0585306d95be5a55c2ac02c5fec6
+Size (chkrootkit-0.44.tar.gz) = 34163 bytes
 SHA1 (patch-aa) = c47ecb09d02c710727420a3adfb7d8b62d721f2d
 SHA1 (patch-ab) = 109a43494bda8d0966164b7684f63a6a83f2d829
+SHA1 (patch-ac) = 857ac79001fd5fc4f3f88e905af212fab63e3d06
diff --git a/security/chkrootkit/patches/patch-ac b/security/chkrootkit/patches/patch-ac
new file mode 100644
index 00000000000..c772abd4483
--- /dev/null
+++ b/security/chkrootkit/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/09/28 10:41:59 adrianp Exp $
+
+--- chkrootkit.orig	Wed Sep 22 11:03:02 2004
++++ chkrootkit	Wed Sep 22 11:04:02 2004
+@@ -1175,7 +1175,7 @@
+ $1 >= 3.0) print 1; else print 0}'` -eq 1 ] && \
+              STATUS=${NOT_INFECTED} || STATUS=${INFECTED};;
+         2) [ "${SYSTEM}" = "FreeBSD"  -o ${SYSTEM} = "NetBSD" -o ${SYSTEM} = \
+-"OpenBSD" -a `echo ${V} | ${awk} '{ if ($1 >= 2.8) print 1; print 0 }'` -eq 1 ] && STATUS=${NOT_INFECTED} || STATUS=${INFECTED};;
++"OpenBSD" -a `echo ${V} | ${awk} '{ if ($1 >= 2.8) print 1; else print 0 }'` -eq 1 ] && STATUS=${NOT_INFECTED} || STATUS=${INFECTED};;
+         7) [ "${SYSTEM}" = "HP-UX" ] && STATUS=${NOT_INFECTED} || STATUS=${INFECTED};;
+         *) STATUS=${INFECTED};;
+         esac