From 17d6ed1f5705e39ec1875405f4dda01d2d1d3f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Fri, 16 Feb 2018 17:59:32 +0100
Subject: [PATCH] Compile with recent bind includes, that does not include
 isc/util.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Menšík <pemensik@redhat.com>
---
 dhcp-4.3.6-isc-util.patch | 77 +++++++++++++++++++++++++++++++++++++++
 dhcp.spec                 |  9 ++++-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 dhcp-4.3.6-isc-util.patch

diff --git a/dhcp-4.3.6-isc-util.patch b/dhcp-4.3.6-isc-util.patch
new file mode 100644
index 0000000..50a0248
--- /dev/null
+++ b/dhcp-4.3.6-isc-util.patch
@@ -0,0 +1,77 @@
+From c37721f799e6b32da156759a830011949311205a Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Fri, 16 Feb 2018 17:50:40 +0100
+Subject: [PATCH] New bind includes never includes isc/util.h from any public
+ headers. Include them to all compiled files that require it.
+
+---
+ client/dhclient.c   | 1 +
+ common/execute.c    | 1 +
+ common/parse.c      | 1 +
+ common/socket.c     | 1 +
+ omapip/connection.c | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/client/dhclient.c b/client/dhclient.c
+index 228b4fe..014365d 100644
+--- a/client/dhclient.c
++++ b/client/dhclient.c
+@@ -38,6 +38,7 @@
+ #include <sys/wait.h>
+ #include <limits.h>
+ #include <isc/file.h>
++#include <isc/util.h>
+ #include <dns/result.h>
+ 
+ #ifdef HAVE_LIBCAP_NG
+diff --git a/common/execute.c b/common/execute.c
+index fa4e0f8..1ee1e7d 100644
+--- a/common/execute.c
++++ b/common/execute.c
+@@ -28,6 +28,7 @@
+ 
+ #include "dhcpd.h"
+ #include <omapip/omapip_p.h>
++#include <isc/util.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
+diff --git a/common/parse.c b/common/parse.c
+index d08cd2c..729d442 100644
+--- a/common/parse.c
++++ b/common/parse.c
+@@ -27,6 +27,7 @@
+  */
+ 
+ #include "dhcpd.h"
++#include <isc/util.h>
+ #include <syslog.h>
+ 
+ /* Enumerations can be specified in option formats, and are used for
+diff --git a/common/socket.c b/common/socket.c
+index 2b352a1..94ce334 100644
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -35,6 +35,7 @@
+  */
+ 
+ #include "dhcpd.h"
++#include <isc/util.h>
+ #include <errno.h>
+ #include <sys/ioctl.h>
+ #include <sys/uio.h>
+diff --git a/omapip/connection.c b/omapip/connection.c
+index 9aac0c8..a74becc 100644
+--- a/omapip/connection.c
++++ b/omapip/connection.c
+@@ -30,6 +30,7 @@
+ #include "dhcpd.h"
+ 
+ #include <omapip/omapip_p.h>
++#include <isc/util.h>
+ #include <arpa/inet.h>
+ #include <arpa/nameser.h>
+ #include <errno.h>
+-- 
+2.14.3
+
diff --git a/dhcp.spec b/dhcp.spec
index 9803a84..be0fede 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -16,7 +16,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.6
-Release:  15%{?dist}
+Release:  16%{?dist}
 # 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.
@@ -74,6 +74,7 @@ Patch37:  dhcp-stateless-DUID-LLT.patch
 Patch38:  dhcp-dhclient-preinit6s.patch
 Patch39:  dhcp-handle_ctx_signals.patch
 Patch40:  dhcp-4.3.6-omapi-leak.patch
+Patch41:  dhcp-4.3.6-isc-util.patch
 
 
 BuildRequires: autoconf
@@ -340,6 +341,9 @@ rm bind/bind.tar.gz
 # https://bugzilla.redhat.com/1523547 
 %patch40 -p1 -b .omapi-leak
 
+# include isc/util.h explicitly, is it no longer contained in used headers
+%patch41 -p1 -b .isc-util
+
 # DHCLIENT_DEFAULT_PREFIX_LEN  64 -> 128
 # https://bugzilla.gnome.org/show_bug.cgi?id=656610
 sed -i -e 's|DHCLIENT_DEFAULT_PREFIX_LEN 64|DHCLIENT_DEFAULT_PREFIX_LEN 128|g' includes/site.h
@@ -662,6 +666,9 @@ done
 %endif
 
 %changelog
+* Thu Feb 22 2018 Petr Menšík <pemensik@redhat.com> - 12:4.3.6-16
+- Compile with recent bind includes, that does not include isc/util.h
+
 * Thu Feb 22 2018 Petr Menšík <pemensik@redhat.com> - 12:4.3.6-15
 - Do not rely on ignoring case sensitivity of VERSION variable