Wed Mar 30 15:55:44 2016 UTC ()
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>.


(taca)
diff -r1.30 -r1.31 pkgsrc/net/isc-dhcp4/Makefile.common
diff -r1.24 -r1.25 pkgsrc/net/isc-dhcp4/distinfo
diff -r1.1 -r0 pkgsrc/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_configure
diff -r1.1 -r0 pkgsrc/net/isc-dhcp4/patches/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in
diff -r0 -r1.1 pkgsrc/net/isc-dhcp4/patches/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in
diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/patches/patch-common_dlpi.c
cvs diff -r1.30 -r1.31 pkgsrc/net/isc-dhcp4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/Makefile.common 2016/03/05 11:29:05 1.30
+++ pkgsrc/net/isc-dhcp4/Makefile.common 2016/03/30 15:55:44 1.31
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile.common,v 1.30 2016/03/05 11:29:05 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.31 2016/03/30 15:55:44 taca Exp $
2# 2#
3# used by net/isc-dhcp4/Makefile 3# used by net/isc-dhcp4/Makefile
4# used by net/isc-dhcpd4/Makefile 4# used by net/isc-dhcpd4/Makefile
5# used by net/isc-dhclient4/Makefile 5# used by net/isc-dhclient4/Makefile
6# used by net/isc-dhcrelay4/Makefile 6# used by net/isc-dhcrelay4/Makefile
7 7
8DISTNAME= dhcp-${VERSION} 8DISTNAME= dhcp-${VERSION}
9DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/} 9DHVER= ${DISTNAME:S/dhcp-//:S/-P/p/}
10PKGREVISION= 2 
11CATEGORIES= net 10CATEGORIES= net
12MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \ 11MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/${VERSION}/ \
13 http://ftp.isc.org/isc/dhcp/${VERSION}/ 12 http://ftp.isc.org/isc/dhcp/${VERSION}/
14 13
15MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= https://www.isc.org/sw/dhcp 15HOMEPAGE= https://www.isc.org/sw/dhcp
17LICENSE= isc 16LICENSE= isc
18 17
19CONFLICTS+= isc-dhcp-base-3.*{,nb*} 18CONFLICTS+= isc-dhcp-base-3.*{,nb*}
20 19
21VERSION= 4.3.3-P1 20VERSION= 4.3.4
22 21
23.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
24 23
25GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
26DHCP_HOME?= ${VARBASE}/db/isc-dhcp 25DHCP_HOME?= ${VARBASE}/db/isc-dhcp
27DHCP_PID?= ${VARBASE}/run/isc-dhcp 26DHCP_PID?= ${VARBASE}/run/isc-dhcp
28PKG_SYSCONFSUBDIR= dhcp 27PKG_SYSCONFSUBDIR= dhcp
29 28
30USE_TOOLS+= gmake gunzip gzip tar 29USE_TOOLS+= gmake gunzip gzip tar
31USE_LANGUAGES+= c c++ 30USE_LANGUAGES+= c c++
32 31
33PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches 32PATCHDIR= ${.CURDIR}/../isc-dhcp4/patches
34DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo 33DISTINFO_FILE= ${.CURDIR}/../isc-dhcp4/distinfo
@@ -73,25 +72,25 @@ post-extract: @@ -73,25 +72,25 @@ post-extract:
73 (cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -) 72 (cd ${WRKSRC}/bind && gunzip -c bind.tar.gz | tar xf -)
74 73
75BIND_CONFIGURE_ARGS+= --disable-kqueue 74BIND_CONFIGURE_ARGS+= --disable-kqueue
76BIND_CONFIGURE_ARGS+= --disable-epoll 75BIND_CONFIGURE_ARGS+= --disable-epoll
77BIND_CONFIGURE_ARGS+= --disable-devpoll 76BIND_CONFIGURE_ARGS+= --disable-devpoll
78BIND_CONFIGURE_ARGS+= --without-openssl 77BIND_CONFIGURE_ARGS+= --without-openssl
79BIND_CONFIGURE_ARGS+= --without-libxml2 78BIND_CONFIGURE_ARGS+= --without-libxml2
80BIND_CONFIGURE_ARGS+= --enable-exportlib 79BIND_CONFIGURE_ARGS+= --enable-exportlib
81BIND_CONFIGURE_ARGS+= --enable-threads=no 80BIND_CONFIGURE_ARGS+= --enable-threads=no
82BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include 81BIND_CONFIGURE_ARGS+= --with-export-includedir=${WRKSRC}/bind/include
83BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib 82BIND_CONFIGURE_ARGS+= --with-export-libdir=${WRKSRC}/bind/lib
84BIND_CONFIGURE_ARGS+= --with-gssapi=no 83BIND_CONFIGURE_ARGS+= --with-gssapi=no
85 84
86BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.7-P3 85BIND_WRKSRC= ${WRKSRC}/bind/bind-9.9.8-P4
87 86
88post-configure: 87post-configure:
89 ${RUN}${_ULIMIT_CMD} \ 88 ${RUN}${_ULIMIT_CMD} \
90 cd ${BIND_WRKSRC} && \ 89 cd ${BIND_WRKSRC} && \
91 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 90 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \
92 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 91 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
93 ${CONFIGURE_SCRIPT} \ 92 ${CONFIGURE_SCRIPT} \
94 ${CONFIGURE_ARGS} \ 93 ${CONFIGURE_ARGS} \
95 ${BIND_CONFIGURE_ARGS} 94 ${BIND_CONFIGURE_ARGS}
96 95
97.include "../../security/openssl/buildlink3.mk" 96.include "../../security/openssl/buildlink3.mk"
cvs diff -r1.24 -r1.25 pkgsrc/net/isc-dhcp4/distinfo (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/distinfo 2016/01/22 12:06:40 1.24
+++ pkgsrc/net/isc-dhcp4/distinfo 2016/03/30 15:55:44 1.25
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.24 2016/01/22 12:06:40 jperkin Exp $ 1$NetBSD: distinfo,v 1.25 2016/03/30 15:55:44 taca Exp $
2 2
3SHA1 (dhcp-4.3.3-P1.tar.gz) = 4e76757a0aebcb9200c1d2ca0f28ff41a5c56586 3SHA1 (dhcp-4.3.4.tar.gz) = eedd50d32c9ceb8b9feb414c84322a09d26f214b
4RMD160 (dhcp-4.3.3-P1.tar.gz) = 97d7b10ef1e86c938cc25660048b90165301cd9d 4RMD160 (dhcp-4.3.4.tar.gz) = f8b6d47e9c69d763f48919a58648c31880c2693d
5SHA512 (dhcp-4.3.3-P1.tar.gz) = 7e14268b4acaa82c807af9d956f76f4327a9a75d36273a244fef74dbd54e7506e8b38ce6035e56f61ab09a19bfc0a40599f76c89dc342514f1048b5ac3b2a0eb 5SHA512 (dhcp-4.3.4.tar.gz) = 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
6Size (dhcp-4.3.3-P1.tar.gz) = 9204043 bytes 6Size (dhcp-4.3.4.tar.gz) = 9302513 bytes
7SHA1 (patch-aa) = da090b3b824f5d437f8d05ce00e2ac4dfc65d6af 7SHA1 (patch-aa) = da090b3b824f5d437f8d05ce00e2ac4dfc65d6af
8SHA1 (patch-ab) = 0683dd2259e48184713559aa0356ee352aa52c39 8SHA1 (patch-ab) = 0683dd2259e48184713559aa0356ee352aa52c39
9SHA1 (patch-ac) = a7e6808a6e1e93c520eb085f31259f6c142750f4 9SHA1 (patch-ac) = a7e6808a6e1e93c520eb085f31259f6c142750f4
10SHA1 (patch-bind_bind-9.9.7-P3_configure) = 78e631a2e7b3a310ebef09b69af837f3a0d3e4f3 10SHA1 (patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in) = ca3bf66f9ee3ac6a9636dcdd77439515a0e902d4
11SHA1 (patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in) = 6a6fce1a6518821bd1033c31e368f02829c4de39 11SHA1 (patch-common_dlpi.c) = 14cb1c1aed610b1d6952b26a7775caa06b6a8792
12SHA1 (patch-common_dlpi.c) = 76e30ca92a7d3ba10ed73b4f03de0582bccb2acc 
13SHA1 (patch-includes_Makefile.in) = f595803acd49223766e0f8d5354eff73a5ed9cb8 12SHA1 (patch-includes_Makefile.in) = f595803acd49223766e0f8d5354eff73a5ed9cb8
File Deleted: pkgsrc/net/isc-dhcp4/patches/Attic/patch-bind_bind-9.9.7-P3_configure
File Deleted: pkgsrc/net/isc-dhcp4/patches/Attic/patch-bind_bind-9.9.7-P3_lib_export_dns_Makefile.in
File Added: pkgsrc/net/isc-dhcp4/patches/Attic/patch-bind_bind-9.9.8-P4_lib_export_dns_Makefile.in
$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
cvs diff -r1.2 -r1.3 pkgsrc/net/isc-dhcp4/patches/patch-common_dlpi.c (expand / switch to unified diff)

--- pkgsrc/net/isc-dhcp4/patches/patch-common_dlpi.c 2014/02/09 04:34:31 1.2
+++ pkgsrc/net/isc-dhcp4/patches/patch-common_dlpi.c 2016/03/30 15:55:44 1.3
@@ -1,42 +1,34 @@ @@ -1,42 +1,34 @@
1$NetBSD: patch-common_dlpi.c,v 1.2 2014/02/09 04:34:31 taca Exp $ 1$NetBSD: patch-common_dlpi.c,v 1.3 2016/03/30 15:55:44 taca Exp $
2 2
3Add support for Crossbow style NICs (SunOS). 3Add support for Crossbow style NICs (SunOS).
4 4
5--- common/dlpi.c.orig 2014-01-31 19:19:59.000000000 +0000 5--- common/dlpi.c.orig 2016-03-22 13:16:51.000000000 +0000
6+++ common/dlpi.c 6+++ common/dlpi.c
7@@ -131,6 +131,7 @@ static int strioctl (int fd, int cmd, in 7@@ -778,14 +778,26 @@ static int dlpiunit (ifname)
8 #define DLPI_MAXDLBUF 8192 /* Buffer size */ 
9 #define DLPI_MAXDLADDR 1024 /* Max address size */ 
10 #define DLPI_DEVDIR "/dev/" /* Device directory */ 
11+#define DLPI_DEVDIR_NEW "/dev/net/" /* Crossbow Device directory */ 
12  
13 static int dlpiopen(const char *ifname); 
14 static int dlpiunit (char *ifname); 
15@@ -773,14 +774,26 @@ static int dlpiunit (ifname) 
16 */ 8 */
17 static int 9 static int
18 dlpiopen(const char *ifname) { 10 dlpiopen(const char *ifname) {
19- char devname [50]; 11- char devname [50];
20+ char devname [MAXPATHLEN]; 12+ char devname [MAXPATHLEN];
21 char *dp; 13 char *dp;
22 const char *cp, *ep; 14 const char *cp, *ep;
23+ int fd; 15+ int fd;
24  16
25 if (!ifname) { 17 if (!ifname) {
26 return -1; 18 return -1;
27 } 19 }
28  20
29+ /* Try Crossbow Device Path */ 21+ /* Try Crossbow Device Path */
30+ if (ifname[0] == '/') { 22+ if (ifname[0] == '/') {
31+ fd = open (ifname, O_RDWR, 0); 23+ fd = open (ifname, O_RDWR, 0);
32+ } else { 24+ } else {
33+ snprintf(devname, MAXPATHLEN, "%s%s", DLPI_DEVDIR_NEW, ifname); 25+ snprintf(devname, MAXPATHLEN, "%s%s", DLPI_DEVDIR, ifname);
34+ fd = open (devname, O_RDWR, 0); 26+ fd = open (devname, O_RDWR, 0);
35+ } 27+ }
36+ if (fd != -1 || errno != ENOENT) { 28+ if (fd != -1 || errno != ENOENT) {
37+ return fd; 29+ return fd;
38+ } 30+ }
39+ 31+
40 /* Open a DLPI device */ 32 /* Open a DLPI device */
41 if (*ifname == '/') { 33 if (*ifname == '/') {
42 dp = devname; 34 dp = devname;