From 427fdce6639d0d161c20ed88470ca8cba0217b1d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 06 2014 07:25:51 +0000
Subject: import dhcp-4.2.5-27.el7_0.2


---

diff --git a/SOURCES/dhclient-script b/SOURCES/dhclient-script
index 30a4d48..a829568 100644
--- a/SOURCES/dhclient-script
+++ b/SOURCES/dhclient-script
@@ -715,9 +715,16 @@ case "${reason}" in
         if arping -D -q -c2 -I ${interface} ${new_ip_address}; then
             dhconfig
             exit_with_hooks 0
-        else
-            # DAD failed, i.e. address is already in use
-            exit_with_hooks 1
+        else  # DAD failed, i.e. address is already in use
+            ARP_REPLY=$(arping -D -c2 -I ${interface} ${new_ip_address} | grep reply | awk '{print toupper($5)}' | cut -d "[" -f2 | cut -d "]" -f1)
+            OUR_MACS=$(ip link show | grep link | awk '{print toupper($2)}' | uniq)
+            if [[ "${OUR_MACS}" = *"${ARP_REPLY}"* ]]; then
+                # in RENEW the reply can come from our system, that's OK
+                dhconfig
+                exit_with_hooks 0
+            else
+                exit_with_hooks 1
+            fi
         fi
         ;;
 
diff --git a/SOURCES/dhcp-4.2.5-centos-branding.patch b/SOURCES/dhcp-4.2.5-centos-branding.patch
deleted file mode 100644
index f3e7113..0000000
--- a/SOURCES/dhcp-4.2.5-centos-branding.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNrp dhcp-4.1.1-P1.orig/omapip/errwarn.c dhcp-4.1.1-P1/omapip/errwarn.c
---- dhcp-4.1.1-P1.orig/omapip/errwarn.c 2012-08-15 14:04:33.149141000 +0000
-+++ dhcp-4.1.1-P1/omapip/errwarn.c      2012-08-15 14:13:05.582416057 +0000
-@@ -81,8 +81,8 @@ void log_fatal (const char * fmt, ... )
-   log_error ("have been made to the base software release in order to make");
-   log_error ("it work better with this distribution.");
-   log_error ("%s", "");
--  log_error ("Please report for this software via the Red Hat Bugzilla site:");
--  log_error ("    http://bugzilla.redhat.com");
-+  log_error ("Please report for this software via the CentOS Bugs Database:");
-+  log_error ("    http://bugs.centos.org/");
-   log_error ("%s", "");
-   log_error ("exiting.");
- #endif
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index 7908395..78b487e 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.5
-Release:  27%{?dist}.1
+Release:  27%{?dist}.2
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -82,7 +82,6 @@ Patch48:  dhcp-4.2.5-next-server.patch
 Patch49:  dhcp-4.2.5-ipv6-bind-to-interface.patch
 Patch50:  dhcp-ffff-checksum.patch
 Patch51:  dhcp-sd-daemon.patch
-Patch52:  dhcp-4.2.5-centos-branding.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -130,7 +129,7 @@ the ISC DHCP service and relay agent.
 Summary: Provides the ISC DHCP client daemon and dhclient-script
 Group: System Environment/Base
 # dhclient-script requires:
-Requires: coreutils grep hostname initscripts iproute iputils sed
+Requires: coreutils grep hostname initscripts iproute iputils sed gawk
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
@@ -356,7 +355,6 @@ rm -rf includes/isc-dhcp
 
 # support for sending startup notification to systemd (#1087245)
 %patch51 -p1 -b .sd-daemon
-%patch52 -p1
 
 # Update paths in all man pages
 for page in client/dhclient.conf.5 client/dhclient.leases.5 \
@@ -631,8 +629,8 @@ done
 
 
 %changelog
-* Thu Aug 14 2014 CentOS Sources <bugs@centos.org> - 4.2.5-27.el7.centos.1
-- Roll in CentOS Branding
+* Wed Oct 01 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-27.2
+- dhclient-script: it's OK if the arping reply comes from our system (#1148345)
 
 * Mon Jul 07 2014 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-27.1
 - support for sending startup notification to systemd (#1087245)