openwrt/package/arpwatch/patches/005_debian_fhs

   1 Index: arpwatch/Makefile.in
   2 diff -u arpwatch/Makefile.in:1.1.1.1 arpwatch/Makefile.in:1.1.1.1.10.1
   3 --- arpwatch/Makefile.in:1.1.1.1        Tue Apr 17 13:31:36 2001
   4 +++ arpwatch/Makefile.in        Tue Apr 17 13:53:29 2001
   5 @@ -31,7 +31,8 @@
   6  # Pathname of directory to install the man page
   7  MANDEST = @mandir@
   8  # Pathname of directory to install database file
   9 -ARPDIR = $(prefix)/arpwatch
  10 +ARPDIR = /var/lib/arpwatch
  11 +ETHERCODES = /usr/share/arpwatch/ethercodes.dat
  12
  13  # VPATH
  14  srcdir = @srcdir@
  15 @@ -45,7 +46,8 @@
  16  PROG = arpwatch
  17  CCOPT = @V_CCOPT@
  18  INCLS = -I. @V_INCLS@
  19 -DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
  20 +DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
  21 +       -DETHERCODES=\"$(ETHERCODES)\"
  22
  23  # Standard CFLAGS
  24  CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
  25 Index: arpwatch/arpsnmp.8
  26 diff -u arpwatch/arpsnmp.8:1.1.1.1 arpwatch/arpsnmp.8:1.1.1.1.10.1
  27 --- arpwatch/arpsnmp.8:1.1.1.1  Tue Apr 17 13:31:36 2001
  28 +++ arpwatch/arpsnmp.8  Tue Apr 17 13:53:29 2001
  29 @@ -1,4 +1,4 @@
  30 -.\" @(#) $Id$ (LBL)
  31 +.\" @(#) $Id$ (LBL)
  32  .\"
  33  .\" Copyright (c) 1996, 1997, 1999, 2000
  34  .\"    The Regents of the University of California.  All rights reserved.
  35 @@ -69,9 +69,9 @@
  36  .na
  37  .nh
  38  .nf
  39 -/usr/operator/arpwatch - default directory
  40 +/var/lib/arpwatch - default directory
  41  arp.dat - ethernet/ip address database
  42 -ethercodes.dat - vendor ethernet block list
  43 +/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
  44  .ad
  45  .hy
  46  .fi
  47 Index: arpwatch/arpwatch.8
  48 diff -u arpwatch/arpwatch.8:1.1.1.1 arpwatch/arpwatch.8:1.1.1.1.10.1
  49 --- arpwatch/arpwatch.8:1.1.1.1 Tue Apr 17 13:31:36 2001
  50 +++ arpwatch/arpwatch.8 Tue Apr 17 13:53:29 2001
  51 @@ -1,4 +1,4 @@
  52 -.\" @(#) $Id$ (LBL)
  53 +.\" @(#) $Id$ (LBL)
  54  .\"
  55  .\" Copyright (c) 1992, 1994, 1996, 1997, 2000
  56  .\"    The Regents of the University of California.  All rights reserved.
  57 @@ -152,9 +152,9 @@
  58  .na
  59  .nh
  60  .nf
  61 -/usr/operator/arpwatch - default directory
  62 +/var/lib/arpwatch - default directory
  63  arp.dat - ethernet/ip address database
  64 -ethercodes.dat - vendor ethernet block list
  65 +/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
  66  .ad
  67  .hy
  68  .fi
  69 Index: arpwatch/arpwatch.h
  70 diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1
  71 --- arpwatch/arpwatch.h:1.1.1.1 Tue Apr 17 13:31:36 2001
  72 +++ arpwatch/arpwatch.h Tue Apr 17 13:53:29 2001
  73 @@ -1,7 +1,7 @@
  74  /* @(#) $Id$ (LBL) */
  75
  76  #define ARPFILE "arp.dat"
  77 -#define ETHERCODES "ethercodes.dat"
  78 +/* #define ETHERCODES "ethercodes.dat" */
  79  #define CHECKPOINT (15*60)             /* Checkpoint time in seconds */
  80
  81  #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
  82 Index: arpwatch/bihourly
  83 diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1
  84 --- arpwatch/bihourly:1.1.1.1   Tue Apr 17 13:31:36 2001
  85 +++ arpwatch/bihourly   Tue Apr 17 13:53:29 2001
  86 @@ -6,7 +6,7 @@
  87  PATH=$PATH:/usr/local/sbin
  88  export PATH
  89  #
  90 -cd /usr/operator/arpwatch
  91 +cd /var/lib/arpwatch
  92  #
  93  list=`cat list`
  94  cname=`cat cname`
  95 @@ -14,7 +14,7 @@
  96  #
  97  alist=""
  98  for r in $list; do \
  99 -       ./arpfetch $r $cname > $r 2> $errs
 100 +       arpfetch $r $cname > $r 2> $errs
 101         if test -s $errs; then
 102                 echo "arpfetch $r failed:"
 103                 sed -e 's/^/    /' $errs