pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net/arpwatch



Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Nov 12 15:24:17 UTC 2026

Modified Files:
        pkgsrc/net/arpwatch: Makefile distinfo
        pkgsrc/net/arpwatch/patches: patch-aa patch-ab patch-ac

Log Message:
net/arpwatch: make pass CHECK_RELRO

* Define proper LDFLAGS to pass CHECK_RELRO.
* Add -p option to prevent using promisc mode.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/arpwatch/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/arpwatch/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/arpwatch/patches/patch-aa
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/arpwatch/patches/patch-ab
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/arpwatch/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/arpwatch/Makefile
diff -u pkgsrc/net/arpwatch/Makefile:1.38 pkgsrc/net/arpwatch/Makefile:1.39
--- pkgsrc/net/arpwatch/Makefile:1.38   Sun Oct 25 16:01:23 2026
+++ pkgsrc/net/arpwatch/Makefile        Thu Nov 12 15:24:17 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2026/10/25 16:01:23 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2026/11/12 15:24:17 taca Exp $
 #
 
 DISTNAME=      arpwatch-2.1a15
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.ee.lbl.gov/
 

Index: pkgsrc/net/arpwatch/distinfo
diff -u pkgsrc/net/arpwatch/distinfo:1.15 pkgsrc/net/arpwatch/distinfo:1.16
--- pkgsrc/net/arpwatch/distinfo:1.15   Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/distinfo        Thu Nov 12 15:24:17 2026
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2026/10/25 15:27:12 taca Exp $
+$NetBSD: distinfo,v 1.16 2026/11/12 15:24:17 taca Exp $
 
 BLAKE2s (arpwatch-2.1a15.tar.gz) = 21ee662ac9d1b3eb3a26a8a75dcfa091dc3941397ebb77377ccc28dc9a91df0e
 SHA512 (arpwatch-2.1a15.tar.gz) = f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90
 Size (arpwatch-2.1a15.tar.gz) = 202729 bytes
-SHA1 (patch-aa) = c1aa3ee01190bcf84cb3511747a03c951b85901d
-SHA1 (patch-ab) = b6c293dfdea9b7a8b4aedf09d550ba73d1bae5e1
-SHA1 (patch-ac) = 10b1307780d5855deb102ab468ffe63ba50de2a4
+SHA1 (patch-aa) = 602aa4e37f674198a0f417a57774925c9725d40d
+SHA1 (patch-ab) = a4f6695623412600fce6a9fbcc025d154a0f51bb
+SHA1 (patch-ac) = 486ccf559974e329b22d8fd17a925990dba74e15
 SHA1 (patch-ad) = fd639eda33308da30ef6d4586a8d9ee5ca748db0
 SHA1 (patch-ae) = c6bc965737120665d9579602762f15796a36196f
 SHA1 (patch-db.c) = 58d7950af44e7777828334dd4368004a8043f45c

Index: pkgsrc/net/arpwatch/patches/patch-aa
diff -u pkgsrc/net/arpwatch/patches/patch-aa:1.7 pkgsrc/net/arpwatch/patches/patch-aa:1.8
--- pkgsrc/net/arpwatch/patches/patch-aa:1.7    Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/patches/patch-aa        Thu Nov 12 15:24:17 2026
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2026/10/25 15:27:12 taca Exp $
+$NetBSD: patch-aa,v 1.8 2026/11/12 15:24:17 taca Exp $
 
 * Change path to appropriate for pkgsrc.
+* Supply proper LDFLAGS.
 
---- Makefile.in.orig   2000-06-15 02:39:55.000000000 +0200
+--- Makefile.in.orig   2000-06-15 00:39:55.000000000 +0000
 +++ Makefile.in
 @@ -30,8 +30,10 @@ exec_prefix = @exec_prefix@
  BINDEST = @sbindir@
