ports/169185: Update port: net/isc-dhcp41-server Upgrade to 4.1-ESV-R5

douglas at douglasthrift.net douglas at douglasthrift.net
Sun Jun 17 20:10:18 UTC 2012 

>Number:         169185
>Category:       ports
>Synopsis:       Update port: net/isc-dhcp41-server Upgrade to 4.1-ESV-R5
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 17 20:10:18 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD justonenight.douglasthrift.net 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #11: Sat Jun 16 11:44:28 PDT 2012 root at justonenight.douglasthrift.net:/usr/obj/usr/src/sys/FURTHERONUPTHEROAD amd64
>Description:
Upgraded to 4.1-ESV-R5 and converted to Options NG.

https://redports.org/buildarchive/20120616213248-15566/
https://redports.org/buildarchive/20120616213525-90656/
https://redports.org/buildarchive/20120616213610-30840/

>From the Release Notes:

Changes since 4.1-ESV-R4

- Fixed the code that checks if an address the server is planning
  to hand out is in a reserved range.  This would appear as
  the server being out of addresses in pools with particular ranges.
  [ISC-Bugs #26498]

- Tidy up the receive calls and eliminate the need for found_pkt.
  [ISC-Bugs #25066]

- Add support for Infiniband over sockets to the server and
  relay code.  We've tested this on Solaris and hope to expand
  support for Infiniband in the future.  This patch also corrects
  some issues we found in the socket code.
 [ISC-Bugs #24245]

- Add a compile time check for the presence of the noreturn attribute
  and use it for log_fatal if it's available.  This will help code
  checking programs to eliminate false positives.
  [ISC-Bugs #27539]

- Fixed many compilation problems ("set, but not used" warnings) for
  gcc 4.6 that may affect Ubuntu 11.10 users.
  [ISC-Bugs #27588]

- Remove outdated note in the description of the bootp keyword about the
  option not satisfying the requirement of failover peers for denying
  dynamic bootp clients.
  [ISC-bugs #28574]

- Multiple items to clean up IPv6 address processing.
  When processing an IA that we've seen check to see if the
  addresses are usable (not in use by somebody else) before
  handing it out.
  When reading in leases from the file discard expired addresses.
  When picking an address for a client include the IA ID in
  addition to the client ID to generally pick different addresses
  for different IAs.
  [ISC-Bugs #23138] [ISC-Bugs #27945] [ISC-Bugs #25586]
  [ISC-Bugs #27684]

- Remove unnecessary checks in the lease query code and clean up
  several compiler issues (some dereferences of NULL and treating
  an int as a boolean).
  [ISC-Bugs #26203]

- Fix the NA and PD allocation code to handle the case where a client
  provides a preference and the server doesn't have any addresses or
  prefixes available.  Previoulsy the server ignored the request with
  this patch it replies with a NoAddrsAvail or NoPrefixAvail response.
  By default the code performs according to the errata of August 2010
  for RFC 3315 section 17.2.2; to enable the previous style see the
  section on RFC3315_PRE_ERRATA_2010_08 in includes/site.h.  This option
  may be removed in the future.
  Thanks to Jiri Popelka at Red Hat for the patch.
  [ISC-Bugs #22676]

- Fix up some issues found by static analysis.
  A potential memory leak and NULL dereference in omapi.
  The use of a boolean test instead of a bitwise test in dst.
  [ISC-Bugs #28941]
>How-To-Repeat:
>Fix:
--- isc-dhcp41-server.2012-06-17T041117Z.diff begins here ---
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/Makefile isc-dhcp41-server/Makefile
--- /usr/ports/net/isc-dhcp41-server/Makefile	2012-04-18 10:55:18.000000000 -0700
+++ isc-dhcp41-server/Makefile	2012-06-16 14:18:14.000000000 -0700
@@ -21,22 +21,24 @@
 
 LICENSE=	ISCL
 
-PATCHLEVEL=	R4
-PORTREVISION_SERVER=	3
-PORTREVISION_CLIENT=	0
-PORTREVISION_RELAY=	3
+PATCHLEVEL=	R5
+PORTREVISION_SERVER=	4
+PORTREVISION_CLIENT=	1
+PORTREVISION_RELAY=	4
 
 SUBSYS?=	server
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
 
 UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-OPTIONS=	DHCP_IPV6 "Enable support for IPv6" on
+OPTIONS_DEFINE=	IPV6
+OPTIONS_DEFAULT=IPV6
 
 .if ${SUBSYS} == server
-OPTIONS+=	DHCP_PARANOIA "Enable support for chroot" on \
-		DHCP_LDAP "Experimental LDAP backend support" off \
-		DHCP_LDAP_SSL "Support LDAP connection over SSL/TLS" on
+OPTIONS_DEFINE+=	PARANOIA LDAP LDAP_SSL
+OPTIONS_DEFAULT+=	PARANOIA LDAP_SSL
+PARANOIA_DESC=	Enable support for chroot
+LDAP_SSL_DESC=	Support LDAP over SSL/TLS
 .endif
 
 # PORTREVISION and CONFLICTS handling
@@ -75,7 +77,7 @@
 MAN3=		dhcpctl.3 omapi.3
 CFLAGS+=	-fPIC
 CONF_FILE=	dhcpd.conf
-.if defined(WITH_DHCP_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONF_FILE+=	dhcpd6.conf
 .endif
 .else
@@ -103,7 +105,7 @@
 		DOCSDIR="${DOCSDIR}"
 
 # XXX: Have to hardcode 4.1.1 here as there is no release for 4.1.2 or later.
-.if defined(WITH_DHCP_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 MASTER_SITES+=		http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/:ldap
 LDAPPATCHRELEASE=	2
 LDAPPATCHDIST=		ldap-for-dhcp-4.1.1-${LDAPPATCHRELEASE}
@@ -125,7 +127,7 @@
 .endif
 
 # WITH_DHCP_LDAP_SSL without WITH_DHCP_LDAP is silly.
-.if defined(WITH_DHCP_LDAP_SSL) && defined (WITH_DHCP_LDAP)
+.if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ldapcrypto
 CONFIGURE_ENV+=	LIBS="-lssl"
@@ -133,14 +135,14 @@
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
 
-.if defined(WITH_DHCP_PARANOIA)
+.if ${PORT_OPTIONS:MPARANOIA}
 CONFIGURE_ARGS+=	--enable-paranoia --enable-early-chroot
 SUB_LIST+=	PARANOIA=yes
 .else
 SUB_LIST+=	PARANOIA=no
 .endif
 
-.if defined(WITH_DHCP_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-dhcpv6
 PLIST_SUB+=		IPV6=""
 .else
@@ -149,7 +151,7 @@
 .endif
 
 pre-patch:
-.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
+.if ${SUBSYS} == server && ${PORT_OPTIONS:MLDAP}
 	@${PATCH} ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE} ${FILESDIR}/extra-patch-${LDAPPATCHFILE}
 	@cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE}
 .endif
@@ -169,17 +171,17 @@
 	${MAKE} -C ${WRKSRC}/includes install
 	${MAKE} -C ${WRKSRC}/common install
 	${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include
-.if defined(WITH_DHCP_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
 		${PREFIX}/etc/dhcpd6.conf.sample
 .endif
 .endif
-.if defined(WITH_DHCP_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 	@${MKDIR} ${SCHEMA_DIR}
 	${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR}
 	${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${PREFIX}/bin
 .endif
-.if defined(WITH_DHCP_LDAP) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MLDAP} && !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/${LDAPPATCHDIST}/README.ldap   ${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/${LDAPPATCHDIST}/LICENSE.ldap  ${DOCSDIR}
@@ -196,17 +198,17 @@
 .if ${SUBSYS} == client
 	${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${PREFIX}/sbin/dhclient-script
 .elif ${SUBSYS} == server
-.if defined(WITH_DHCP_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcpd ${PREFIX}/etc/rc.d/isc-dhcpd6
 .endif
 .elif ${SUBSYS} == relay
-.if defined(WITH_DHCP_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcrelay ${PREFIX}/etc/rc.d/isc-dhcrelay6
 .endif
 .endif
 	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${MSG_FILE} > ${PKGMESSAGE}
-.if defined(WITH_DHCP_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 	@${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE}
 .else
 	@${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE}
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/distinfo isc-dhcp41-server/distinfo
--- /usr/ports/net/isc-dhcp41-server/distinfo	2011-12-07 15:45:50.000000000 -0800
+++ isc-dhcp41-server/distinfo	2012-06-16 13:54:16.662129131 -0700
@@ -1,4 +1,4 @@
-SHA256 (dhcp-4.1-ESV-R4.tar.gz) = 13b3c08695f0a663fe1e1b6af5ce8a4e052b3f4a291e404b463f5d2762e6000d
-SIZE (dhcp-4.1-ESV-R4.tar.gz) = 1114257
+SHA256 (dhcp-4.1-ESV-R5.tar.gz) = c028fd6f9c1fff38fd0ae21cc89a70912e0eb759ea1019fb25b145cf14527583
+SIZE (dhcp-4.1-ESV-R5.tar.gz) = 1120684
 SHA256 (ldap-for-dhcp-4.1.1-2.tar.gz) = 566b7be2ebefdc583d0bf0095c804ba69807b67e5cc29a2b64b1b39202b37d0d
 SIZE (ldap-for-dhcp-4.1.1-2.tar.gz) = 39004
--- isc-dhcp41-server.2012-06-17T041117Z.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list