# HG changeset patch
# User tomas.jedlicka <tomas.jedlicka@oracle.com>
# Date 1348064831 25200
# Node ID 339360bfe9df05543395d352ead6d5a07964f3a0
# Parent  90ac9d91df0e1d65647e378b493d4beff6bcef8c
7196236 Problem with network/dhcp_server
7199185 Upgrade DHCP to 9.6-ESV-R7

diff -r 90ac9d91df0e -r 339360bfe9df components/isc-dhcp/Makefile
--- a/components/isc-dhcp/Makefile	Wed Sep 19 03:26:48 2012 -0700
+++ b/components/isc-dhcp/Makefile	Wed Sep 19 07:27:11 2012 -0700
@@ -23,15 +23,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		dhcp
-COMPONENT_VERSION=	4.1-ESV-R6
-IPS_COMPONENT_VERSION=	4.1.0.6
+COMPONENT_VERSION=	4.1-ESV-R7
+IPS_COMPONENT_VERSION=	4.1.0.7
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_PROJECT_URL=	http://www.isc.org/software/dhcp/
 COMPONENT_ARCHIVE_URL=  \
     http://ftp.isc.org/isc/dhcp/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_ARCHIVE_HASH= \
-    sha256:deb666a1ab02dd1375c0ebd237ce1fcb3e4d9e7be520d25ba25f1f40eb0ead9e
+    sha256:25d579291a13ccce39c5dbb0e2f2ce8e974c82015bc4e3ee653cf95a4ed15ca4
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
diff -r 90ac9d91df0e -r 339360bfe9df components/isc-dhcp/isc-dhcp.license
--- a/components/isc-dhcp/isc-dhcp.license	Wed Sep 19 03:26:48 2012 -0700
+++ b/components/isc-dhcp/isc-dhcp.license	Wed Sep 19 07:27:11 2012 -0700
@@ -1,10 +1,10 @@
 Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 
 -----------------------
-- ISC DHCP 4.1-ESV-R6 -
+- ISC DHCP 4.1-ESV-R7 -
 -----------------------
 
-Oracle Internal Tracking Number : 9835
+Oracle Internal Tracking Number: 10383
 
 # Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium