Closes #11164.

3 files changed, 164 insertions, 7 deletions

diff --git a/app-admin/chkrootkit/ChangeLog b/app-admin/chkrootkit/ChangeLog
index 19b55b14e492..d095344040f5 100644
--- a/app-admin/chkrootkit/ChangeLog
+++ b/app-admin/chkrootkit/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-admin/chkrootkit
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/ChangeLog,v 1.3 2002/09/18 20:46:24 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/ChangeLog,v 1.4 2002/11/29 20:45:59 aliz Exp $
 
 *chkrootkit-0.37 (18 Sept 2002)
 
+  29 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> chkrootkit-0.37.ebuild :
+  Added patch from Kurt V. Hindenburg <khindenburg@cherrynebula.net> in #11164.
+
   18 Sept 2002; Daniel Seyffer <gentoo@getroot.de> 
   chkrootkit-0.37.ebuild :
   New features according to www.chkrootkit.org:
diff --git a/app-admin/chkrootkit/chkrootkit-0.37.ebuild b/app-admin/chkrootkit/chkrootkit-0.37.ebuild
index eea7ef47d2b9..78b30a9c4ad2 100644
--- a/app-admin/chkrootkit/chkrootkit-0.37.ebuild
+++ b/app-admin/chkrootkit/chkrootkit-0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/chkrootkit-0.37.ebuild,v 1.4 2002/10/20 18:14:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/chkrootkit-0.37.ebuild,v 1.5 2002/11/29 20:45:59 aliz Exp $
 
 S=${WORKDIR}/${P}
 
@@ -15,18 +15,20 @@ IUSE=""
 
 DEPEND="virtual/glibc"
 
-src_compile() {
-
-	make sense
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
+}
 
+src_compile() {
+	make sense || die
 }
 
 src_install () {
-
 	dosbin check_wtmpx chklastlog chkproc chkrootkit chkwtmp ifpromisc 
 
 	dodoc COPYRIGHT README README.chklastlog README.chkwtmp
-
 }
 
 
