This commit was manufactured by cvs2git to create branch 'RA-branch'.

Cherrypick from master 2005-02-23 16:06:39 UTC tiwek <tiwek@pld-linux.org> '- up to 0.45':
    chkrootkit-utmpx.patch -> 1.1
Cherrypick from unlabeled-1.11.4 2005-02-23 16:59:17 UTC tiwek <tiwek@pld-linux.org> '- up to 0.45':
    chkrootkit-names.patch -> 1.11.4.1

diff --git a/chkrootkit-names.patch b/chkrootkit-names.patch
new file mode 100644 (file)
index 0000000..4df1330
--- /dev/null
+++ b/chkrootkit-names.patch
@@ -0,0 +1,152 @@
+--- chkrootkit-0.45/chkrootkit~        2005-02-22 13:57:31.000000000 +0100
++++ chkrootkit-0.45/chkrootkit 2005-02-23 16:06:28.882194672 +0100
+@@ -149,23 +149,23 @@
+     fi
+ 
+     if [ "${EXPERT}" = "t" ]; then
+-        expertmode_output "./ifpromisc" -v
++        expertmode_output "/usr/bin/chkrootkit-ifpromisc" -v
+         return 5
+     fi
+-    if [ ! -x ./ifpromisc ]; then
+-      echo "not tested: can't exec ./ifpromisc"
++    if [ ! -x /usr/bin/chkrootkit-ifpromisc ]; then
++      echo "not tested: can't exec /usr/bin/chkrootkit-ifpromisc"
+       return ${NOT_TESTED}
+     else
+-      [ "${QUIET}" != "t" ] && ./ifpromisc -v || ./ifpromisc -q
++      [ "${QUIET}" != "t" ] && /usr/bin/chkrootkit-ifpromisc -v || /usr/bin/chkrootkit-ifpromisc -q
+     fi
+ }
+ 
+ chkutmp() {
+-    if [ ! -x ./chkutmp ]; then
+-      echo "not tested: can't exec ./chkutmp"
++    if [ ! -x /usr/bin/chkrootkit-chkutmp ]; then
++      echo "not tested: can't exec /usr/bin/chkrootkit-chkutmp"
+       return ${NOT_TESTED}
+     fi
+-    if ./chkutmp
++    if /usr/bin/chkrootkit-chkutmp
+     then
+       if [ "${QUIET}" != "t" ]; then echo "chkutmp: nothing deleted"; fi
+     fi
+@@ -173,8 +173,8 @@
+ }
+ 
+ z2 () {
+-    if [ ! -x ./chklastlog ]; then
+-      echo "not tested: can't exec ./chklastlog"
++    if [ ! -x /usr/bin/chkrootkit-chklastlog ]; then
++      echo "not tested: can't exec /usr/bin/chkrootkit-chklastlog"
+       return ${NOT_TESTED}
+     fi
+ 
+@@ -187,32 +187,32 @@
+     fi
+ 
+     if [ "${EXPERT}" = "t" ]; then
+-        expertmode_output "./chklastlog -f ${WTMP} -l ${LASTLOG}"
++        expertmode_output "/usr/bin/chkrootkit-chklastlog -f ${WTMP} -l ${LASTLOG}"
+         return 5
+     fi
+ 
+-    if ./chklastlog -f ${WTMP} -l ${LASTLOG}
++    if /usr/bin/chkrootkit-chklastlog -f ${WTMP} -l ${LASTLOG}
+     then
+       if [ "${QUIET}" != "t" ]; then echo "chklastlog: nothing deleted"; fi
+     fi
+ }
+ 
+ wted () {
+-    if [ ! -x ./chkwtmp ]; then
+-      echo "not tested: can't exec ./chkwtmp"
++    if [ ! -x /usr/bin/chkrootkit-chkwtmp ]; then
++      echo "not tested: can't exec /usr/bin/chkrootkit-chkwtmp"
+       return ${NOT_TESTED}
+     fi
+ 
+    if [ "$SYSTEM" = "SunOS" ]; then
+-       if [ ! -x ./check_wtmpx ]; then
+-          echo "not tested: can't exec ./check_wtmpx"
++       if [ ! -x /usr/bin/chkrootkit-check_wtmpx ]; then
++          echo "not tested: can't exec /usr/bin/chkrootkit-check_wtmpx"
+        else
+           if [ "${EXPERT}" = "t" ]; then
+-             expertmode_output "./check_wtmpx"
++             expertmode_output "/usr/bin/chkrootkit-check_wtmpx"
+               return 5
+           fi
+         if [ -f ${ROOTDIR}var/adm/wtmp ]; then
+-             if ./check_wtmpx
++             if /usr/bin/chkrootkit-check_wtmpx
+                 then
+                 if [ "${QUIET}" != "t" ]; then \
+                    echo "check_wtmpx: nothing deleted in /var/adm/wtmpx"; fi
+@@ -223,12 +223,12 @@
+        WTMP=`loc wtmp wtmp "${ROOTDIR}var/log ${ROOTDIR}var/adm"`
+ 
+        if [ "${EXPERT}" = "t" ]; then
+-          expertmode_output "./chkwtmp -f ${WTMP}"
++          expertmode_output "/usr/bin/chkrootkit-chkwtmp -f ${WTMP}"
+           return 5
+        fi
+     fi
+ 
+-    if ./chkwtmp -f ${WTMP}
++    if /usr/bin/chkrootkit-chkwtmp -f ${WTMP}
+     then
+       if [ "${QUIET}" != "t" ]; then echo "chkwtmp: nothing deleted"; fi
+     fi
+@@ -267,8 +267,8 @@
+     prog=""
+     if [  \( "${SYSTEM}" = "Linux"  -o \( "${SYSTEM}" = "FreeBSD" -a \
+        `echo ${V} | ${awk} '{ if ($1 > 4.3) print 1; else print 0 }'` -eq 1 \) \) -a "${ROOTDIR}" = "/" ]; then
+-      [ ! -x ./chkproc ] && prog="./chkproc"
+-      [ ! -x ./chkdirs ] && prog="$prog ./chkdirs"
++      [ ! -x /usr/bin/chkrootkit-chkproc ] && prog="/usr/bin/chkrootkit-chkproc"
++      [ ! -x /usr/bin/chkrootkit-chkdirs ] && prog="$prog /usr/bin/chkrootkit-chkdirs"
+       if [ "$prog" != "" ]; then
+ #        echo "not tested: can't exec $prog"
+         return ${NOT_TESTED}
+@@ -280,7 +280,7 @@
+          PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |$awk -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 2; else print 1 }'`
+          [ "$PV" = "" ] &&  PV=1
+          [ "${SYSTEM}" = "SunOS" ] && PV=0
+-         expertmode_output "./chkproc -v -v -p $PV"
++         expertmode_output "/usr/bin/chkrootkit-chkproc -v -v -p $PV"
+          return 5
+       fi
+ 
+@@ -306,7 +306,7 @@
+       if [ "${DEBUG}" = "t" ]; then
+            ${echo} "*** PV=$PV ***"
+       fi
+-      if ./chkproc -p ${PV}
++      if /usr/bin/chkrootkit-chkproc -p ${PV}
+       then
+            if [ "${QUIET}" != "t" ]; then echo "chkproc: nothing detected"; fi
+       else
+@@ -1582,18 +1582,18 @@
+ 
+    if [ "${SYSTEM}" = "Linux" ]
+    then
+-      if [ ! -x ./strings-static ]; then
+-        printn "can't exec ./strings-static, "
++      if [ ! -x /usr/bin/chkrootkit-strings-static ]; then
++        printn "can't exec /usr/bin/chkrootkit-strings-static, "
+         return ${NOT_TESTED}
+       fi
+ 
+       if [ "${EXPERT}" = "t" ]; then
+-          expertmode_output "./strings-static -a ${CMD}"
++          expertmode_output "/usr/bin/chkrootkit-strings-static -a ${CMD}"
+           return 5
+       fi
+ 
+       ### strings must be a statically linked binary.
+-      if ./strings-static -a ${CMD} > /dev/null 2>&1
++      if /usr/bin/chkrootkit-strings-static -a ${CMD} > /dev/null 2>&1
+       then
+          STATUS=${INFECTED}
+       fi

diff --git a/chkrootkit-utmpx.patch b/chkrootkit-utmpx.patch
new file mode 100644 (file)
index 0000000..53a1fba
--- /dev/null
+++ b/chkrootkit-utmpx.patch
@@ -0,0 +1,11 @@
+--- chkrootkit-0.45/chkutmp.c~ 2005-02-22 00:10:19.000000000 +0100
++++ chkrootkit-0.45/chkutmp.c  2005-02-23 16:58:58.898319432 +0100
+@@ -50,7 +49,7 @@
+ #define PS_CMD 0
+ #else
+ #define PS_CMD 1
+-#define UTMP "/var/run/utmp"
++#define UTMP "/var/run/utmpx"
+ #endif
+ 
+ struct ps_line {