diff options
Diffstat (limited to 'net/arpwatch/patches')
| -rw-r--r-- | net/arpwatch/patches/patch-aa | 14 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ab | 15 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ac | 39 | ||||
| -rw-r--r-- | net/arpwatch/patches/patch-ae | 20 |
4 files changed, 81 insertions, 7 deletions
diff --git a/net/arpwatch/patches/patch-aa b/net/arpwatch/patches/patch-aa index 703e0ef1433..8cb79a4aa5e 100644 --- a/net/arpwatch/patches/patch-aa +++ b/net/arpwatch/patches/patch-aa @@ -1,30 +1,30 @@ -$NetBSD: patch-aa,v 1.5 2004/12/10 23:32:34 minskim Exp $ +$NetBSD: patch-aa,v 1.6 2005/11/30 22:36:43 bouyer Exp $ ---- Makefile.in.orig Thu Jun 15 01:39:55 2000 +--- Makefile.in.orig 2000-06-15 02:39:55.000000000 +0200 +++ Makefile.in -@@ -30,8 +30,10 @@ +@@ -30,8 +30,10 @@ exec_prefix = @exec_prefix@ BINDEST = @sbindir@ # Pathname of directory to install the man page MANDEST = @mandir@ +# Pathname of directory to install ethernet vendor codes -+ETCDEST = $(prefix)/etc ++SHAREDEST = $(prefix)/share/arpwatch # Pathname of directory to install database file -ARPDIR = $(prefix)/arpwatch +ARPDIR = ${VARBASE}/db/arpwatch # VPATH srcdir = @srcdir@ -@@ -45,7 +47,8 @@ +@@ -45,7 +47,8 @@ CC = @CC@ 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\" ++ -DETHERCODES=\"$(SHAREDEST)/ethercodes.dat\" # Standard CFLAGS CFLAGS = $(CCOPT) $(DEFS) $(INCLS) -@@ -110,8 +113,8 @@ +@@ -110,8 +113,8 @@ zap: zap.o intoa.o $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil install: force diff --git a/net/arpwatch/patches/patch-ab b/net/arpwatch/patches/patch-ab new file mode 100644 index 00000000000..15b2b9fe00c --- /dev/null +++ b/net/arpwatch/patches/patch-ab @@ -0,0 +1,15 @@ +--- arpwatch.8.orig 2005-10-25 12:51:51.000000000 +0200 ++++ arpwatch.8 2005-10-25 12:52:40.000000000 +0200 +@@ -71,6 +71,12 @@ + flag is used to override the default interface. + .LP + The ++.B -m ++flag specifies the address that will receive the emails. ++The default is ++.IR root . ++.LP ++The + .B -n + flag specifies additional local networks. This can be useful to + avoid "bogon" warnings when there is more than one network running diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac new file mode 100644 index 00000000000..3bad1578533 --- /dev/null +++ b/net/arpwatch/patches/patch-ac @@ -0,0 +1,39 @@ +--- arpwatch.c.orig 2005-10-25 12:53:57.000000000 +0200 ++++ arpwatch.c 2005-10-25 12:56:40.000000000 +0200 +@@ -107,6 +107,8 @@ + + char *prog; + ++char *Watcher = NULL; ++ + int can_checkpoint; + int swapped; + int nobogons; +@@ -170,7 +172,7 @@ + interface = NULL; + rfilename = NULL; + pd = NULL; +- while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF) ++ while ((op = getopt(argc, argv, "df:i:m:n:Nr:")) != EOF) + switch (op) { + + case 'd': +@@ -189,6 +191,10 @@ + interface = optarg; + break; + ++ case 'm': ++ Watcher = optarg; ++ break; ++ + case 'n': + if (!addnet(optarg)) + usage(); +@@ -751,6 +757,6 @@ + + (void)fprintf(stderr, "Version %s\n", version); + (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]" +- " [-n net[/width]] [-r file]\n", prog); ++ " [-m email] [-n net[/width]] [-r file]\n", prog); + exit(1); + } diff --git a/net/arpwatch/patches/patch-ae b/net/arpwatch/patches/patch-ae new file mode 100644 index 00000000000..e9449e7ea24 --- /dev/null +++ b/net/arpwatch/patches/patch-ae @@ -0,0 +1,20 @@ +--- report.c.orig 2000-10-01 01:41:10.000000000 +0200 ++++ report.c 2005-10-25 13:07:21.000000000 +0200 +@@ -70,6 +70,8 @@ + + #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s") + ++char *Watcher; ++ + static int cdepth; /* number of outstanding children */ + + static char *fmtdate(time_t); +@@ -240,7 +242,7 @@ + register FILE *f; + char tempfile[64], cpu[64], os[64]; + char *fmt = "%20s: %s\n"; +- char *watcher = WATCHER; ++ char *watcher = Watcher ? Watcher : WATCHER; + char *watchee = WATCHEE; + char *sendmail = PATH_SENDMAIL; + char *unknown = "<unknown>"; |