SOURCES: arpwatch-debian_05debian_fhs.patch, arpwatch-debian_22sec...

[areq]

Author: areq                         Date: Sun Sep 16 15:21:45 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2.1a15

---- Files affected:
SOURCES:
   arpwatch-debian_05debian_fhs.patch (1.1 -> 1.2) , arpwatch-debian_22secure_tempfile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/arpwatch-debian_05debian_fhs.patch
diff -u SOURCES/arpwatch-debian_05debian_fhs.patch:1.1 SOURCES/arpwatch-debian_05debian_fhs.patch:1.2
--- SOURCES/arpwatch-debian_05debian_fhs.patch:1.1	Mon May 30 21:59:53 2005
+++ SOURCES/arpwatch-debian_05debian_fhs.patch	Sun Sep 16 17:21:39 2007
@@ -81,23 +81,23 @@
  #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
 Index: arpwatch/bihourly
 diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1
---- arpwatch/bihourly:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/bihourly	Tue Apr 17 13:53:29 2001
+--- arpwatch/bihourly.sh.orig	2006-07-28 18:19:45.000000000 +0000
++++ arpwatch/bihourly.sh	2007-09-16 15:02:47.902987779 +0000
 @@ -6,7 +6,7 @@
- PATH=$PATH:/usr/local/sbin
+ PATH=${PATH}:/usr/local/sbin
  export PATH
  #
 -cd /usr/operator/arpwatch
 +cd /var/lib/arpwatch
  #
- list=`cat list`
- cname=`cat cname`
-@@ -14,7 +14,7 @@
- #
+ list="`cat list`"
+ cname="`cat cname`"
+@@ -26,7 +26,7 @@
+ 
  alist=""
- for r in $list; do \
--	./arpfetch $r $cname > $r 2> $errs
-+	arpfetch $r $cname > $r 2> $errs
- 	if test -s $errs; then
- 		echo "arpfetch $r failed:"
- 		sed -e 's/^/    /' $errs
+ for r in ${list}; do \
+-	./arpfetch ${r} ${cname} > ${r} 2> ${temp1}
++	arpfetch ${r} ${cname} > ${r} 2> ${temp1}
+ 	if [ -s ${temp1} ]; then
+ 		echo "arpfetch ${r} errors:"
+ 		xr=${d}/${r}.$$

================================================================
Index: SOURCES/arpwatch-debian_22secure_tempfile.patch
diff -u SOURCES/arpwatch-debian_22secure_tempfile.patch:1.1 SOURCES/arpwatch-debian_22secure_tempfile.patch:1.2
--- SOURCES/arpwatch-debian_22secure_tempfile.patch:1.1	Mon May 30 21:59:53 2005
+++ SOURCES/arpwatch-debian_22secure_tempfile.patch	Sun Sep 16 17:21:40 2007
@@ -1,36 +1,19 @@
-Index: arpwatch/arpfetch
-diff -u arpwatch/arpfetch:1.1.1.1 arpwatch/arpfetch:1.1.1.1.18.1
---- arpwatch/arpfetch:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpfetch	Wed Aug 11 21:54:18 2004
-@@ -1,5 +1,4 @@
- #!/bin/sh
--# @(#) $Id$ (LBL)
- #
- # arpfetch - collect arp data from a cisco using snmpwalk
- #
-@@ -10,8 +9,8 @@
- #
- host=$1
- cname=$2
--temp=/tmp/arpfetch.temp.$$
--errs=/tmp/arpfetch.errs.$$
-+temp=`tempfile -p arpft -s .temp.tmp`
-+errs=`tempfile -p arpft -s .errs.tmp`
- what="ip.ipnettomediatable.ipnettomediaentry.ipnettomediaphysaddress"
- #
- # Get the data
 Index: arpwatch/bihourly
 diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.18.1
---- arpwatch/bihourly:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/bihourly	Wed Aug 11 21:54:18 2004
-@@ -11,6 +11,7 @@
- list=`cat list`
- cname=`cat cname`
- errs=/tmp/bihourly.$$
-+errs=`tempfile -p arpbh -s .tmp`
+--- arpwatch/bihourly.sh:1.1.1.1	Tue Apr 17 13:31:36 2001
++++ arpwatch/bihourly.sh	Wed Aug 11 21:54:18 2004
+@@ -10,8 +10,8 @@
  #
- alist=""
- for r in $list; do \
+ list="`cat list`"
+ cname="`cat cname`"
+-temp1=/tmp/bihourly.1.$$
+-temp2=/tmp/bihourly.2.$$
+-d=/tmp/errs
++temp1=`mktemp`
++temp2=`mktemp`
++d=`mktemp -d`
+ 
+ # imperfect hack
 Index: arpwatch/mkdep
 diff -u arpwatch/mkdep:1.1.1.1 arpwatch/mkdep:1.1.1.1.18.1
 --- arpwatch/mkdep:1.1.1.1	Tue Apr 17 13:31:37 2001
@@ -40,7 +23,7 @@
  fi
  
 -TMP=/tmp/mkdep$$
-+TMP=`tempfile -p mkdep -s .tmp`
++TMP=`mktemp -p mkdep -s .tmp`
  
  trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/arpwatch-debian_05debian_fhs.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/arpwatch-debian_22secure_tempfile.patch?r1=1.1&r2=1.2&f=u