diff --git a/app-admin/chkrootkit/files/chkrootkit-0.37-gentoo.diff b/app-admin/chkrootkit/files/chkrootkit-0.37-gentoo.diff
new file mode 100644
index 000000000000..71212baa9fb6
--- /dev/null
+++ b/app-admin/chkrootkit/files/chkrootkit-0.37-gentoo.diff
@@ -0,0 +1,152 @@
+--- chkrootkit-0.37/chkrootkit	2002-09-16 18:03:11.000000000 -0500
++++ chkrootkit	2002-11-24 15:08:33.000000000 -0500
+@@ -10,6 +10,15 @@
+ # (C)1997-2002 Nelson Murilo, Pangeia Informatica, AMS Foundation and others.
+ # All rights reserved
+ 
++# Gentoo specific : Could use `type <command> | cut -f 3 -d " "`
++IFPROMISC="/usr/sbin/ifpromisc"
++CHKLASTLOG="/usr/sbin/chklastlog"
++CHKPROC="/usr/sbin/chkproc"
++CHKWTMP="/usr/sbin/chkwtmp"
++CHECK_WTMPX="/usr/sbin/check_wtmpx"
++# ebuild doesn't install chkrootkit's strings; use gnus.
++STRINGS="/usr/bin/strings"
++
+ ### workaround for some Bourne shell implementations
+ unalias login > /dev/null 2>&1
+ unalias ls > /dev/null 2>&1
+@@ -125,22 +134,22 @@
+        return ${NOT_TESTED}
+     fi
+ 
+-    if [ ! -x ./ifpromisc ]; then
+-      echo "not tested: can't exec ./ifpromisc"
++    if [ ! -x $IFPROMISC ]; then
++      echo "not tested: can't exec $IFPROMISC"
+       return ${NOT_TESTED}
+     fi
+ 
+     if [ "${EXPERT}" = "t" ]; then
+-        expertmode_output "./ifpromisc"
++        expertmode_output "$IFPROMISC"
+         return 5
+     fi
+     echo
+-    ./ifpromisc
++    $IFPROMISC
+ }
+ 
+ z2 () {
+-    if [ ! -x ./chklastlog ]; then
+-      echo "not tested: can't exec ./chklastlog"
++    if [ ! -x $CHKLASTLOG ]; then
++      echo "not tested: can't exec $CHKLASTLOG"
+       return ${NOT_TESTED}
+     fi
+ 
+@@ -148,31 +157,31 @@
+     LASTLOG=`loc lastlog lastlog "${ROOTDIR}var/log ${ROOTDIR}var/adm"`
+ 
+     if [ "${EXPERT}" = "t" ]; then
+-        expertmode_output "./chklastlog -f ${WTMP} -l ${LASTLOG}"
++        expertmode_output "$CHKLASTLOG -f ${WTMP} -l ${LASTLOG}"
+         return 5
+     fi
+ 
+-    if ./chklastlog -f ${WTMP} -l ${LASTLOG}
++    if $CHKLASTLOG -f ${WTMP} -l ${LASTLOG}
+     then
+       if [ "${QUIET}" != "t" ]; then echo "nothing deleted"; fi
+     fi
+ }
+ 
+ wted () {
+-    if [ ! -x ./chkwtmp ]; then
+-      echo "not tested: can't exec ./chkwtmp"
++    if [ ! -x $CHKWTMP ]; then
++      echo "not tested: can't exec $CHKWTMP"
+       return ${NOT_TESTED}
+     fi
+ 
+     if [ "$SYSTEM" = "SunOS" ]; then
+-       if [ ! -x ./check_wtmpx ]; then
+-          echo "not tested: can't exec ./check_wtmpx"
++       if [ ! -x $CHECK_WTMPX ]; then
++          echo "not tested: can't exec $CHECK_WTMPX"
+        else
+           if [ "${EXPERT}" = "t" ]; then
+-             expertmode_output "./check_wtmpx"
++             expertmode_output "$CHECK_WTMPX"
+               return 5
+           fi
+-          if ./check_wtmpx
++          if $CHECK_WTMPX
+              then
+              if [ "${QUIET}" != "t" ]; then \
+                 echo "nothing deleted in /var/adm/wtmpx"; fi
+@@ -183,11 +192,11 @@
+     WTMP=`loc wtmp wtmp "${ROOTDIR}var/log ${ROOTDIR}var/adm"`
+ 
+     if [ "${EXPERT}" = "t" ]; then
+-        expertmode_output "./chkwtmp -f ${WTMP}"
++        expertmode_output "$CHKWTMP -f ${WTMP}"
+         return 5
+     fi
+ 
+-    if ./chkwtmp -f ${WTMP}
++    if $CHKWTMP -f ${WTMP}
+     then
+       if [ "${QUIET}" != "t" ]; then echo "nothing deleted"; fi
+     fi
+@@ -225,15 +234,15 @@
+ {
+     if [ \( "${SYSTEM}" = "Linux"  -o \( "${SYSTEM}" = "FreeBSD" -a \
+        ${V} -gt 43 \) \) -a "${ROOTDIR}" = "/" ]; then
+-      if [ ! -x ./chkproc ]; then
+-        echo "not tested: can't exec ./chkproc"
++      if [ ! -x $CHKPROC ]; then
++        echo "not tested: can't exec $CHKPROC"
+         return ${NOT_TESTED}
+       fi
+ 
+       if [ "${EXPERT}" = "t" ]; then
+          [ -r /proc/ksyms ] &&  ${egrep} -i adore < /proc/ksyms 2>/dev/null
+          [ -d /proc/knark ] &&  ${ls} -la /proc/knark 2> /dev/null
+-          expertmode_output "./chkproc -v"
++          expertmode_output "$CHKPROC -v"
+           return 5
+       fi
+ 
+@@ -248,7 +257,7 @@
+          echo "Warning: Knark LKM installed"
+       fi
+ 
+-      if ./chkproc
++      if $CHKPROC
+       then
+            if [ "${QUIET}" != "t" ]; then echo "nothing detected"; fi
+       else
+@@ -1293,18 +1302,18 @@
+ 
+    if [ "${SYSTEM}" = "Linux" ]
+    then
+-      if [ ! -x ./strings ]; then
+-        printn "can't exec ./strings-static, "
++      if [ ! -x $STRINGS ]; then
++        print "can't exec $STRINGS, "
+         return ${NOT_TESTED}
+       fi
+ 
+       if [ "${EXPERT}" = "t" ]; then
+-          expertmode_output "./strings -a ${CMD}"
++          expertmode_output "$STRINGS -a ${CMD}"
+           return 5
+       fi
+ 
+       ### strings must be a statically linked binary.
+-      if ./strings-static -a ${CMD} > /dev/null 2>&1
++      if $STRINGS -a ${CMD} > /dev/null 2>&1
+       then
+          STATUS=${INFECTED}
+       fi