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: Sun Oct 25 15:27:12 UTC 2026
Modified Files:
pkgsrc/net/arpwatch: Makefile distinfo
pkgsrc/net/arpwatch/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae
Added Files:
pkgsrc/net/arpwatch/patches: patch-db.c patch-ec.c patch-file.c
Log Message:
net/arpwatch: fix runtime problem on NetBSD 11
* Add descriptions to each patch files.
* Pass correct type to ctype(3) function to fix runtime problem on NetBSD 11.
* Reduce pkglint warnings except LICENSE. It might build with bcopy.c from
original BSD license and most of other codes contains 0-clause-bsd, but
I'm not sure. So LICENSE is commented out for now.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/arpwatch/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/arpwatch/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/arpwatch/patches/patch-aa
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/arpwatch/patches/patch-ab
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/arpwatch/patches/patch-ac
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/arpwatch/patches/patch-ad \
pkgsrc/net/arpwatch/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/net/arpwatch/patches/patch-db.c \
pkgsrc/net/arpwatch/patches/patch-ec.c \
pkgsrc/net/arpwatch/patches/patch-file.c
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.36 pkgsrc/net/arpwatch/Makefile:1.37
--- pkgsrc/net/arpwatch/Makefile:1.36 Wed Jul 4 13:40:27 2018
+++ pkgsrc/net/arpwatch/Makefile Sun Oct 25 15:27:12 2026
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2026/10/25 15:27:12 taca Exp $
#
DISTNAME= arpwatch-2.1a15
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net
MASTER_SITES= ftp://ftp.ee.lbl.gov/
MAINTAINER= bouyer%NetBSD.org@localhost
COMMENT= Monitor ARP activity on a network, maintaining a database
+#LICENSE= original-bsd
RCD_SCRIPTS= arpwatch
@@ -16,6 +17,8 @@ GNU_CONFIGURE= yes
CFLAGS.Darwin+= -DBIND_8_COMPAT
LIBS+= ${BUILDLINK_LDADD.libpcap}
+BUILD_DEFS+= VARBASE
+
MAKE_ENV+= VARBASE=${VARBASE:Q}
PLIST_SUBST+= VARBASE=${VARBASE:Q}
@@ -25,17 +28,18 @@ SUBST_STAGE.paths= pre-configure
SUBST_FILES.paths= arpsnmp.8 arpwatch.8
SUBST_SED.paths= -e 's,/usr/operator/arpwatch,${VARBASE}/db/arpwatch,g'
+SUBST_CLASSES+= rcs
+SUBST_MESSAGE.rcs= Disable rcs id
+SUBST_STAGE.rcs= post-extract
+SUBST_FILES.rcs= arpwatch.h
+SUBST_SED.rcs= -e '/Id/s|\$$||g'
+
OWN_DIRS= ${VARBASE:Q}/db/arpwatch
INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/examples/arpwatch share/arpwatch
CONF_FILES+= /dev/null ${VARBASE}/db/arpwatch/arp.dat
-pre-patch:
- f=arpwatch.h; \
- ${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch; \
- ${SED} -e '/Header/s|\$$||g' ${WRKSRC}/$$f-prepatch > ${WRKSRC}/$$f
-
post-install:
${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
Index: pkgsrc/net/arpwatch/distinfo
diff -u pkgsrc/net/arpwatch/distinfo:1.14 pkgsrc/net/arpwatch/distinfo:1.15
--- pkgsrc/net/arpwatch/distinfo:1.14 Tue Oct 26 11:05:23 2021
+++ pkgsrc/net/arpwatch/distinfo Sun Oct 25 15:27:12 2026
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 11:05:23 nia Exp $
+$NetBSD: distinfo,v 1.15 2026/10/25 15:27:12 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) = 01d72e1342cdcf2c566a2c761743d4b71af5985c
-SHA1 (patch-ab) = 73fb4cca476b58c3456f4d418779ae9aecfcf885
-SHA1 (patch-ac) = f6f139fb1413ac2c483f6c8ea965a9a7b4b9a268
-SHA1 (patch-ad) = 0292675b4b48656575ad4429c98e1187962a1bef
-SHA1 (patch-ae) = cb392c6bb2c10b261a759e7c7835dd959d34a047
+SHA1 (patch-aa) = c1aa3ee01190bcf84cb3511747a03c951b85901d
+SHA1 (patch-ab) = b6c293dfdea9b7a8b4aedf09d550ba73d1bae5e1
+SHA1 (patch-ac) = 10b1307780d5855deb102ab468ffe63ba50de2a4
+SHA1 (patch-ad) = fd639eda33308da30ef6d4586a8d9ee5ca748db0
+SHA1 (patch-ae) = c6bc965737120665d9579602762f15796a36196f
+SHA1 (patch-db.c) = 58d7950af44e7777828334dd4368004a8043f45c
+SHA1 (patch-ec.c) = 0acfa9715161387534e8dbc99749d2d67b869d44
+SHA1 (patch-file.c) = 5d47336757c80bf58f073fc6095e1730c566e311
Index: pkgsrc/net/arpwatch/patches/patch-aa
diff -u pkgsrc/net/arpwatch/patches/patch-aa:1.6 pkgsrc/net/arpwatch/patches/patch-aa:1.7
--- pkgsrc/net/arpwatch/patches/patch-aa:1.6 Wed Nov 30 22:36:43 2005
+++ pkgsrc/net/arpwatch/patches/patch-aa Sun Oct 25 15:27:12 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2005/11/30 22:36:43 bouyer Exp $
+$NetBSD: patch-aa,v 1.7 2026/10/25 15:27:12 taca Exp $
+
+* Change path to appropriate for pkgsrc.
--- Makefile.in.orig 2000-06-15 02:39:55.000000000 +0200
+++ Makefile.in
Index: pkgsrc/net/arpwatch/patches/patch-ab
diff -u pkgsrc/net/arpwatch/patches/patch-ab:1.8 pkgsrc/net/arpwatch/patches/patch-ab:1.9
--- pkgsrc/net/arpwatch/patches/patch-ab:1.8 Mon Dec 5 20:50:44 2005
+++ pkgsrc/net/arpwatch/patches/patch-ab Sun Oct 25 15:27:12 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2005/12/05 20:50:44 rillig Exp $
+$NetBSD: patch-ab,v 1.9 2026/10/25 15:27:12 taca Exp $
+
+* Add description for -m option.
--- arpwatch.8.orig 2005-10-25 12:51:51.000000000 +0200
+++ arpwatch.8 2005-10-25 12:52:40.000000000 +0200
Index: pkgsrc/net/arpwatch/patches/patch-ac
diff -u pkgsrc/net/arpwatch/patches/patch-ac:1.10 pkgsrc/net/arpwatch/patches/patch-ac:1.11
--- pkgsrc/net/arpwatch/patches/patch-ac:1.10 Sat Apr 15 09:54:20 2006
+++ pkgsrc/net/arpwatch/patches/patch-ac Sun Oct 25 15:27:12 2026
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.10 2006/04/15 09:54:20 bouyer Exp $
+$NetBSD: patch-ac,v 1.11 2026/10/25 15:27:12 taca Exp $
+
+* Add -m 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
Index: pkgsrc/net/arpwatch/patches/patch-ad
diff -u pkgsrc/net/arpwatch/patches/patch-ad:1.5 pkgsrc/net/arpwatch/patches/patch-ad:1.6
--- pkgsrc/net/arpwatch/patches/patch-ad:1.5 Fri Aug 24 11:37:08 2001
+++ pkgsrc/net/arpwatch/patches/patch-ad Sun Oct 25 15:27:12 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2001/08/24 11:37:08 abs Exp $
+$NetBSD: patch-ad,v 1.6 2026/10/25 15:27:12 taca Exp $
+
+* Allow redefine ETHERCODES.
--- arpwatch.h.orig Fri Aug 24 12:26:38 2001
+++ arpwatch.h
Index: pkgsrc/net/arpwatch/patches/patch-ae
diff -u pkgsrc/net/arpwatch/patches/patch-ae:1.5 pkgsrc/net/arpwatch/patches/patch-ae:1.6
--- pkgsrc/net/arpwatch/patches/patch-ae:1.5 Mon Dec 5 20:50:44 2005
+++ pkgsrc/net/arpwatch/patches/patch-ae Sun Oct 25 15:27:12 2026
@@ -1,8 +1,11 @@
-$NetBSD: patch-ae,v 1.5 2005/12/05 20:50:44 rillig Exp $
+$NetBSD: patch-ae,v 1.6 2026/10/25 15:27:12 taca Exp $
---- 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 @@
+* Use watcher specified by -m option if available.
+* Pass correct type to ctype(3) function.
+
+--- report.c.orig 2000-09-30 23:41:10.000000000 +0000
++++ report.c
+@@ -70,6 +70,8 @@ struct rtentry;
#define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
@@ -11,7 +14,7 @@ $NetBSD: patch-ae,v 1.5 2005/12/05 20:50
static int cdepth; /* number of outstanding children */
static char *fmtdate(time_t);
-@@ -240,7 +242,7 @@
+@@ -240,7 +242,7 @@ report(register char *title, register u_
register FILE *f;
char tempfile[64], cpu[64], os[64];
char *fmt = "%20s: %s\n";
@@ -20,3 +23,12 @@ $NetBSD: patch-ae,v 1.5 2005/12/05 20:50
char *watchee = WATCHEE;
char *sendmail = PATH_SENDMAIL;
char *unknown = "<unknown>";
+@@ -303,7 +305,7 @@ report(register char *title, register u_
+ (void)fprintf(f, "From: %s\n", watchee);
+ (void)fprintf(f, "To: %s\n", watcher);
+ hn = gethname(a);
+- if (!isdigit(*hn))
++ if (!isdigit((unsigned char)*hn))
+ (void)fprintf(f, "Subject: %s (%s)\n", title, hn);
+ else {
+ (void)fprintf(f, "Subject: %s\n", title);
Added files:
Index: pkgsrc/net/arpwatch/patches/patch-db.c
diff -u /dev/null pkgsrc/net/arpwatch/patches/patch-db.c:1.1
--- /dev/null Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/patches/patch-db.c Sun Oct 25 15:27:12 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-db.c,v 1.1 2026/10/25 15:27:12 taca Exp $
+
+* Pass correct type to ctype(3) function.
+
+--- db.c.orig 2026-10-25 13:25:35.360511653 +0000
++++ db.c
+@@ -283,7 +283,7 @@ elist_alloc(register u_int32_t a, regist
+ BCOPY(e, ep->e, 6);
+ if (h == NULL && !initializing)
+ h = getsname(a);
+- if (h != NULL && !isdigit((int)*h))
++ if (h != NULL && !isdigit((unsigned char)*h))
+ strcpy(ep->h, h);
+ ep->t = t;
+ return (ep);
+@@ -301,7 +301,7 @@ check_hname(register struct ainfo *ap)
+ return;
+ ep = ap->elist[0];
+ h = getsname(ap->a);
+- if (!isdigit((int)*h) && strcmp(h, ep->h) != 0) {
++ if (!isdigit((unsigned char)*h) && strcmp(h, ep->h) != 0) {
+ syslog(LOG_INFO, "hostname changed %s %s %s -> %s",
+ intoa(ap->a), e2str(ep->e), ep->h, h);
+ strcpy(ep->h, h);
Index: pkgsrc/net/arpwatch/patches/patch-ec.c
diff -u /dev/null pkgsrc/net/arpwatch/patches/patch-ec.c:1.1
--- /dev/null Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/patches/patch-ec.c Sun Oct 25 15:27:12 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-ec.c,v 1.1 2026/10/25 15:27:12 taca Exp $
+
+* Pass correct type to ctype(3) function.
+
+--- ec.c.orig 2026-10-25 13:23:21.630688409 +0000
++++ ec.c
+@@ -168,7 +168,7 @@ ec_loop(register FILE *f, ec_process fn,
+ sawblank = 0;
+ }
+ *cp2++ = *cp++;
+- while (isspace((int)*cp)) {
++ while (isspace((unsigned char)*cp)) {
+ ++cp;
+ sawblank = 1;
+ }
Index: pkgsrc/net/arpwatch/patches/patch-file.c
diff -u /dev/null pkgsrc/net/arpwatch/patches/patch-file.c:1.1
--- /dev/null Sun Oct 25 15:27:12 2026
+++ pkgsrc/net/arpwatch/patches/patch-file.c Sun Oct 25 15:27:12 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-file.c,v 1.1 2026/10/25 15:27:12 taca Exp $
+
+* Pass correct type to ctype(3) function.
+
+--- file.c.orig 2026-10-25 13:25:35.361730749 +0000
++++ file.c
+@@ -102,7 +102,7 @@ fprintf(stderr, "file_loop: %s:%d bad et
+ cp = cp2;
+ if ((cp2 = strchr(cp, '\t')) != NULL)
+ *cp2++ = '\0';
+- if (!isdigit((int)*cp) || (int32_t)(a = inet_addr(cp)) == -1) {
++ if (!isdigit((unsigned char)*cp) || (int32_t)(a = inet_addr(cp)) == -1) {
+ if ((hp = gethostbyname(cp)) == NULL) {
+ syslog(LOG_ERR,
+ "file_loop: %s:%d bad hostname \"%s\"",
Home |
Main Index |
Thread Index |
Old Index