@@ -16,7 +17,7 @@ $NetBSD: patch-aa,v 1.7 2026/10/25 15:27
  
  # VPATH
  srcdir = @srcdir@
-@@ -45,7 +47,8 @@ CC = @CC@
+@@ -45,11 +47,15 @@ CC = @CC@
  PROG = arpwatch
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
@@ -26,8 +27,33 @@ $NetBSD: patch-aa,v 1.7 2026/10/25 15:27
  
  # Standard CFLAGS
  CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-@@ -110,8 +113,8 @@ zap: zap.o intoa.o
-       $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
+ 
++# Standard LDFLAGS
++LDFLAGS = @LDFLAGS@
++
+ # Standard LIBS
+ LIBS = @LIBS@
+ # Standard LIBS without libpcap.a
+@@ -95,11 +101,11 @@ all: $(ALL)
+ 
+ arpwatch: $(WOBJ) @V_PCAPDEP@
+       @rm -f $@
+-      $(CC) $(CFLAGS) -o $@ $(WOBJ) $(LIBS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(WOBJ) $(LIBS)
+ 
+ arpsnmp: $(SOBJ)
+       @rm -f $@
+-      $(CC) $(CFLAGS) -o $@ $(SOBJ) $(SLIBS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(SOBJ) $(SLIBS)
+ 
+ version.o: version.c
+ version.c: $(srcdir)/VERSION
+@@ -107,11 +113,11 @@ version.c: $(srcdir)/VERSION
+       sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@
+ 
+ zap: zap.o intoa.o
+-      $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ zap.o intoa.o -lutil
  
  install: force
 -      $(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)

Index: pkgsrc/net/arpwatch/patches/patch-ab
diff -u pkgsrc/net/arpwatch/patches/patch-ab:1.9 pkgsrc/net/arpwatch/patches/patch-ab:1.10
--- pkgsrc/net/arpwatch/patches/patch-ab:1.9    Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/patches/patch-ab        Thu Nov 12 15:24:17 2026
@@ -1,10 +1,19 @@
-$NetBSD: patch-ab,v 1.9 2026/10/25 15:27:12 taca Exp $
+$NetBSD: patch-ab,v 1.10 2026/11/12 15:24:17 taca Exp $
 
-* Add description for -m option.
+* Add description for -m and -p option.
 
---- 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 @@
+--- arpwatch.8.orig    2000-10-08 20:31:28.000000000 +0000
++++ arpwatch.8
+@@ -27,7 +27,7 @@ arpwatch - keep track of ethernet/ip add
+ .na
+ .B arpwatch
+ [
+-.B -dN
++.B -dpN
+ ] [
+ .B -f
+ .I datafile
+@@ -71,6 +71,12 @@ The
  flag is used to override the default interface.
  .LP
  The
@@ -17,3 +26,14 @@ $NetBSD: patch-ab,v 1.9 2026/10/25 15:27
  .B -n
  flag specifies additional local networks. This can be useful to
  avoid "bogon" warnings when there is more than one network running
+@@ -83,6 +89,10 @@ The
+ flag disables reporting any bogons.
+ .LP
+ The
++.B -p
++flag prevents setting the interface to promisc mode.
++.LP
++The
+ .B -r
+ flag is used to specify a savefile
+ (perhaps created by

Index: pkgsrc/net/arpwatch/patches/patch-ac
diff -u pkgsrc/net/arpwatch/patches/patch-ac:1.11 pkgsrc/net/arpwatch/patches/patch-ac:1.12
--- pkgsrc/net/arpwatch/patches/patch-ac:1.11   Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/patches/patch-ac        Thu Nov 12 15:24:17 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.11 2026/10/25 15:27:12 taca Exp $
+$NetBSD: patch-ac,v 1.12 2026/11/12 15:24:17 taca Exp $
 
-* Add -m option.
+* Add -m and -p option.
 * Try first -n if available when pcap_lookupnet() returns error.
 
---- arpwatch.c.orig    2004-01-22 23:18:20.000000000 +0100
-+++ arpwatch.c 2006-04-12 12:36:25.000000000 +0200
-@@ -107,6 +107,8 @@
+--- arpwatch.c.orig    2004-01-22 22:18:20.000000000 +0000
++++ arpwatch.c
+@@ -107,6 +107,8 @@ struct rtentry;
  
  char *prog;
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.11 2026/10/25 15:2
  int can_checkpoint;
  int swapped;
  int nobogons;
-@@ -119,9 +121,9 @@
+@@ -119,9 +121,9 @@ struct nets {
        u_int32_t netmask;
  };
  
@@ -27,16 +27,25 @@ $NetBSD: patch-ac,v 1.11 2026/10/25 15:2
  
  extern int optind;
  extern int opterr;
-@@ -170,7 +172,7 @@
+@@ -145,7 +147,7 @@ int
+ main(int argc, char **argv)
+ {
+       register char *cp;
+-      register int op, pid, snaplen, timeout, linktype, status;
++      register int op, pid, snaplen, timeout, linktype, status, promisc = 1;
+ #ifdef TIOCNOTTY
+       register int fd;
+ #endif
+@@ -170,7 +172,7 @@ main(int argc, char **argv)
        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)
++      while ((op = getopt(argc, argv, "df:i:m:n:Npr:")) != EOF)
                switch (op) {
  
                case 'd':
-@@ -189,6 +191,10 @@
+@@ -189,6 +191,10 @@ main(int argc, char **argv)
                        interface = optarg;
                        break;
  
@@ -47,7 +56,17 @@ $NetBSD: patch-ac,v 1.11 2026/10/25 15:2
                case 'n':
                        if (!addnet(optarg))
                                usage();
-@@ -223,9 +229,24 @@
+@@ -198,6 +204,9 @@ main(int argc, char **argv)
+                       ++nobogons;
+                       break;
+ 
++              case 'p':
++                      promisc = 0;
++                      break;
+               case 'r':
+                       rfilename = optarg;
+                       break;
+@@ -223,9 +232,24 @@ main(int argc, char **argv)
  
                /* Determine network and netmask */
                if (pcap_lookupnet(interface, &net, &netmask, errbuf) < 0) {
@@ -75,11 +94,32 @@ $NetBSD: patch-ac,v 1.11 2026/10/25 15:2
                }
  
                /* Drop into the background if not debugging */
-@@ -751,6 +772,6 @@
+@@ -269,7 +293,7 @@ main(int argc, char **argv)
+               snaplen = max(sizeof(struct ether_header),
+                   sizeof(struct fddi_header)) + sizeof(struct ether_arp);
+               timeout = 1000;
+-              pd = pcap_open_live(interface, snaplen, 1, timeout, errbuf);
++              pd = pcap_open_live(interface, snaplen, promisc, timeout, errbuf);
+               if (pd == NULL) {
+                       syslog(LOG_ERR, "pcap open %s: %s", interface, errbuf);
+                       exit(1);
+@@ -304,7 +328,8 @@ main(int argc, char **argv)
+               exit(1);
+       }
+       if (rfilename == NULL)
+-              syslog(LOG_INFO, "listening on %s", interface);
++              syslog(LOG_INFO, "listening on %s%s", interface,
++                     (promisc)? "with promisc mode": "");
+ 
+       /* Read in database */
+       initializing = 1;
+@@ -750,7 +775,7 @@ usage(void)
+       extern char version[];
  
        (void)fprintf(stderr, "Version %s\n", version);
-       (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
+-      (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
 -          " [-n net[/width]] [-r file]\n", prog);
++      (void)fprintf(stderr, "usage: %s [-dpN] [-f datafile] [-i interface]"
 +          " [-m email] [-n net[/width]] [-r file]\n", prog);
        exit(1);
  }



Home | Main Index | Thread Index | Old Index