Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2021-02-09 21:17:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch" Tue Feb 9 21:17:19 2021 rev:33 rq:870421 version:2.1a15 Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes 2021-01-29 14:57:44.217565878 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.28504/arpwatch.changes 2021-02-09 21:17:20.942848142 +0100 @@ -1,0 +2,13 @@ +Tue Feb 9 08:36:27 UTC 2021 - Johannes Segitz <[email protected]> + +- Fix arp2ethers script (bsc#1181936). Added arp2ethers.patch to + inline the awk fragments. I tried hard to do this in a script + but no matter if sed, awk or perl is used something always breaks + +------------------------------------------------------------------- +Mon Feb 1 15:15:15 UTC 2021 - [email protected] + +- exit cleanly on SIGTERM with arpwatch-exit.patch +- refresh all patches for autosetup + +------------------------------------------------------------------- New: ---- arp2ethers.patch arpwatch-exit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch.spec ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.610848928 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.614848933 +0100 @@ -44,6 +44,8 @@ Patch10: 0001-Ignore-802.1Q-frames.patch Patch11: report-iface.patch Patch12: arpwatch-MAC.patch +Patch13: arpwatch-exit.patch +Patch14: arp2ethers.patch BuildRequires: libpcap-devel BuildRequires: postfix BuildRequires: systemd-rpm-macros @@ -65,19 +67,7 @@ needed if you want to build the arpwatch-ethercodes package. %prep -%setup -q -%patch0 -E -%patch1 -p1 -E -%patch3 -p1 -E -%patch4 -p1 -E -%patch5 -p1 -E -%patch6 -p1 -E -%patch7 -p1 -E -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 +%autosetup -p1 %build %configure ++++++ 0001-Ignore-802.1Q-frames.patch ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.634848956 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.634848956 +0100 @@ -16,11 +16,9 @@ arpwatch.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) -diff --git a/arpwatch.c b/arpwatch.c -index 9892894..30d9972 100644 --- a/arpwatch.c +++ b/arpwatch.c -@@ -98,6 +98,10 @@ struct rtentry; +@@ -105,6 +105,10 @@ struct rtentry; #define ETHERTYPE_APOLLO 0x8019 #endif @@ -31,7 +29,7 @@ #ifndef IN_CLASSD_NET #define IN_CLASSD_NET 0xf0000000 #endif -@@ -573,6 +577,14 @@ sanity_ether(register struct ether_header *eh, register struct ether_arp *ea, +@@ -538,6 +542,14 @@ sanity_ether(register struct ether_heade return(0); } @@ -46,6 +44,3 @@ /* XXX sysv r4 seems to use hardware format 6 */ if (ea->arp_hrd != ARPHRD_ETHER && ea->arp_hrd != 6) { syslog(LOG_ERR, "%s sent bad hardware format 0x%x\n", --- -1.7.2.5 - ++++++ arp2ethers.patch ++++++ Index: arpwatch-2.1a15/arp2ethers =================================================================== --- arpwatch-2.1a15.orig/arp2ethers +++ arpwatch-2.1a15/arp2ethers @@ -13,11 +13,50 @@ # - sort # -sort +2rn arp.dat | \ +sort -k 2 -rn arp.dat | \ awk 'NF == 4 { print }' | \ - awk -f p.awk | \ - egrep -v '\.[0-9][0-9]*$' | \ + awk ' +{ + e = $1 + if (seen[e]) + next + seen[e] = 1 + print +}' | egrep -v '\.[0-9][0-9]*$' | \ sed -e 's/ .* / /' | \ - awk -f d.awk | \ - awk -f e.awk | \ - sort + awk ' +BEGIN { + n = 0 + sdecnet = "aa:0:4:" + ldecnet = length(sdecnet) +} + +{ + ++n + e[n] = $1 + h[n] = $2 + if (sdecnet == substr($1, 1, ldecnet)) + decnet[$2] = 1 +} + +END { + for (i = 1; i <= n; ++i) { + if (decnet[h[i]] && sdecnet != substr(e[i], 1, ldecnet)) + h[i] = h[i] "-ip" + print e[i] "\t" h[i] + } +}' | awk ' +{ + if (!seen[$2]) { + seen[$2] = 1 + print + next + } + h = $2 "-old" + s = h + for (n = 1; seen[h]; ++n) + h = s n + seen[h] = 1 + print $1 "\t" h + next +}' | sort ++++++ arpwatch-2.1a11-chrootbuild.diff ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.654848980 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.654848980 +0100 @@ -1,5 +1,5 @@ ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -9,7 +9,7 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) -@@ -110,13 +110,16 @@ +@@ -110,13 +110,16 @@ zap: zap.o intoa.o $(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil install: force @@ -30,8 +30,8 @@ $(DESTDIR)$(MANDEST)/man8 lint: $(GENSRC) force ---- arpwatch.h -+++ arpwatch.h +--- a/arpwatch.h ++++ b/arpwatch.h @@ -1,7 +1,7 @@ -/* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */ +/* @(#) $Id: arpwatch.h,v 1.1 2001/01/11 01:08:54 root Exp root $ (LBL) */ ++++++ arpwatch-2.1a11-drop-privs-manpage.dif ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.666848994 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.666848994 +0100 @@ -1,7 +1,6 @@ -diff -ruN ../arpwatch-2.1a15.orig/arpwatch.8 ./arpwatch.8 ---- ../arpwatch-2.1a15.orig/arpwatch.8 2008-11-12 12:15:54.000000000 +0100 -+++ ./arpwatch.8 2008-11-12 12:19:16.000000000 +0100 -@@ -36,13 +36,16 @@ +--- a/arpwatch.8 ++++ b/arpwatch.8 +@@ -36,13 +36,16 @@ arpwatch - keep track of ethernet/ip add .I interface ] .br @@ -19,7 +18,7 @@ ] .ad .SH DESCRIPTION -@@ -94,10 +97,26 @@ +@@ -94,10 +97,26 @@ of reading from the network. In this cas .B arpwatch does not fork. .LP ++++++ arpwatch-2.1a11-drop-privs.dif ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.674849004 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.674849004 +0100 @@ -1,7 +1,6 @@ -diff -ruN ../arpwatch-2.1a15.orig/arpwatch.c ./arpwatch.c ---- ../arpwatch-2.1a15.orig/arpwatch.c 2008-11-12 15:16:19.000000000 +0100 -+++ ./arpwatch.c 2008-11-12 16:31:50.000000000 +0100 -@@ -64,6 +64,8 @@ +--- a/arpwatch.c ++++ b/arpwatch.c +@@ -64,6 +64,8 @@ struct rtentry; #include <string.h> #include <syslog.h> #include <unistd.h> @@ -10,7 +9,7 @@ #include <pcap.h> -@@ -152,6 +154,52 @@ +@@ -152,6 +154,52 @@ int sanity_toring(struct toring_header * #endif __dead void usage(void) __attribute__((volatile)); @@ -63,7 +62,7 @@ int main(int argc, char **argv) { -@@ -164,6 +212,7 @@ +@@ -164,6 +212,7 @@ main(int argc, char **argv) register char *interface, *rfilename; struct bpf_program code; char errbuf[PCAP_ERRBUF_SIZE]; @@ -71,7 +70,7 @@ if (argv[0] == NULL) prog = "arpwatch"; -@@ -181,7 +230,7 @@ +@@ -181,7 +230,7 @@ main(int argc, char **argv) interface = NULL; rfilename = NULL; pd = NULL; @@ -80,7 +79,7 @@ switch (op) { case 'd': -@@ -213,6 +262,16 @@ +@@ -213,6 +262,16 @@ main(int argc, char **argv) rfilename = optarg; break; @@ -97,7 +96,7 @@ default: usage(); } -@@ -295,8 +354,11 @@ +@@ -295,8 +354,11 @@ main(int argc, char **argv) * Revert to non-privileged user after opening sockets * (not needed on most systems). */ @@ -111,7 +110,7 @@ /* Must be ethernet or fddi or tokenring */ linktype = pcap_datalink(pd); -@@ -842,6 +904,6 @@ +@@ -842,6 +904,6 @@ usage(void) (void)fprintf(stderr, "Version %s\n", version); (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]" ++++++ arpwatch-2.1a11-emailaddr.dif ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.686849017 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.686849017 +0100 @@ -1,16 +1,14 @@ -diff -ruN ../arpwatch-2.1a15.orig/addresses.h.in ./addresses.h.in ---- ../arpwatch-2.1a15.orig/addresses.h.in 1996-06-05 07:40:29.000000000 +0200 -+++ ./addresses.h.in 2008-11-12 14:26:23.000000000 +0100 +--- a/addresses.h.in ++++ b/addresses.h.in @@ -1,2 +1,4 @@ #define WATCHER "root" -#define WATCHEE "arpwatch (Arpwatch)" +#define WATCHEE "root (Arpwatch)" +extern char *watcher; +extern char *watchee; -diff -ruN ../arpwatch-2.1a15.orig/arpsnmp.8 ./arpsnmp.8 ---- ../arpwatch-2.1a15.orig/arpsnmp.8 2000-09-17 22:34:48.000000000 +0200 -+++ ./arpsnmp.8 2008-11-12 14:26:23.000000000 +0100 -@@ -30,6 +30,12 @@ +--- a/arpsnmp.8 ++++ b/arpsnmp.8 +@@ -30,6 +30,12 @@ arpsnmp - keep track of ethernet/ip addr ] [ .B -f .I datafile @@ -23,7 +21,7 @@ ] .I file [ -@@ -60,6 +66,27 @@ +@@ -60,6 +66,27 @@ Note that an empty file must be created before the first time you run .BR arpsnmp . .LP @@ -51,10 +49,9 @@ .SH "REPORT MESSAGES" (See the .BR arpwatch (1) -diff -ruN ../arpwatch-2.1a15.orig/arpsnmp.c ./arpsnmp.c ---- ../arpwatch-2.1a15.orig/arpsnmp.c 2004-01-22 23:25:17.000000000 +0100 -+++ ./arpsnmp.c 2008-11-12 14:26:23.000000000 +0100 -@@ -59,6 +59,7 @@ +--- a/arpsnmp.c ++++ b/arpsnmp.c +@@ -59,6 +59,7 @@ static const char rcsid[] = #include "file.h" #include "machdep.h" #include "util.h" @@ -62,7 +59,7 @@ /* Forwards */ int main(int, char **); -@@ -90,7 +91,7 @@ +@@ -90,7 +91,7 @@ main(int argc, char **argv) } opterr = 0; @@ -71,7 +68,7 @@ switch (op) { case 'd': -@@ -105,6 +106,24 @@ +@@ -105,6 +106,24 @@ main(int argc, char **argv) arpfile = optarg; break; @@ -96,7 +93,7 @@ default: usage(); } -@@ -185,6 +204,6 @@ +@@ -185,6 +204,6 @@ usage(void) (void)fprintf(stderr, "Version %s\n", version); (void)fprintf(stderr, @@ -104,10 +101,9 @@ + "usage: %s [-d] [-f datafile] [-e username] [-s username] file [...]\n", prog); exit(1); } -diff -ruN ../arpwatch-2.1a15.orig/arpwatch.8 ./arpwatch.8 ---- ../arpwatch-2.1a15.orig/arpwatch.8 2008-11-12 12:19:16.000000000 +0100 -+++ ./arpwatch.8 2008-11-12 14:26:23.000000000 +0100 -@@ -46,6 +46,12 @@ +--- a/arpwatch.8 ++++ b/arpwatch.8 +@@ -46,6 +46,12 @@ arpwatch - keep track of ethernet/ip add ] [ .B -u .I username @@ -120,7 +116,7 @@ ] .ad .SH DESCRIPTION -@@ -107,6 +113,27 @@ +@@ -107,6 +113,27 @@ and group ID to that of the primary grou .IR username . This is recommended for security reasons. .LP @@ -148,10 +144,9 @@ Note that an empty .I arp.dat file must be created before the first time you run -diff -ruN ../arpwatch-2.1a15.orig/arpwatch.c ./arpwatch.c ---- ../arpwatch-2.1a15.orig/arpwatch.c 2008-11-12 14:21:27.000000000 +0100 -+++ ./arpwatch.c 2008-11-12 14:26:23.000000000 +0100 -@@ -85,6 +85,7 @@ +--- a/arpwatch.c ++++ b/arpwatch.c +@@ -85,6 +85,7 @@ struct rtentry; #include "machdep.h" #include "setsignal.h" #include "util.h" @@ -159,7 +154,7 @@ /* Some systems don't define these */ #ifndef ETHERTYPE_REVARP -@@ -230,7 +231,7 @@ +@@ -230,7 +231,7 @@ main(int argc, char **argv) interface = NULL; rfilename = NULL; pd = NULL; @@ -168,7 +163,7 @@ switch (op) { case 'd': -@@ -272,6 +273,26 @@ +@@ -272,6 +273,26 @@ main(int argc, char **argv) } break; @@ -195,7 +190,7 @@ default: usage(); } -@@ -904,6 +925,7 @@ +@@ -904,6 +925,7 @@ usage(void) (void)fprintf(stderr, "Version %s\n", version); (void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]" @@ -204,10 +199,9 @@ + " [-e username] [-s username]\n", prog); exit(1); } -diff -ruN ../arpwatch-2.1a15.orig/report.c ./report.c ---- ../arpwatch-2.1a15.orig/report.c 2008-11-12 12:15:54.000000000 +0100 -+++ ./report.c 2008-11-12 14:26:23.000000000 +0100 -@@ -70,6 +70,9 @@ +--- a/report.c ++++ b/report.c +@@ -70,6 +70,9 @@ struct rtentry; #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s") @@ -217,7 +211,7 @@ static int cdepth; /* number of outstanding children */ static char *fmtdate(time_t); -@@ -240,8 +243,6 @@ +@@ -240,8 +243,6 @@ report(register char *title, register u_ register FILE *f; char tempfile[64], cpu[64], os[64]; char *fmt = "%20s: %s\n"; @@ -226,7 +220,7 @@ char *sendmail = PATH_SENDMAIL; char *unknown = "<unknown>"; char buf[132]; -@@ -258,6 +259,9 @@ +@@ -258,6 +259,9 @@ report(register char *title, register u_ } f = stdout; (void)putc('\n', f); ++++++ arpwatch-2.1a11-hname-overflow.dif ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.698849032 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.698849032 +0100 @@ -1,6 +1,6 @@ ---- arpwatch-2.1a11/db.c -+++ arpwatch-2.1a11/db.c -@@ -62,7 +62,11 @@ +--- a/db.c ++++ b/db.c +@@ -62,7 +62,11 @@ static const char rcsid[] = /* Ethernet info */ struct einfo { u_char e[6]; /* ether address */ @@ -13,7 +13,7 @@ time_t t; /* timestamp */ }; -@@ -283,8 +287,10 @@ +@@ -283,8 +287,10 @@ elist_alloc(register u_int32_t a, regist BCOPY(e, ep->e, 6); if (h == NULL && !initializing) h = getsname(a); @@ -26,7 +26,7 @@ ep->t = t; return (ep); } -@@ -304,7 +310,8 @@ +@@ -304,7 +310,8 @@ check_hname(register struct ainfo *ap) if (!isdigit((int)*h) && strcmp(h, ep->h) != 0) { syslog(LOG_INFO, "hostname changed %s %s %s -> %s", intoa(ap->a), e2str(ep->e), ep->h, h); ++++++ arpwatch-2.1a11-tokenring.diff ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.710849045 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.710849045 +0100 @@ -1,6 +1,6 @@ ---- arpwatch-2.1a11/arpwatch.8 -+++ arpwatch-2.1a11/arpwatch.8 -@@ -47,12 +47,12 @@ +--- a/arpwatch.8 ++++ b/arpwatch.8 +@@ -47,12 +47,12 @@ arpwatch - keep track of ethernet/ip add .ad .SH DESCRIPTION .B Arpwatch @@ -15,7 +15,7 @@ .LP The .B -d -@@ -62,7 +62,7 @@ +@@ -62,7 +62,7 @@ background and emailing the reports. Ins .LP The .B -f @@ -24,7 +24,7 @@ The default is .IR arp.dat . .LP -@@ -106,26 +106,26 @@ +@@ -106,26 +106,26 @@ Here's a quick list of the report messag .BR arpsnmp (1)): .TP .B "new activity" @@ -59,7 +59,7 @@ .TP .B "ip broadcast" The ip address of the host is a broadcast address. -@@ -133,15 +133,15 @@ +@@ -133,15 +133,15 @@ The ip address of the host is a broadcas .B "bogon" The source ip address is not local to the local subnet. .TP @@ -81,7 +81,7 @@ the third (or greater) least recently seen address. (This is similar to a flip flop.) .TP -@@ -153,7 +153,7 @@ +@@ -153,7 +153,7 @@ addresses was a DECnet address. .nh .nf /usr/operator/arpwatch - default directory @@ -90,9 +90,9 @@ ethercodes.dat - vendor ethernet block list .ad .hy ---- arpwatch-2.1a11/arpwatch.c -+++ arpwatch-2.1a11/arpwatch.c -@@ -26,6 +26,8 @@ +--- a/arpwatch.c ++++ b/arpwatch.c +@@ -26,6 +26,8 @@ static const char rcsid[] = "@(#) $Id: arpwatch.c,v 1.63 2000/10/14 02:07:28 leres Exp $ (LBL)"; #endif @@ -101,7 +101,7 @@ /* * arpwatch - keep track of ethernet/ip address pairings, report changes */ -@@ -74,6 +76,9 @@ +@@ -74,6 +76,9 @@ struct rtentry; #include "db.h" #include "ec.h" #include "fddi.h" @@ -111,7 +111,7 @@ #include "file.h" #include "machdep.h" #include "setsignal.h" -@@ -135,10 +140,16 @@ +@@ -135,10 +140,16 @@ int isbogon(u_int32_t); int main(int, char **); void process_ether(u_char *, const struct pcap_pkthdr *, const u_char *); void process_fddi(u_char *, const struct pcap_pkthdr *, const u_char *); @@ -128,7 +128,7 @@ __dead void usage(void) __attribute__((volatile)); int -@@ -267,6 +278,7 @@ +@@ -267,6 +278,7 @@ main(int argc, char **argv) swapped = pcap_is_swapped(pd); } else { snaplen = max(sizeof(struct ether_header), @@ -136,7 +136,7 @@ sizeof(struct fddi_header)) + sizeof(struct ether_arp); timeout = 1000; pd = pcap_open_live(interface, snaplen, 1, timeout, errbuf); -@@ -286,10 +298,14 @@ +@@ -286,10 +298,14 @@ main(int argc, char **argv) setgid(getgid()); setuid(getuid()); @@ -154,7 +154,7 @@ linktype); exit(1); } -@@ -337,7 +353,11 @@ +@@ -337,7 +353,11 @@ main(int argc, char **argv) case DLT_FDDI: status = pcap_loop(pd, 0, process_fddi, NULL); break; @@ -167,7 +167,7 @@ default: syslog(LOG_ERR, "bad linktype %d (can't happen)", linktype); exit(1); -@@ -393,13 +413,13 @@ +@@ -393,13 +413,13 @@ process_ether(register u_char *u, regist /* Watch for ethernet broadcast */ if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 || MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) { @@ -183,7 +183,7 @@ return; } -@@ -542,13 +562,13 @@ +@@ -542,13 +562,13 @@ process_fddi(register u_char *u, registe /* Watch for ethernet broadcast */ if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 || MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) { @@ -199,7 +199,7 @@ return; } -@@ -639,6 +659,71 @@ +@@ -639,6 +659,71 @@ sanity_fddi(register struct fddi_header return(1); } @@ -271,9 +271,9 @@ int addnet(register const char *str) { ---- arpwatch-2.1a11/db.c -+++ arpwatch-2.1a11/db.c -@@ -150,7 +150,7 @@ +--- a/db.c ++++ b/db.c +@@ -150,7 +150,7 @@ ent_add(register u_int32_t a, register u /* An old entry comes to life */ e2 = ap->elist[0]->e; t2 = ap->elist[0]->t; @@ -282,7 +282,7 @@ a, e, e2); /* Shift entries down */ len = i * sizeof(ap->elist[0]); -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ ent_add(register u_int32_t a, register u /* New ether address */ e2 = ap->elist[0]->e; t2 = ap->elist[0]->t; @@ -291,9 +291,9 @@ /* Make room at head of list */ alist_alloc(ap); len = ap->ecount * sizeof(ap->elist[0]); ---- arpwatch-2.1a11/report.c -+++ arpwatch-2.1a11/report.c -@@ -312,19 +312,19 @@ +--- a/report.c ++++ b/report.c +@@ -312,19 +312,19 @@ report(register char *title, register u_ (void)putc('\n', f); (void)fprintf(f, fmt, "hostname", hn); (void)fprintf(f, fmt, "ip address", intoa(a)); @@ -317,8 +317,8 @@ } if (t1p) (void)fprintf(f, fmt, "timestamp", fmtdate(*t1p)); ---- arpwatch-2.1a11/toring.h -+++ arpwatch-2.1a11/toring.h +--- /dev/null ++++ b/toring.h @@ -0,0 +1,26 @@ +/* Support for tokenring */ + ++++++ arpwatch-2.1a15-massagevendor.patch ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.722849060 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.722849060 +0100 @@ -1,10 +1,8 @@ Author: Lars Mueller <[email protected]> Subject: Deal with added two whitespaces in more recent oui.txt versions -Index: arpwatch-2.1a15/massagevendor -=================================================================== ---- arpwatch-2.1a15.orig/massagevendor -+++ arpwatch-2.1a15/massagevendor +--- a/massagevendor ++++ b/massagevendor @@ -10,12 +10,12 @@ # - Deal with duplicates in oui.txt (concatenate company names) # ++++++ arpwatch-exit.patch ++++++ --- a/arpwatch.c +++ b/arpwatch.c @@ -914,7 +914,7 @@ die(int signo) syslog(LOG_DEBUG, "exiting"); checkpoint(0); - exit(1); + exit(0); } RETSIGTYPE ++++++ arpwatch-no-source-zero.dif ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.742849083 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.746849088 +0100 @@ -1,6 +1,6 @@ ---- arpwatch-2.1a11/arpwatch.c -+++ arpwatch-2.1a11/arpwatch.c -@@ -378,6 +378,12 @@ +--- a/arpwatch.c ++++ b/arpwatch.c +@@ -378,6 +378,12 @@ process_ether(register u_char *u, regist /* Source ip address */ BCOPY(SPA(ea), &sia, 4); ++++++ getnameinfo.patch ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.782849130 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.782849130 +0100 @@ -1,7 +1,5 @@ -Index: arpwatch-2.1a15/db.c -=================================================================== ---- arpwatch-2.1a15.orig/db.c 2019-01-22 13:34:02.942536296 +0100 -+++ arpwatch-2.1a15/db.c 2019-01-22 13:38:54.099329959 +0100 +--- a/db.c ++++ b/db.c @@ -269,6 +269,7 @@ elist_alloc(register u_int32_t a, regist register u_int size; static struct einfo *elist = NULL; @@ -36,10 +34,8 @@ } int -Index: arpwatch-2.1a15/dns.c -=================================================================== ---- arpwatch-2.1a15.orig/dns.c 2000-10-14 03:50:52.000000000 +0200 -+++ arpwatch-2.1a15/dns.c 2019-01-22 13:39:31.043941461 +0100 +--- a/dns.c ++++ b/dns.c @@ -137,24 +137,30 @@ gethinfo(register char *hostname, regist return (0); } @@ -83,10 +79,8 @@ char * getsname(register u_int32_t a) { -Index: arpwatch-2.1a15/report.c -=================================================================== ---- arpwatch-2.1a15.orig/report.c 2019-01-22 13:34:02.962536621 +0100 -+++ arpwatch-2.1a15/report.c 2019-01-22 13:37:04.081507637 +0100 +--- a/report.c ++++ b/report.c @@ -311,6 +311,7 @@ report(register char *title, register u_ (void)fprintf(f, "Subject: %s (%s)\n", title, hn); else { ++++++ report-iface.patch ++++++ --- /var/tmp/diff_new_pack.cLGsdY/_old 2021-02-09 21:17:21.794849145 +0100 +++ /var/tmp/diff_new_pack.cLGsdY/_new 2021-02-09 21:17:21.798849149 +0100 @@ -1,27 +1,13 @@ -Index: b/report.c -=================================================================== ---- a/report.c -+++ b/report.c -@@ -73,6 +73,8 @@ struct rtentry; - char *watcher = WATCHER; - char *watchee = WATCHEE; - -+extern char *interface; -+ - static int cdepth; /* number of outstanding children */ +--- a/arpsnmp.c ++++ b/arpsnmp.c +@@ -68,6 +68,7 @@ int snmp_add(u_int32_t, u_char *, time_t + __dead void usage(void) __attribute__((volatile)); - static char *fmtdate(time_t); -@@ -339,6 +341,8 @@ report(register char *title, register u_ - (void)fprintf(f, fmt, "previous timestamp", fmtdate(*t2p)); - if (t1p && t2p && *t1p && *t2p) - (void)fprintf(f, fmt, "delta", fmtdelta(*t1p - *t2p)); -+ if (interface) -+ (void)fprintf(f, fmt, "interface", interface); + char *prog; ++char *interface; - if (debug) { - fflush(f); -Index: b/arpwatch.c -=================================================================== + extern int optind; + extern int opterr; --- a/arpwatch.c +++ b/arpwatch.c @@ -118,6 +118,7 @@ struct rtentry; @@ -41,15 +27,23 @@ struct bpf_program code; char errbuf[PCAP_ERRBUF_SIZE]; char* serveruser = NULL; -Index: b/arpsnmp.c -=================================================================== ---- a/arpsnmp.c -+++ b/arpsnmp.c -@@ -68,6 +68,7 @@ int snmp_add(u_int32_t, u_char *, time_t - __dead void usage(void) __attribute__((volatile)); +--- a/report.c ++++ b/report.c +@@ -73,6 +73,8 @@ struct rtentry; + char *watcher = WATCHER; + char *watchee = WATCHEE; - char *prog; -+char *interface; ++extern char *interface; ++ + static int cdepth; /* number of outstanding children */ - extern int optind; - extern int opterr; + static char *fmtdate(time_t); +@@ -339,6 +341,8 @@ report(register char *title, register u_ + (void)fprintf(f, fmt, "previous timestamp", fmtdate(*t2p)); + if (t1p && t2p && *t1p && *t2p) + (void)fprintf(f, fmt, "delta", fmtdelta(*t1p - *t2p)); ++ if (interface) ++ (void)fprintf(f, fmt, "interface", interface); + + if (debug) { + fflush(f);
