7181717 Problem with network/dhcp_server
authorBen Chang <Benjamin.Chang@Oracle.COM>
Thu, 26 Jul 2012 10:31:22 -0700
changeset 933 fbf8e08af1f1
parent 932 a3abdb042ced
child 934 f44530931819
7181717 Problem with network/dhcp_server 7187034 ISC DHCP needs to be updated to 4.1-ESV-R6
components/isc-dhcp/Makefile
components/isc-dhcp/isc-dhcp.license
--- a/components/isc-dhcp/Makefile	Thu Jul 26 02:19:39 2012 -0700
+++ b/components/isc-dhcp/Makefile	Thu Jul 26 10:31:22 2012 -0700
@@ -23,14 +23,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		dhcp
-COMPONENT_VERSION=	4.1-ESV-R4-Oracle
-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_PROJECT_URL=	http://www.isc.org/software/dhcp/
-COMPONENT_ARCHIVE_URL=  http://ftp.isc.org/isc/dhcp/private/76c65da874a2be30/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  \
+    http://ftp.isc.org/isc/dhcp/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_ARCHIVE_HASH= \
-    sha256:3160ede07cab03d78545fe5a18531f83237b404e6fc432ae46655ba6fe4957f1
+    sha256:deb666a1ab02dd1375c0ebd237ce1fcb3e4d9e7be520d25ba25f1f40eb0ead9e
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -48,7 +49,7 @@
 
 # Disable message in omapip/errwarn.c.
 CPPFLAGS  +=	        -DNOMINUM
-CONFIGURE_OPTIONS  +=   CPPFLAGS="$(CPPFLAGS)" 
+CONFIGURE_OPTIONS  +=   CPPFLAGS="$(CPPFLAGS)"
 
 build:		$(BUILD_32)
 
--- a/components/isc-dhcp/isc-dhcp.license	Thu Jul 26 02:19:39 2012 -0700
+++ b/components/isc-dhcp/isc-dhcp.license	Thu Jul 26 10:31:22 2012 -0700
@@ -1,10 +1,10 @@
 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-2012 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium