4 files changed, 5 insertions, 88 deletions

diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index 5772d0a95ad7..dd2eb6be2b23 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	chkrootkit
-PORTVERSION=	0.41
+PORTVERSION=	0.42
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.pangeia.com.br/pub/seg/pac/
 
-MAINTAINER=	cordeiro@luinil.nic.br
+MAINTAINER=	cordeiro@nic.br
 COMMENT=	A tool to locally check for signs of a rootkit
 
 USE_REINPLACE=	yes
 
 ALL_TARGET=	chkrootkit chklastlog chkwtmp chkproc chkdirs ifpromisc check_wtmpx strings
 
-DOCFILES=	COPYRIGHT README README.chklastlog README.chkwtmp
+DOCFILES=	ACKNOWLEDGMENTS COPYRIGHT README README.chklastlog README.chkwtmp
 
 BINMODE=	0700
 
diff --git a/security/chkrootkit/distinfo b/security/chkrootkit/distinfo
index 92247d7ecd1e..a02597599171 100644
--- a/security/chkrootkit/distinfo
+++ b/security/chkrootkit/distinfo
@@ -1 +1 @@
-MD5 (chkrootkit-0.41.tar.gz) = 5f9a43ba218f76f9ab5ce3d559226831
+MD5 (chkrootkit-0.42.tar.gz) = 0cf494824da31b792484951619ffa5e4
diff --git a/security/chkrootkit/files/patch-chkrootkit b/security/chkrootkit/files/patch-chkrootkit
deleted file mode 100644
index 684a30e781a2..000000000000
--- a/security/chkrootkit/files/patch-chkrootkit
+++ /dev/null
@@ -1,84 +0,0 @@
---- chkrootkit.orig	Sun Aug 24 12:04:58 2003
-+++ chkrootkit	Sun Aug 24 12:08:26 2003
-@@ -1020,8 +1020,10 @@
-              STATUS=${INFECTED}
-           fi;;
-        FreeBSD)
-+          TMP="2"
-+          if [ "${FreeBSD5}" = "yes" ]; then TMP="1"; fi
-           if [ `${strings} -a ${CMD} | \
--                ${egrep} -c "${GENERIC_ROOTKIT_LABEL}"` -ne 2 ]
-+                ${egrep} -c "${GENERIC_ROOTKIT_LABEL}"` -ne "${TMP}" ]
-           then
-              STATUS=${INFECTED}
-           fi;;
-@@ -1053,7 +1055,9 @@
-              fi
-           fi;;
-        FreeBSD)
--          if [ `${strings} -a ${CMD} | ${egrep} -c "${GENERIC_ROOTKIT_LABEL}"` -ne 2 ]
-+          TMP="2"
-+          if [ "${FreeBSD5}" = "yes" ] ; then TMP="1"; fi
-+          if [ `${strings} -a ${CMD} | ${egrep} -c "${GENERIC_ROOTKIT_LABEL}"` -ne "${TMP}" ]
-              then
-              STATUS=${INFECTED}
-           fi;;
-@@ -1264,7 +1268,10 @@
-         return 5
-     fi
- 
--    if ${strings} -a ${CMD} | ${egrep} "${LS_INFECTED_LABEL}" >/dev/null 2>&1
-+    TMP="0"
-+    if [ "${FreeBSD5}" = "yes" ] ; then TMP="1"; fi
-+    if [ `${strings} -a ${CMD} | \
-+          ${egrep} -c "${LS_INFECTED_LABEL}"` -ne "${TMP}" ]
-     then
-        STATUS=${INFECTED}
-     fi
-@@ -1342,7 +1349,10 @@
-         return 5
-     fi
- 
--    if ${strings} -a ${CMD} | ${egrep} "${PS_I_L}" >/dev/null 2>&1
-+    TMP="0"
-+    if [ "${FreeBSD5}" = "yes" ] ; then TMP="1"; fi
-+    if [ `${strings} -a ${CMD} | \
-+          ${egrep} -c "${PS_I_L}"` -ne "${TMP}" ]
-     then
-        STATUS=${INFECTED}
-     fi
-@@ -1560,7 +1570,10 @@
-         return 5
-     fi
- 
--    if ${strings} -a ${CMD} | ${egrep} "${GENERIC_ROOTKIT_LABEL}" > /dev/null 2>&1
-+    TMP="0"
-+    if [ "${FreeBSD5}" = "yes" ] ; then TMP="2"; fi
-+    if [ `${strings} -a ${CMD} | \
-+          ${egrep} -c "${GENERIC_ROOTKIT_LABEL}"` -ne "${TMP}" ]
-     then
-         STATUS=${INFECTED}
-     fi
-@@ -1750,7 +1763,7 @@
-     STATUS=${NOT_INFECTED}
-     CMD=`loc vdir vdir $pth`
-     VDIR_INFECTED_LABEL="/lib/volc"
--    if [ -r ${CMD} ]; then
-+    if [ ! -r ${CMD} ]; then
-         return ${NOT_FOUND}
-     fi
- 
-@@ -2323,6 +2336,13 @@
- 
- SYSTEM=`${uname} -s`
- VERSION=`${uname} -r`
-+
-+if [ "${SYSTEM}" = "FreeBSD" ] ; then
-+   if [ -n '`uname -r | grep "^5"`' ] ; then
-+      FreeBSD5="yes"
-+   fi
-+fi
-+
- if [ "${SYSTEM}" != "FreeBSD" -a ${SYSTEM} != "OpenBSD" ] ; then
-    V=44
- else
diff --git a/security/chkrootkit/pkg-plist b/security/chkrootkit/pkg-plist
index 5c0a5e8c526e..c8c6f2fa7c05 100644
--- a/security/chkrootkit/pkg-plist
+++ b/security/chkrootkit/pkg-plist
@@ -6,6 +6,7 @@ sbin/chkwtmp
 sbin/ifpromisc
 sbin/check_wtmpx
 sbin/strings
+%%PORTDOCS%%share/doc/chkrootkit/ACKNOWLEDGMENTS
 %%PORTDOCS%%share/doc/chkrootkit/COPYRIGHT
 %%PORTDOCS%%share/doc/chkrootkit/README
 %%PORTDOCS%%share/doc/chkrootkit/README.chklastlog