Index: head/net/isc-dhcp43-server/Makefile =================================================================== --- head/net/isc-dhcp43-server/Makefile (revision 399077) +++ head/net/isc-dhcp43-server/Makefile (revision 399078) @@ -1,181 +1,181 @@ # Created by: Ryan Steinmetz # $FreeBSD$ PORTNAME= dhcp -DISTVERSION= 4.3.2 +DISTVERSION= 4.3.3 PORTREVISION= ${DHCP_PORTREVISION} CATEGORIES= net MASTER_SITES= ISC/${PORTNAME}/${DISTVERSION} PKGNAMEPREFIX= isc- PKGNAMESUFFIX= 43-${SUBSYS} #DISTNAME= ${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} MAINTAINER= zi@FreeBSD.org COMMENT?= ISC Dynamic Host Configuration Protocol server LICENSE= ISCL USES= gmake #PATCHLEVEL= P1 -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 0 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 SUBSYS?= server #WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT=IPV6 .if ${SUBSYS} == server OPTIONS_DEFINE+= PARANOIA LDAP LDAP_SSL BIND_SYMBOLS OPTIONS_DEFAULT+= PARANOIA LDAP_SSL PARANOIA_DESC= Enable support for chroot LDAP_SSL_DESC= Support LDAP over SSL/TLS BIND_SYMBOLS_DESC= Enable BIND internal symbol table .endif # PORTREVISION and CONFLICTS handling .if ${SUBSYS} == client CONFLICTS= isc-dhcp3?-client-[0-9]* isc-dhcp4[12]-client-[0-9]* DHCP_PORTREVISION= ${PORTREVISION_CLIENT} .elif ${SUBSYS} == relay CONFLICTS= isc-dhcp3?-relay-[0-9]* isc-dhcp4[12]-relay-[0-9]* DHCP_PORTREVISION= ${PORTREVISION_RELAY} .else CONFLICTS= isc-dhcp3?-server-[0-9]* isc-dhcp4[12]-server-[0-9]* DHCP_PORTREVISION= ${PORTREVISION_SERVER} MAKE_JOBS_UNSAFE= yes .endif .if ${SUBSYS} == server USERS= dhcpd GROUPS= dhcpd .endif MAN_COMPRESSED= no GNU_CONFIGURE= yes CPPFLAGS+= -D_PATH_DHCLIENT_SCRIPT='\"${PREFIX}/sbin/dhclient-script\"' -D_PATH_DHCLIENT_CONF='\"${PREFIX}/etc/dhclient.conf\"' -D_PATH_DHCPD_CONF='\"${PREFIX}/etc/dhcpd.conf\"' SCRIPTS_ENV+= PKG_PREFIX=${PREFIX} .include .if ${SUBSYS} == server CONFIGURE_ARGS+=--localstatedir=/var CFLAGS+= -fPIC .endif DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist .if ${SUBSYS} == server USE_RC_SUBR= isc-dhcpd .elif ${SUBSYS} == relay USE_RC_SUBR= isc-dhcrelay .endif SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} DATADIR= /var/db MSG_FILE= ${.CURDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_SUB= PREFIX="${PREFIX}" PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ DOCSDIR="${DOCSDIR}" .if ${PORT_OPTIONS:MPARANOIA} CONFIGURE_ARGS+=--enable-paranoia --enable-early-chroot SUB_LIST+= PARANOIA="yes" .else 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="" USES+= shebangfix SHEBANG_FILES= contrib/ldap/dhcpd-conf-to-ldap .else PLIST_SUB+= LDAP="@comment " .endif .if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ldapcrypto LIBS+= -lssl .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+=--enable-dhcpv6 PLIST_SUB+= IPV6="" .else CONFIGURE_ARGS+=--disable-dhcpv6 PLIST_SUB+= IPV6="@comment " .endif .if ${PORT_OPTIONS:MBIND_SYMBOLS} USES+= perl5 .else EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-bind__Makefile .endif post-patch: @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${MSG_FILE} > ${PKGMESSAGE} @${REINPLACE_CMD} -e 's|/usr/local||g' \ ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/client/dhclient.conf.example 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 ${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${STAGEDIR}${PREFIX}/include ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.example ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample .if ${PORT_OPTIONS:MIPV6} ${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \ ${STAGEDIR}${PREFIX}/etc/dhcpd6.conf.sample .endif .if ${PORT_OPTIONS:MLDAP} @${MKDIR} ${STAGEDIR}${SCHEMA_DIR} ${INSTALL_DATA} ${LDAP_SCHEMA} ${STAGEDIR}${SCHEMA_DIR} ${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MLDAP} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${LDAP_README} ${STAGEDIR}${DOCSDIR} .endif .endif post-install: .if ${SUBSYS} == client ${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${STAGEDIR}${PREFIX}/sbin/dhclient-script .elif ${SUBSYS} == server .if ${PORT_OPTIONS:MIPV6} @${LN} -sf isc-dhcpd ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcpd6 .endif .elif ${SUBSYS} == relay .if ${PORT_OPTIONS:MIPV6} @${LN} -sf isc-dhcrelay ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcrelay6 .endif .endif @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${MSG_FILE} > ${PKGMESSAGE} .include Index: head/net/isc-dhcp43-server/distinfo =================================================================== --- head/net/isc-dhcp43-server/distinfo (revision 399077) +++ head/net/isc-dhcp43-server/distinfo (revision 399078) @@ -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 Index: head/net/isc-dhcp43-server/files/patch-server_confpars.c =================================================================== --- head/net/isc-dhcp43-server/files/patch-server_confpars.c (revision 399077) +++ head/net/isc-dhcp43-server/files/patch-server_confpars.c (nonexistent) @@ -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"); Property changes on: head/net/isc-dhcp43-server/files/patch-server_confpars.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile =================================================================== --- head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile (revision 399077) +++ head/net/isc-dhcp43-server/files/extra-patch-bind__Makefile (revision 399078) @@ -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 \ Index: head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example =================================================================== --- head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example (revision 399077) +++ head/net/isc-dhcp43-server/files/patch-client__dhclient.conf.example (revision 399078) @@ -1,11 +1,11 @@ ---- ./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; -script "/etc/dhclient-script"; +script "%%PREFIX%%/sbin/dhclient-script"; media "-link0 -link1 -link2", "link0 link1"; reject 192.33.137.209; Index: head/net/isc-dhcp43-server/pkg-plist =================================================================== --- head/net/isc-dhcp43-server/pkg-plist (revision 399077) +++ head/net/isc-dhcp43-server/pkg-plist (revision 399078) @@ -1,30 +1,29 @@ @unexec echo "You should stop the dhcpd and dhcpd6 daemons if you are permanently removing this port." @sample etc/dhcpd.conf.sample %%IPV6%%@sample etc/dhcpd6.conf.sample %%IPV6%%etc/rc.d/isc-dhcpd6 sbin/dhcpd bin/omshell %%LDAP%%bin/dhcpd-conf-to-ldap man/man1/omshell.1.gz man/man3/dhcpctl.3.gz man/man3/omapi.3.gz man/man5/dhcpd.conf.5.gz man/man5/dhcpd.leases.5.gz man/man5/dhcp-eval.5.gz man/man5/dhcp-options.5.gz man/man8/dhcpd.8.gz include/dhcpctl.h include/isc-dhcp/dst.h include/omapip/alloc.h include/omapip/buffer.h include/omapip/omapip.h include/omapip/omapip_p.h include/omapip/hash.h include/omapip/trace.h include/omapip/convert.h include/omapip/isclib.h include/omapip/result.h lib/libdhcpctl.a lib/libomapi.a -lib/libdst.a %%LDAP%%%%SCHEMA_DIR%%/dhcp.schema