diff --git a/.gitignore b/.gitignore index b8ff172..1d85607 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /arpwatch-3.2.tar.gz /arpwatch-3.3.tar.gz /arpwatch-3.4.tar.gz +/arpwatch-3.5.tar.gz diff --git a/arpwatch-3.4-exitcode.patch b/arpwatch-3.4-exitcode.patch deleted file mode 100644 index 719dfe7..0000000 --- a/arpwatch-3.4-exitcode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur arpwatch-3.4-original/arpwatch.c arpwatch-3.4/arpwatch.c ---- arpwatch-3.4-original/arpwatch.c 2023-09-05 13:50:56.000000000 -0400 -+++ arpwatch-3.4/arpwatch.c 2023-09-06 09:52:14.851126556 -0400 -@@ -892,7 +892,7 @@ - - lg(LOG_DEBUG, "exiting"); - checkpoint(0); -- exit(1); -+ exit(0); - } - - void diff --git a/arpwatch-3.4-devlookup.patch b/arpwatch-3.5-devlookup.patch similarity index 91% rename from arpwatch-3.4-devlookup.patch rename to arpwatch-3.5-devlookup.patch index 196197f..5931af6 100644 --- a/arpwatch-3.4-devlookup.patch +++ b/arpwatch-3.5-devlookup.patch @@ -1,8 +1,8 @@ -diff -Naur arpwatch-3.4-original/arpwatch.c arpwatch-3.4/arpwatch.c ---- arpwatch-3.4-original/arpwatch.c 2023-09-05 13:50:56.000000000 -0400 -+++ arpwatch-3.4/arpwatch.c 2023-09-06 09:53:38.038275336 -0400 -@@ -161,6 +161,8 @@ - void die(int); +diff -Naur arpwatch-3.5-original/arpwatch.c arpwatch-3.5/arpwatch.c +--- arpwatch-3.5-original/arpwatch.c 2023-12-03 13:10:05.000000000 -0500 ++++ arpwatch-3.5/arpwatch.c 2023-12-03 20:06:32.694857659 -0500 +@@ -163,6 +163,8 @@ + void hup(int); int isbogon(u_int32_t); int main(int, char **); +int try_open_live(pcap_t ** pd_ptr, char const * interface_name, @@ -10,7 +10,7 @@ diff -Naur arpwatch-3.4-original/arpwatch.c arpwatch-3.4/arpwatch.c void process_ether(u_char *, const struct pcap_pkthdr *, const u_char *); void process_fddi(u_char *, const struct pcap_pkthdr *, const u_char *); int readsnmp(char *); -@@ -177,7 +179,7 @@ +@@ -179,7 +181,7 @@ int op, snaplen, timeout, linktype, status; pcap_t *pd; FILE *fp; @@ -19,7 +19,7 @@ diff -Naur arpwatch-3.4-original/arpwatch.c arpwatch-3.4/arpwatch.c char *interface, *rfilename; struct bpf_program code; char errbuf[PCAP_ERRBUF_SIZE]; -@@ -309,13 +311,18 @@ +@@ -311,13 +313,18 @@ "%s: pcap_findalldevs: %s\n", prog, errbuf); exit(1); } @@ -41,7 +41,7 @@ diff -Naur arpwatch-3.4-original/arpwatch.c arpwatch-3.4/arpwatch.c #else if (interface = pcap_lookupdev(errbuf)) == NULL) { (void)fprintf(stderr, -@@ -354,15 +361,12 @@ +@@ -356,15 +363,12 @@ } swapped = pcap_is_swapped(pd); } else { @@ -61,7 +61,7 @@ diff -Naur arpwatch-3.4-original/arpwatch.c arpwatch-3.4/arpwatch.c #ifdef WORDS_BIGENDIAN swapped = 1; #endif -@@ -452,6 +456,74 @@ +@@ -454,6 +458,74 @@ exit(0); } diff --git a/arpwatch-3.5-exitcode.patch b/arpwatch-3.5-exitcode.patch new file mode 100644 index 0000000..b98a580 --- /dev/null +++ b/arpwatch-3.5-exitcode.patch @@ -0,0 +1,12 @@ +diff -Naur arpwatch-3.5-original/arpwatch.c arpwatch-3.5/arpwatch.c +--- arpwatch-3.5-original/arpwatch.c 2023-12-03 13:10:05.000000000 -0500 ++++ arpwatch-3.5/arpwatch.c 2023-12-03 20:04:01.834691097 -0500 +@@ -915,7 +915,7 @@ + { + lg(LOG_DEBUG, "exiting"); + checkpoint(0); +- exit(1); ++ exit(0); + } + + void diff --git a/arpwatch.spec b/arpwatch.spec index 2212181..145760b 100644 --- a/arpwatch.spec +++ b/arpwatch.spec @@ -1,6 +1,6 @@ Name: arpwatch Epoch: 14 -Version: 3.4 +Version: 3.5 Release: %autorelease Summary: Network monitoring tools for tracking IP addresses on a network @@ -69,12 +69,12 @@ Patch: arpwatch-3.1-configure-no-local-pcap.patch Patch: arpwatch-3.1-all-zero-bogon.patch # When arpwatch is terminated cleanly by a signal (INT/TERM/HUP) handler, the # exit code should be zero for success instead of nonzero for failure. -Patch: arpwatch-3.4-exitcode.patch +Patch: arpwatch-3.5-exitcode.patch # When -i is not given, do not just try the first device found, but keep # checking devices until a usable one is found, if any is available. # Additionally, handle the case where a device provides both supported and # unsupported datalink types. -Patch: arpwatch-3.4-devlookup.patch +Patch: arpwatch-3.5-devlookup.patch # Replace _getshort(), “a glibc function that hasn't been declared in the # installed headers for many, many years,” with ns_get16(). Fixes C99 diff --git a/sources b/sources index abd3702..5650a2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (arpwatch-3.4.tar.gz) = 0c984ec856e76df4475b367a2e5fb81d0bfdb00fd7730b303c0e1d422f2d2b4f8afef80082bf938d6a6a3b9855f4acfaea23b111430d5d13751271c5b4d70c36 +SHA512 (arpwatch-3.5.tar.gz) = e46b350c483f0e7c873eb177be337f238b2db3d859d8b305df5a74d9d97ca449750f9ed50a99c5d4c51618e22747731d70ceb3f13aae39c39d258b960258fb88