diff options
Diffstat (limited to 'net/arpwatch')
| -rw-r--r-- | net/arpwatch/Makefile | 9 | ||||
| -rw-r--r-- | net/arpwatch/distinfo | 16 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-aa | 97 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ab | 48 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ac | 47 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ad | 38 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ae | 73 |
7 files changed, 125 insertions, 203 deletions
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index e9999494750..3a79b2ae3f5 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:03 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2001/08/24 11:37:07 abs Exp $ # -DISTNAME= arpwatch-2.1a4 +DISTNAME= arpwatch-2.1a11 CATEGORIES= net MASTER_SITES= ftp://ftp.ee.lbl.gov/ -EXTRACT_SUFX= .tar.Z MAINTAINER= bouyer@netbsd.org COMMENT= monitor ARP activity on a network, maintaining a database @@ -25,8 +24,8 @@ post-install: .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -DEPENDS+= libpcap-0.4:../../net/libpcap +.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" +DEPENDS+= libpcap>=0.4:../../net/libpcap .endif .include "../../mk/bsd.pkg.mk" diff --git a/net/arpwatch/distinfo b/net/arpwatch/distinfo index 450713a20fc..eebbe50cf72 100644 --- a/net/arpwatch/distinfo +++ b/net/arpwatch/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:09 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/08/24 11:37:07 abs Exp $ -SHA1 (arpwatch-2.1a4.tar.Z) = 3388b1d4dd4a345b5a9e9a30781e7decb09d2c50 -Size (arpwatch-2.1a4.tar.Z) = 145205 bytes -SHA1 (patch-aa) = c1652ad114d9b53995daec4b31e94a8bc924bbac -SHA1 (patch-ab) = d156a7dd9b3abc6e05f88125fd5af67fe6b4179f -SHA1 (patch-ac) = d8a7df61c3eb98389cc9027c13e2fec2b2c76384 -SHA1 (patch-ad) = f32cb7b27f174676506cb3b572109bc0e9f6211b -SHA1 (patch-ae) = c3ab6c305a0491f2e53d22519c55c7c3283b5d7b +SHA1 (arpwatch-2.1a11.tar.gz) = d14f9218928885ea9b502461259513a815809be7 +Size (arpwatch-2.1a11.tar.gz) = 126550 bytes +SHA1 (patch-aa) = fd74e2ff6fad7ea3f3355e4405e9e7135dd1ef49 +SHA1 (patch-ab) = c37e20d3e4a42e415a4bd49012b7b2a831254851 +SHA1 (patch-ac) = 1fca0c9cc1e6de7275eb1171d6a696c14da4d974 +SHA1 (patch-ad) = 0292675b4b48656575ad4429c98e1187962a1bef +SHA1 (patch-ae) = 07e308254164852e8f71a62947454858b9fd3c72 diff --git a/net/arpwatch/patches/patch-aa b/net/arpwatch/patches/patch-aa index 03e1ab6aa3e..adb4340e5cc 100644 --- a/net/arpwatch/patches/patch-aa +++ b/net/arpwatch/patches/patch-aa @@ -1,62 +1,37 @@ -$NetBSD: patch-aa,v 1.3 2000/06/09 09:06:55 bouyer Exp $ +$NetBSD: patch-aa,v 1.4 2001/08/24 11:37:07 abs Exp $ ---- arpsnmp.8.orig Mon Apr 27 19:11:09 1998 -+++ arpsnmp.8 Mon Apr 27 19:12:05 1998 -@@ -55,7 +55,7 @@ - .na - .nh - .nf --/usr/operator/arpwatch - default directory -+/var/db/arpwatch - default directory - arp.dat - ethernet/ip address database - ethercodes.dat - vendor ethernet block list - .ad - ---- arpwatch.8.orig Fri Oct 31 21:02:27 1997 -+++ arpwatch.8 Fri Jun 9 10:00:29 2000 -@@ -19,13 +19,7 @@ - .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - .\" --.TH ARPSNMP 8 "31 October 1997" --.UC 4 --.SH NAME --arpsnmp - keep track of ethernet/ip address pairings --.SH SYNOPSIS --.B arpsnmp --[ -+.TH ARPWATCH 8 "31 October 1997" - .UC 4 - .SH NAME - arpwatch - keep track of ethernet/ip address pairings -@@ -33,6 +27,8 @@ - .na - .B arpwatch - [ -+.B -a -+] [ - .B -d - ] [ - .B -f -@@ -58,6 +54,12 @@ - to listen for arp packets on a local ethernet interface. - .LP - The -+.B -a -+flag supress check for local network. By default, arp traffic for IP addresses -+which don't belong to the local network are logged as bogons, and not added -+to the database. -+.LP -+The - .B -d - flag is used enable debugging. This also inhibits forking into the - background and emailing the reports. Instead, they are sent to -@@ -120,7 +122,7 @@ - .na - .nh - .nf --/usr/operator/arpwatch - default directory -+/var/db/arpwatch - default directory - arp.dat - ethernet/ip address database - ethercodes.dat - vendor ethernet block list - .ad +--- Makefile.in.orig Thu Jun 15 01:39:55 2000 ++++ Makefile.in +@@ -30,8 +30,10 @@ + BINDEST = @sbindir@ + # Pathname of directory to install the man page + MANDEST = @mandir@ ++# Pathname of directory to install ethernet vendor codes ++ETCDEST = $(prefix)/etc + # Pathname of directory to install database file +-ARPDIR = $(prefix)/arpwatch ++ARPDIR = /var/db/arpwatch + + # VPATH + srcdir = @srcdir@ +@@ -45,7 +47,8 @@ + PROG = arpwatch + CCOPT = @V_CCOPT@ + INCLS = -I. @V_INCLS@ +-DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" ++DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \ ++ -DETHERCODES=\"$(ETCDEST)/ethercodes.dat\" + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) +@@ -110,8 +113,8 @@ + $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil + + install: force +- $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST) +- $(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST) ++ $(INSTALL) arpwatch $(DESTDIR)$(BINDEST) ++ $(INSTALL) arpsnmp $(DESTDIR)$(BINDEST) + + install-man: force + $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \ diff --git a/net/arpwatch/patches/patch-ab b/net/arpwatch/patches/patch-ab index eb78f0356a0..b1cc66e8daa 100644 --- a/net/arpwatch/patches/patch-ab +++ b/net/arpwatch/patches/patch-ab @@ -1,37 +1,13 @@ -$NetBSD: patch-ab,v 1.4 1998/11/04 17:25:12 mycroft Exp $ +$NetBSD: patch-ab,v 1.5 2001/08/24 11:37:08 abs Exp $ ---- Makefile.in.orig Wed Jul 29 01:16:45 1998 -+++ Makefile.in Wed Nov 4 12:12:31 1998 -@@ -30,8 +30,10 @@ - BINDEST = @sbindir@ - # Pathname of directory to install the man page - MANDEST = @mandir@ -+# Pathname of directory to install ethernet vendor codes -+ETCDEST = $(prefix)/etc - # Pathname of directory to install database file --ARPDIR = $(prefix)/arpwatch -+ARPDIR = /var/db/arpwatch - - # VPATH - srcdir = @srcdir@ -@@ -44,7 +46,8 @@ - CC = @CC@ - CCOPT = @V_CCOPT@ - INCLS = -I. @V_INCLS@ --DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" -+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \ -+ -DETHERCODES=\"$(ETCDEST)/ethercodes.dat\" - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) -@@ -109,8 +112,8 @@ - $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil - - install: force -- $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST) -- $(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST) -+ $(INSTALL) arpwatch $(DESTDIR)$(BINDEST) -+ $(INSTALL) arpsnmp $(DESTDIR)$(BINDEST) - - install-man: force - $(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \ +--- arpsnmp.8.orig Sun Sep 17 21:34:48 2000 ++++ arpsnmp.8 +@@ -69,7 +69,7 @@ + .na + .nh + .nf +-/usr/operator/arpwatch - default directory ++/var/db/arpwatch - default directory + arp.dat - ethernet/ip address database + ethercodes.dat - vendor ethernet block list + .ad diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac index cd80f29e69d..bb556ea18e1 100644 --- a/net/arpwatch/patches/patch-ac +++ b/net/arpwatch/patches/patch-ac @@ -1,14 +1,35 @@ -$NetBSD: patch-ac,v 1.4 1999/11/19 12:32:27 agc Exp $ +$NetBSD: patch-ac,v 1.5 2001/08/24 11:37:08 abs Exp $ ---- arpwatch.h.orig Fri Nov 19 12:22:02 1999 -+++ arpwatch.h Fri Nov 19 12:22:02 1999 -@@ -1,7 +1,9 @@ - /* @(#) Header: arpwatch.h,v 1.28 98/02/09 16:35:15 leres Exp (LBL) */ - - #define ARPFILE "arp.dat" -+#ifndef ETHERCODES - #define ETHERCODES "ethercodes.dat" -+#endif - #define CHECKPOINT (15*60) /* Checkpoint time in seconds */ - - #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n) +--- arpwatch.8.orig Sun Oct 8 21:31:28 2000 ++++ arpwatch.8 +@@ -27,6 +27,8 @@ + .na + .B arpwatch + [ ++.B -a ++] [ + .B -dN + ] [ + .B -f +@@ -55,6 +57,12 @@ + to listen for arp packets on a local ethernet interface. + .LP + The ++.B -a ++flag supress check for local network. By default, arp traffic for IP addresses ++which don't belong to the local network are logged as bogons, and not added ++to the database. ++.LP ++The + .B -d + flag is used enable debugging. This also inhibits forking into the + background and emailing the reports. Instead, they are sent to +@@ -152,7 +160,7 @@ + .na + .nh + .nf +-/usr/operator/arpwatch - default directory ++/var/db/arpwatch - default directory + arp.dat - ethernet/ip address database + ethercodes.dat - vendor ethernet block list + .ad diff --git a/net/arpwatch/patches/patch-ad b/net/arpwatch/patches/patch-ad index 1cfd403a24f..1b7daa8ca8b 100644 --- a/net/arpwatch/patches/patch-ad +++ b/net/arpwatch/patches/patch-ad @@ -1,30 +1,12 @@ -$NetBSD: patch-ad,v 1.4 1999/04/07 13:01:18 agc Exp $ +$NetBSD: patch-ad,v 1.5 2001/08/24 11:37:08 abs Exp $ -Make sure we find libpcap in the correct place on Solaris - ---- configure 1999/04/07 11:56:33 1.1 -+++ configure 1999/04/07 12:01:01 -@@ -2183,7 +2183,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lpcap $LIBS" -+LIBS="-L$LOCALBASE/lib -lpcap $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2189 "configure" - #include "confdefs.h" -@@ -2207,12 +2207,12 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- libpcap="-lpcap" -+ libpcap="-L$LOCALBASE/lib -lpcap" - else - echo "$ac_t""no" 1>&6 - fi +--- arpwatch.h.orig Fri Aug 24 12:26:38 2001 ++++ arpwatch.h +@@ -2,5 +2,7 @@ + + #define ARPFILE "arp.dat" ++#ifndef ETHERCODES + #define ETHERCODES "ethercodes.dat" ++#endif + #define CHECKPOINT (15*60) /* Checkpoint time in seconds */ -- if test $libpcap = FAIL ; then -+ if test "X$libpcap" = "XFAIL" ; then - { echo "configure: error: see the INSTALL doc for more info" 1>&2; exit 1; } - fi - else diff --git a/net/arpwatch/patches/patch-ae b/net/arpwatch/patches/patch-ae index 2d32883451d..ca7d6dd51b6 100644 --- a/net/arpwatch/patches/patch-ae +++ b/net/arpwatch/patches/patch-ae @@ -1,53 +1,22 @@ -$NetBSD: patch-ae,v 1.1 2000/06/09 09:06:56 bouyer Exp $ +$NetBSD: patch-ae,v 1.2 2001/08/24 11:37:08 abs Exp $ ---- arpwatch.c.orig Fri Jun 9 09:51:11 2000 -+++ arpwatch.c Fri Jun 9 09:54:14 2000 -@@ -119,6 +119,7 @@ - extern int optind; - extern int opterr; - extern char *optarg; -+int aflag = 0; - - int - main(int argc, char **argv) -@@ -147,9 +148,12 @@ - interface = NULL; - rfilename = NULL; - pd = NULL; -- while ((op = getopt(argc, argv, "df:i:r:")) != EOF) -+ while ((op = getopt(argc, argv, "adf:i:r:")) != EOF) - switch (op) { - -+ case 'a': -+ aflag++; -+ break; - case 'd': - ++debug; - #ifndef DEBUG -@@ -340,7 +344,7 @@ - BCOPY(SPA(ea), &sia, 4); - - /* Watch for bogons */ -- if ((sia & netmask) != net) { -+ if (aflag == 0 && (sia & netmask) != net) { - dosyslog(LOG_INFO, "bogon", sia, sea, sha); - return; - } -@@ -489,7 +493,7 @@ - BCOPY(SPA(ea), &sia, 4); - - /* Watch for bogons */ -- if ((sia & netmask) != net) { -+ if (aflag == 0 && (sia & netmask) != net) { - dosyslog(LOG_INFO, "bogon", sia, sea, sha); - return; - } -@@ -623,6 +627,7 @@ - - (void)fprintf(stderr, "Version %s\n", version); - (void)fprintf(stderr, -- "usage: %s [-d] [-f datafile] [-i interface] [-r file]\n", prog); -+ "usage: %s [-a] [-d] [-f datafile] [-i interface] [-r file]\n", -+ prog); - exit(1); - } +--- configure.orig Wed May 16 19:26:11 2001 ++++ configure +@@ -2183,7 +2183,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpcap $LIBS" ++LIBS="-L$LOCALBASE/lib -lpcap $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2189 "configure" + #include "confdefs.h" +@@ -2211,7 +2211,7 @@ + fi + if eval "test \"`echo '$ac_cv_lbl_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- libpcap="-lpcap" ++ libpcap="-L$LOCALBASE/lib -lpcap" + else + echo "$ac_t""no" 1>&6 + fi |