- 2.1a15

Changed files:
    arpwatch-debian_05debian_fhs.patch -> 1.2
    arpwatch-debian_22secure_tempfile.patch -> 1.2
    arpwatch.spec -> 1.64

diff --git a/arpwatch-debian_05debian_fhs.patch b/arpwatch-debian_05debian_fhs.patch
index 57a1951093e512569aa43153f5d21828b0e0c80b..b08e9cb340e6a47f91135db2a7ce33f49c4a30e5 100644 (file)
--- a/arpwatch-debian_05debian_fhs.patch
+++ b/arpwatch-debian_05debian_fhs.patch
@@ -81,23 +81,23 @@ diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1
  #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}.$$

diff --git a/arpwatch-debian_22secure_tempfile.patch b/arpwatch-debian_22secure_tempfile.patch
index 64f0898624f0582001b9ab775d898e9ab93090d3..7bcc7c3f27a9a4bb8eeba8938c7a2da133a35ae4 100644 (file)
--- a/arpwatch-debian_22secure_tempfile.patch
+++ b/arpwatch-debian_22secure_tempfile.patch
@@ -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 @@ diff -u arpwatch/mkdep:1.1.1.1 arpwatch/mkdep:1.1.1.1.18.1
  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
  

diff --git a/arpwatch.spec b/arpwatch.spec
index 79edf051669f6b12f0ec71bfbd4d38b38aa3e2b7..3ec42d1124b38f9b5bed0ace4eebb674874f2136 100644 (file)
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -3,13 +3,13 @@ Summary(pl.UTF-8):    Arpwatch monitoruje zmiany w parach adresów ethernet/ip
 Summary(ru.UTF-8):     Инструмент для отслеживания IP адресов в локальной сети
 Summary(uk.UTF-8):     Інструмент для відслідковування IP адрес в локальній мережі
 Name:          arpwatch
-Version:       2.1a14
-Release:       0.9
+Version:       2.1a15
+Release:       1
 Epoch:         2
 License:       GPL
 Group:         Applications/Networking
 Source0:       ftp://ftp.ee.lbl.gov/%{name}-%{version}.tar.gz
-# Source0-md5: a80f26ba58012755dbb9fd99fb3af660
+# Source0-md5: cebfeb99c4a7c2a6cee2564770415fe7
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       dmassagevendor
@@ -96,7 +96,8 @@ install -d $RPM_BUILD_ROOT{/var/lib/arpwatch,/etc/{rc.d/init.d,sysconfig}} \
 %{__make} install install-man \
        DESTDIR=$RPM_BUILD_ROOT
 
-install arp2ethers arpfetch bihourly $RPM_BUILD_ROOT%{_sbindir}
+install arp2ethers arpfetch $RPM_BUILD_ROOT%{_sbindir}
+install bihourly.sh $RPM_BUILD_ROOT%{_sbindir}/bihourly
 install *.{awk,dat} massagevendor{,-old} %{SOURCE3} $RPM_BUILD_ROOT/var/lib/arpwatch
 install *.8 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man8
 install ethercodes.dat $RPM_BUILD_ROOT%{_datadir}/%{name}