- Update to 4.3.3

6 files changed, 20 insertions, 64 deletions

diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index a6c77dab76bb..5a9d95b3621d 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dhcp
-DISTVERSION=	4.3.2
+DISTVERSION=	4.3.3
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	ISC/${PORTNAME}/${DISTVERSION}
@@ -18,7 +18,7 @@ LICENSE=	ISCL
 USES=		gmake
 
 #PATCHLEVEL=	P1
-PORTREVISION_SERVER=	1
+PORTREVISION_SERVER=	0
 PORTREVISION_CLIENT=	0
 PORTREVISION_RELAY=	0
 
@@ -94,12 +94,12 @@ SUB_LIST+=	PARANOIA="no"
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=--with-ldap
+CONFIGURE_ARGS+=--with-ldap --with-ldapcrypto
 USE_OPENLDAP=	yes
 LDAP_SCRIPT=	${WRKSRC}/contrib/ldap/dhcpd-conf-to-ldap
 LDAP_SCHEMA=	${WRKSRC}/contrib/ldap/dhcp.schema
 LDAP_README=	${WRKSRC}/contrib/ldap/README.ldap
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LIBS+=		-L${LOCALBASE}/lib
 PORTDOCS+=	README.ldap
 PLIST_SUB+=	SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP=""
@@ -142,7 +142,7 @@ do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
 .if ${SUBSYS} == server
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dhcpctl install
-	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dst install
+#${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dst install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/omapip install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/includes install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/common install
diff --git a/net/isc-dhcp43-server/distinfo b/net/isc-dhcp43-server/distinfo
index 702220ac183b..b23633af15fc 100644
--- a/net/isc-dhcp43-server/distinfo
+++ b/net/isc-dhcp43-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dhcp-4.3.2.tar.gz) = 6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165
-SIZE (dhcp-4.3.2.tar.gz) = 9230340
+SHA256 (dhcp-4.3.3.tar.gz) = 553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede
+SIZE (dhcp-4.3.3.tar.gz) = 9205539
diff --git a/net/isc-dhcp43-server/files/extra-patch-bind__Makefile b/net/isc-dhcp43-server/files/extra-patch-bind__Makefile
index ac255945ec42..1706ebeca8ee 100644
--- a/net/isc-dhcp43-server/files/extra-patch-bind__Makefile
+++ b/net/isc-dhcp43-server/files/extra-patch-bind__Makefile
@@ -1,11 +1,11 @@
---- ./bind/Makefile.orig	2012-06-05 20:35:33.000000000 -0400
-+++ ./bind/Makefile	2012-06-05 20:35:41.000000000 -0400
-@@ -52,7 +52,7 @@
- 	else                                                       \
- 		echo Configuring BIND Export libraries for DHCP. ; \
- 		rm -rf ./lib ./include ./configure.log ./build.log ./install.log ; \
--		(cd ${bindsrcdir} && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log); \
-+		(cd ${bindsrcdir} && ./configure --disable-symtable --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log); \
- 	fi
+--- bind/Makefile.in.orig	2015-09-11 20:09:28 UTC
++++ bind/Makefile.in
+@@ -26,7 +26,7 @@ include ./bindvar.tmp
  
- # Build and install the export libraries
+ bindsrcdir=bind-${version}
+ 
+-bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \
++bindconfig = --disable-symtable --disable-kqueue --disable-epoll --disable-devpoll \
+ 	--without-openssl --without-libxml2 --enable-exportlib \
+ 	--with-gssapi=no --enable-threads=no @BINDCONFIG@ \
+ 	--with-export-includedir=${binddir}/include \
diff --git a/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example b/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example
index 3a5622eaff07..02bfcc2fe3bc 100644
--- a/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example
+++ b/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example
@@ -1,6 +1,6 @@
---- ./client/dhclient.conf.example.orig	2013-01-25 20:26:40.000000000 -0500
-+++ ./client/dhclient.conf.example	2013-01-25 20:26:53.000000000 -0500
-@@ -11,7 +11,7 @@
+--- client/dhclient.conf.example.orig	2015-09-11 20:11:21 UTC
++++ client/dhclient.conf.example
+@@ -11,7 +11,7 @@ retry 60;
  reboot 10;
  select-timeout 5;
  initial-interval 2;
diff --git a/net/isc-dhcp43-server/files/patch-server_confpars.c b/net/isc-dhcp43-server/files/patch-server_confpars.c
deleted file mode 100644
index c31526098ebc..000000000000
--- a/net/isc-dhcp43-server/files/patch-server_confpars.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- server/confpars.c.orig	2015-02-26 19:35:43 UTC
-+++ server/confpars.c
-@@ -4161,28 +4161,10 @@ parse_prefix6(struct parse *cfile,
- 		return;
- 	}
- 
--	/* Make sure starting prefix is within the subnet */
--	if (!addr_eq(group->subnet->net,
--		     subnet_number(lo, group->subnet->netmask))) {
--			      parse_warn(cfile, "prefix6 start prefix"
--                                                " is outside the subnet");
--			      skip_to_semi(cfile);
--		return;
--	}
--
- 	if (!parse_ip6_addr(cfile, &hi)) {
- 		return;
- 	}
- 
--	/* Make sure ending prefix is within the subnet */
--	if (!addr_eq(group->subnet->net,
--		     subnet_number(hi, group->subnet->netmask))) {
--			      parse_warn(cfile, "prefix6 end prefix"
--                                                " is outside the subnet");
--			      skip_to_semi(cfile);
--		return;
--	}
--
- 	/*
- 	 * Next is '/' number ';'.
- 	 */
-@@ -4205,11 +4187,6 @@ parse_prefix6(struct parse *cfile,
- 		parse_warn(cfile, "networks have 0 to 128 bits (exclusive)");
- 		return;
- 	}
--	if (bits < group->subnet->prefix_len) {
--		parse_warn(cfile, "network mask smaller than subnet mask");
--		skip_to_semi(cfile);
--		return;
--	}
- 	if (!is_cidr_mask_valid(&lo, bits) ||
- 	    !is_cidr_mask_valid(&hi, bits)) {
- 		parse_warn(cfile, "network mask too short");
diff --git a/net/isc-dhcp43-server/pkg-plist b/net/isc-dhcp43-server/pkg-plist
index e5551d9d3920..6de24fdf3294 100644
--- a/net/isc-dhcp43-server/pkg-plist
+++ b/net/isc-dhcp43-server/pkg-plist
@@ -26,5 +26,4 @@ include/omapip/isclib.h
 include/omapip/result.h
 lib/libdhcpctl.a
 lib/libomapi.a
-lib/libdst.a
 %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema