--- a/components/isc-dhcp/Makefile	Tue Jan 03 11:08:59 2012 -0800
+++ b/components/isc-dhcp/Makefile	Fri Jan 20 19:29:27 2012 +0000
@@ -18,16 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		dhcp
-COMPONENT_VERSION=	4.1
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-ESV-R3
+COMPONENT_VERSION=	4.1-ESV-R4
+IPS_COMPONENT_VERSION=	4.1.0.4
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:6fc5ad06b1192c76edb1a35980fcf070a393c075
-COMPONENT_ARCHIVE_URL=  http://ftp.isc.org/isc/dhcp/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  http://ftp.isc.org/isc/dhcp/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha1:2c05a978f5bcc47d9e2a9125ce51903144ebb940
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -39,7 +40,8 @@
 CONFIGURE_OPTIONS  +=	--sysconfdir=$(ETCDIR)/inet
 CONFIGURE_OPTIONS  +=	--sbindir=$(USRLIBDIR)/inet
 CONFIGURE_OPTIONS  +=	--bindir=$(USRSBINDIR)
-CONFIGURE_OPTIONS  +=	--enable-use-sockets --enable-ipv4-pktinfo
+CONFIGURE_OPTIONS  +=	--enable-use-sockets
+CONFIGURE_OPTIONS  +=	--enable-ipv4-pktinfo
 
 build:		$(BUILD_32)
 

--- a/components/isc-dhcp/dhcp.p5m	Tue Jan 03 11:08:59 2012 -0800
+++ b/components/isc-dhcp/dhcp.p5m	Fri Jan 20 19:29:27 2012 +0000
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -90,7 +90,7 @@
     owner=dhcpserv preserve=true
 file dhcpd.leases path=var/db/isc-dhcp/dhcpd6.leases~ group=netadm mode=0644 \
     owner=dhcpserv preserve=true
-license LICENSE license="ISC BSD"
+license isc-dhcp.license license="ISC BSD"
 user username=dhcpserv ftpuser=false gcos-field="DHCP Configuration Admin" \
     group=netadm uid=18
 depend fmri=__TBD pkg.debug.depend.file=lib/svc/share/net_include.sh \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/isc-dhcp/isc-dhcp.license	Fri Jan 20 19:29:27 2012 +0000
@@ -0,0 +1,29 @@
+Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+
+-----------------------
+- ISC DHCP 4.1-ESV-R4 -
+-----------------------
+
+Oracle Internal Tracking Number : 6913
+
+# Copyright (c) 2004-2011 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
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#   Internet Systems Consortium, Inc.
+#   950 Charter Street
+#   Redwood City, CA 94063
+#   <[email protected]>
+#   https://www.isc.org/
+