Update isc-dhcp4 to 4.3.6.

This is mainly bug fix release and changes from 4.3.4 are too many to write
here, please refer RELNOTES in detail.

6 files changed, 12 insertions, 48 deletions

diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index 9eeddef718f..3caf251e47e 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2017/01/19 18:52:20 agc Exp $
+# $NetBSD: Makefile.common,v 1.34 2017/08/13 14:21:03 taca Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -17,7 +17,7 @@ LICENSE=		isc
 
 CONFLICTS+=		isc-dhcp-base-3.*
 
-VERSION=		4.3.4
+VERSION=		4.3.6
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -82,7 +82,7 @@ BIND_CONFIGURE_ARGS+=	--with-export-includedir=${WRKSRC}/bind/include
 BIND_CONFIGURE_ARGS+=	--with-export-libdir=${WRKSRC}/bind/lib
 BIND_CONFIGURE_ARGS+=	--with-gssapi=no
 
-BIND_WRKSRC=		${WRKSRC}/bind/bind-9.9.8-P4
+BIND_WRKSRC=		${WRKSRC}/bind/bind-9.9.11
 
 post-configure:
 	${RUN}${_ULIMIT_CMD}					\
diff --git a/net/isc-dhcp4/PLIST b/net/isc-dhcp4/PLIST
index 8a57ec1532d..1087ade1032 100644
--- a/net/isc-dhcp4/PLIST
+++ b/net/isc-dhcp4/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/08 14:09:23 taca Exp $
-@comment include/isc-dhcp/dst.h
+@comment $NetBSD: PLIST,v 1.5 2017/08/13 14:21:03 taca Exp $
+include/isc-dhcp/dst.h
 include/omapip/alloc.h
 include/omapip/buffer.h
 include/omapip/convert.h
@@ -9,7 +9,6 @@ include/omapip/omapip.h
 include/omapip/omapip_p.h
 include/omapip/result.h
 include/omapip/trace.h
-@comment lib/libdst.a
 man/man5/dhcp-eval.5
 man/man5/dhcp-options.5
 share/doc/isc-dhcp/README
diff --git a/net/isc-dhcp4/buildlink3.mk b/net/isc-dhcp4/buildlink3.mk
index 707db1b6f6c..26bc537de76 100644
--- a/net/isc-dhcp4/buildlink3.mk
+++ b/net/isc-dhcp4/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2017/08/13 14:21:03 taca Exp $
 
 BUILDLINK_TREE+=	isc-dhcp
 
 .if !defined(ISC_DHCP_BUILDLINK3_MK)
 ISC_DHCP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.isc-dhcp+=	isc-dhcp>=4.1.0
+BUILDLINK_API_DEPENDS.isc-dhcp+=	isc-dhcp>=4.3.0
 BUILDLINK_PKGSRCDIR.isc-dhcp?=	../../net/isc-dhcp4
 .endif # ISC_DHCP_BUILDLINK3_MK
 
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index f222bf19b50..8c62d23669e 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.25 2016/03/30 15:55:44 taca Exp $
+$NetBSD: distinfo,v 1.26 2017/08/13 14:21:03 taca Exp $
 
-SHA1 (dhcp-4.3.4.tar.gz) = eedd50d32c9ceb8b9feb414c84322a09d26f214b
-RMD160 (dhcp-4.3.4.tar.gz) = f8b6d47e9c69d763f48919a58648c31880c2693d
-SHA512 (dhcp-4.3.4.tar.gz) = 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
-Size (dhcp-4.3.4.tar.gz) = 9302513 bytes
+SHA1 (dhcp-4.3.6.tar.gz) = fb0417530e49368fe032cd9722f51c74f93180ac
+RMD160 (dhcp-4.3.6.tar.gz) = b80936239858a373bfb9bf2a362688a04db546ad
+SHA512 (dhcp-4.3.6.tar.gz) = de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
+Size (dhcp-4.3.6.tar.gz) = 10182593 bytes
 SHA1 (patch-aa) = da090b3b824f5d437f8d05ce00e2ac4dfc65d6af
 SHA1 (patch-ab) = 0683dd2259e48184713559aa0356ee352aa52c39
 SHA1 (patch-ac) = a7e6808a6e1e93c520eb085f31259f6c142750f4
-SHA1 (patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in) = ca3bf66f9ee3ac6a9636dcdd77439515a0e902d4
 SHA1 (patch-common_dlpi.c) = 14cb1c1aed610b1d6952b26a7775caa06b6a8792
-SHA1 (patch-includes_Makefile.in) = f595803acd49223766e0f8d5354eff73a5ed9cb8
diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in b/net/isc-dhcp4/patches/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in
deleted file mode 100644
index 5aa2592ea86..00000000000
--- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in,v 1.1 2016/03/30 15:55:44 taca Exp $
-
-Build gen with BUILD_CC and the associated BUILD_* flags so it can run
-on the build platform when cross-compiling.
-
---- bind/bind-9.9.8-P4/lib/export/dns/Makefile.in.orig	2016-02-29 00:30:52.000000000 +0000
-+++ bind/bind-9.9.8-P4/lib/export/dns/Makefile.in
-@@ -168,7 +168,8 @@ code.h:	gen
- 	./gen -s ${srcdir} > code.h
- 
- gen: ${srcdir}/gen.c
--	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
-+	${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
- 
- #We don't need rbtdb64 for this library
- #rbtdb64.@O@: rbtdb.c
diff --git a/net/isc-dhcp4/patches/patch-includes_Makefile.in b/net/isc-dhcp4/patches/patch-includes_Makefile.in
deleted file mode 100644
index a883ce7e8e9..00000000000
--- a/net/isc-dhcp4/patches/patch-includes_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-includes_Makefile.in,v 1.4 2015/09/27 06:58:11 taca Exp $
-
-Don't need isc-dhcp/dst.h.
-
---- includes/Makefile.in.orig	2015-08-26 19:13:14.000000000 +0000
-+++ includes/Makefile.in
-@@ -265,8 +265,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
- 			 omapip/hash.h omapip/isclib.h omapip/omapip.h \
--			 omapip/omapip_p.h omapip/result.h omapip/trace.h \
--			 isc-dhcp/dst.h
-+			 omapip/omapip_p.h omapip/result.h omapip/trace.h
- 
- EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
- 	     heap.h inet.h minires.h osdep.h site.h statement.h tree.h \