Update isc-dhcp4 to 4.3.4, including security fixes.

	This is the release of ISC DHCP 4.3.4, a maintenance
	release which contains a number of bug fixes and two
	fixes for previously released security issues.

Full changes are too many to write here, please refer
<https://kb.isc.org/article/AA-01364/0/DHCP-4.3.4-Release-Notes.html>.

5 files changed, 17 insertions, 51 deletions

diff --git a/net/isc-dhcp4/Makefile.common b/net/isc-dhcp4/Makefile.common
index c24e6f84027..84c57e16fdb 100644
--- a/net/isc-dhcp4/Makefile.common
+++ b/net/isc-dhcp4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2016/03/05 11:29:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.31 2016/03/30 15:55:44 taca Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -7,7 +7,6 @@
 
 DISTNAME=		dhcp-${VERSION}
 DHVER=			${DISTNAME:S/dhcp-//:S/-P/p/}
-PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \
 			http://ftp.isc.org/isc/dhcp/${VERSION}/
@@ -18,7 +17,7 @@ LICENSE=		isc
 
 CONFLICTS+=		isc-dhcp-base-3.*{,nb*}
 
-VERSION=		4.3.3-P1
+VERSION=		4.3.4
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -83,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.7-P3
+BIND_WRKSRC=		${WRKSRC}/bind/bind-9.9.8-P4
 
 post-configure:
 	${RUN}${_ULIMIT_CMD}					\
diff --git a/net/isc-dhcp4/distinfo b/net/isc-dhcp4/distinfo
index 16497f71114..f222bf19b50 100644
--- a/net/isc-dhcp4/distinfo
+++ b/net/isc-dhcp4/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.24 2016/01/22 12:06:40 jperkin Exp $
+$NetBSD: distinfo,v 1.25 2016/03/30 15:55:44 taca Exp $
 
-SHA1 (dhcp-4.3.3-P1.tar.gz) = 4e76757a0aebcb9200c1d2ca0f28ff41a5c56586
-RMD160 (dhcp-4.3.3-P1.tar.gz) = 97d7b10ef1e86c938cc25660048b90165301cd9d
-SHA512 (dhcp-4.3.3-P1.tar.gz) = 7e14268b4acaa82c807af9d956f76f4327a9a75d36273a244fef74dbd54e7506e8b38ce6035e56f61ab09a19bfc0a40599f76c89dc342514f1048b5ac3b2a0eb
-Size (dhcp-4.3.3-P1.tar.gz) = 9204043 bytes
+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 (patch-aa) = da090b3b824f5d437f8d05ce00e2ac4dfc65d6af
 SHA1 (patch-ab) = 0683dd2259e48184713559aa0356ee352aa52c39
 SHA1 (patch-ac) = a7e6808a6e1e93c520eb085f31259f6c142750f4
-SHA1 (patch-bind_bind-9.9.7-P3_configure) = 78e631a2e7b3a310ebef09b69af837f3a0d3e4f3
-SHA1 (patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in) = 6a6fce1a6518821bd1033c31e368f02829c4de39
-SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc
+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.7-P3_configure b/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_configure
deleted file mode 100644
index 91c247937cd..00000000000
--- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bind_bind-9.9.7-P3_configure,v 1.1 2015/09/27 06:58:11 taca Exp $
-
-* Avoid using "==" for argument of test(1).
-
---- bind/bind-9.9.7-P3/configure.orig	2015-08-15 00:29:09.000000000 +0000
-+++ bind/bind-9.9.7-P3/configure
-@@ -11691,7 +11691,7 @@ fi
-   test -n "$PYTHON" && break
- done
- 
--				if test "X$PYTHON" == "X"; then
-+				if test "X$PYTHON" = "X"; then
- 					continue;
- 				fi
- 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5
-@@ -11706,7 +11706,7 @@ $as_echo "not found" >&6; }
- 				unset ac_cv_path_PYTHON
- 				unset PYTHON
- 			done
--			if test "X$PYTHON" == "X"
-+			if test "X$PYTHON" = "X"
- 			then
- 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5
- $as_echo_n "checking for python support... " >&6; }
diff --git a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in b/net/isc-dhcp4/patches/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in
index 60441f900cf..5aa2592ea86 100644
--- a/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in
+++ b/net/isc-dhcp4/patches/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in,v 1.1 2015/09/27 06:58:11 taca Exp $
+$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.7-P3/lib/export/dns/Makefile.in.orig	2015-08-15 00:29:09.000000000 +0000
-+++ bind/bind-9.9.7-P3/lib/export/dns/Makefile.in
+--- 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
  
diff --git a/net/isc-dhcp4/patches/patch-common_dlpi.c b/net/isc-dhcp4/patches/patch-common_dlpi.c
index 88a8ce8c7f0..459e2c1cfb4 100644
--- a/net/isc-dhcp4/patches/patch-common_dlpi.c
+++ b/net/isc-dhcp4/patches/patch-common_dlpi.c
@@ -1,18 +1,10 @@
-$NetBSD: patch-common_dlpi.c,v 1.2 2014/02/09 04:34:31 taca Exp $
+$NetBSD: patch-common_dlpi.c,v 1.3 2016/03/30 15:55:44 taca Exp $
 
 Add support for Crossbow style NICs (SunOS).
 
---- common/dlpi.c.orig	2014-01-31 19:19:59.000000000 +0000
+--- common/dlpi.c.orig	2016-03-22 13:16:51.000000000 +0000
 +++ common/dlpi.c
-@@ -131,6 +131,7 @@ static int strioctl (int fd, int cmd, in
- #define DLPI_MAXDLBUF		8192	/* Buffer size */
- #define DLPI_MAXDLADDR		1024	/* Max address size */
- #define DLPI_DEVDIR		"/dev/"	/* Device directory */
-+#define DLPI_DEVDIR_NEW		"/dev/net/"	/* Crossbow Device directory */
- 
- static int dlpiopen(const char *ifname);
- static int dlpiunit (char *ifname);
-@@ -773,14 +774,26 @@ static int dlpiunit (ifname)
+@@ -778,14 +778,26 @@ static int dlpiunit (ifname)
   */
  static int
  dlpiopen(const char *ifname) {
@@ -30,7 +22,7 @@ Add support for Crossbow style NICs (SunOS).
 +	if (ifname[0] == '/') {
 +		fd = open (ifname, O_RDWR, 0);
 +	} else {
-+		snprintf(devname, MAXPATHLEN, "%s%s", DLPI_DEVDIR_NEW, ifname);
++		snprintf(devname, MAXPATHLEN, "%s%s", DLPI_DEVDIR, ifname);
 +		fd = open (devname, O_RDWR, 0);
 +	}
 +	if (fd != -1 || errno != ENOENT) {