From 760fd7e942dac952cf1f395bb7c3a18c96139ce0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:25:52 +0000
Subject: import arpwatch-2.1a15-36.el7


---

diff --git a/SOURCES/arpwatch-ethernet-address-format.patch b/SOURCES/arpwatch-ethernet-address-format.patch
new file mode 100644
index 0000000..fa6b52d
--- /dev/null
+++ b/SOURCES/arpwatch-ethernet-address-format.patch
@@ -0,0 +1,17 @@
+Originally reported at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=315215.
+
+Resolves: #1368523
+
+--- arpwatch-2.1a13/ec.c	2000-10-13 22:49:16.000000000 +0000
++++ arpwatch-2.1a13/ec.c	2005-06-18 07:12:14.131890648 +0000
+@@ -218,7 +218,7 @@
+ {
+ 	static char str[32];
+ 
+-	(void)sprintf(str, "%x:%x:%x:%x:%x:%x",
++	(void)sprintf(str, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
+ 	    e[0], e[1], e[2], e[3], e[4], e[5]);
+ 	return (str);
+ }
+
+
diff --git a/SOURCES/arpwatch-zero-source-ip.patch b/SOURCES/arpwatch-zero-source-ip.patch
new file mode 100644
index 0000000..186e7ee
--- /dev/null
+++ b/SOURCES/arpwatch-zero-source-ip.patch
@@ -0,0 +1,32 @@
+--- a/arpwatch.c	2017-03-22 08:44:22.095722636 +0100
++++ b/arpwatch.c	2017-03-22 09:11:08.119515745 +0100
+@@ -123,6 +123,7 @@ struct nets {
+ static struct nets *nets;
+ static int nets_ind;
+ static int nets_size;
++static int ignore_zero_net;
+ 
+ extern int optind;
+ extern int opterr;
+@@ -477,6 +478,11 @@ process_ether(register u_char *u, regist
+ 	/* Source ip address */
+ 	BCOPY(SPA(ea), &sia, 4);
+ 
++	if (sia == 0 && ignore_zero_net) {
++		syslog(LOG_DEBUG, "ignoring packet from 0.0.0.0");
++		return;
++	}
++
+ 	/* Watch for bogons */
+ 	if (isbogon(sia)) {
+ 		dosyslog(LOG_INFO, "bogon", sia, sea, sha);
+@@ -802,6 +808,9 @@ addnet(register const char *str)
+ 	np->netmask = m;
+ 	++nets_ind;
+ 
++	if (n == 0)
++		ignore_zero_net = 1;
++
+ 	return (1);
+ }
+ 
diff --git a/SPECS/arpwatch.spec b/SPECS/arpwatch.spec
index 828fcf5..951c760 100644
--- a/SPECS/arpwatch.spec
+++ b/SPECS/arpwatch.spec
@@ -4,7 +4,7 @@
 Name: arpwatch
 Epoch: 14
 Version: 2.1a15
-Release: 33%{?dist}
+Release: 36%{?dist}
 Summary: Network monitoring tools for tracking IP addresses on a network
 Group: Applications/System
 License: BSD with advertising
@@ -42,6 +42,8 @@ Patch16: arpwatch-201301-ethcodes.patch
 Patch17: arpwatch-pie.patch
 Patch18: arpwatch-aarch64.patch
 Patch19: arpwatch-promisc.patch
+Patch20: arpwatch-ethernet-address-format.patch
+Patch21: arpwatch-zero-source-ip.patch
 
 %description
 The arpwatch package contains arpwatch and arpsnmp.  Arpwatch and
@@ -75,6 +77,8 @@ network.
 %patch17 -p1 -b .pie
 %patch18 -p1 -b .aarch64
 %patch19 -p1 -b .promisc
+%patch20 -p1 -b .ethernet-address
+%patch21 -p1 -b .zero-source-ip
 
 %build
 %configure
@@ -154,6 +158,15 @@ fi
 %attr(0644,-,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
 
 %changelog
+* Wed Mar 22 2017 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-36
+- refix: arpwatch detects flip flop of 0.0.0.0 for multiple DHCP Clients (#1408894)
+
+* Wed Mar 22 2017 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-35
+- arpwatch detects flip flop of 0.0.0.0 for multiple DHCP Clients (#1408894)
+
+* Tue Mar 21 2017 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-34
+- MAC addresses are not shown properly (#1368523)
+
 * Mon Apr 18 2016 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-33
 - fix typo in arpwatch-promisc.patch (#1291722)