# HG changeset patch
# User Ben Chang <Benjamin.Chang@Oracle.COM>
# Date 1343419220 25200
# Node ID 4938d2a9bf9f9fb0c471011c58e8c901b8b91396
# Parent  39e0e525b96116f693092d5d67793a97d4a8da80
7181717 Problem with network/dhcp_server
7187034 ISC DHCP needs to be updated to 4.1-ESV-R6

diff -r 39e0e525b961 -r 4938d2a9bf9f components/isc-dhcp/Makefile
--- a/components/isc-dhcp/Makefile	Fri Jul 27 12:20:51 2012 -0700
+++ b/components/isc-dhcp/Makefile	Fri Jul 27 13:00:20 2012 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		dhcp
-COMPONENT_VERSION=	4.1-ESV-R4
-IPS_COMPONENT_VERSION=	4.1.0.4
+COMPONENT_VERSION=	4.1-ESV-R6
+IPS_COMPONENT_VERSION=	4.1.0.6
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_URL=  http://ftp.isc.org/isc/dhcp/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
-COMPONENT_ARCHIVE_HASH= sha1:2c05a978f5bcc47d9e2a9125ce51903144ebb940
+COMPONENT_ARCHIVE_HASH= sha1:47884866e5ff90b9c47945629c5bbb355bc2163b
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -43,9 +43,10 @@
 CONFIGURE_OPTIONS  +=	--enable-use-sockets
 CONFIGURE_OPTIONS  +=	--enable-ipv4-pktinfo
 
+
 # Disable message in omapip/errwarn.c.
-CPPFLAGS  +=            -DNOMINUM
-CONFIGURE_OPTIONS  +=   CPPFLAGS="$(CPPFLAGS)"
+CPPFLAGS  +=		-DNOMINUM
+CONFIGURE_OPTIONS  +=	CPPFLAGS="$(CPPFLAGS)"
 
 build:		$(BUILD_32)
 
diff -r 39e0e525b961 -r 4938d2a9bf9f components/isc-dhcp/isc-dhcp.license
--- a/components/isc-dhcp/isc-dhcp.license	Fri Jul 27 12:20:51 2012 -0700
+++ b/components/isc-dhcp/isc-dhcp.license	Fri Jul 27 13:00:20 2012 -0700
@@ -1,12 +1,12 @@
 Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
 -----------------------
-- ISC DHCP 4.1-ESV-R4 -
+- ISC DHCP 4.1-ESV-R6 -
 -----------------------
 
-Oracle Internal Tracking Number : 6913
+Oracle Internal Tracking Number : 9835
 
-# Copyright (c) 2004-2011 by Internet Systems Consortium, Inc. ("ISC")
+# Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium
 #
 # Permission to use, copy, modify, and distribute this software for any