Merge pull request #835 from pyhalov/dhcp

Update ISC dhcp to 4.2.7
OpenIndiana · Oct 14, 2014 · 3061699 · 3061699
2 parents 3a33937 + 3d92ab9
commit 3061699
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/components/isc-dhcp/Makefile b/components/isc-dhcp/Makefile
@@ -23,24 +23,24 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		isc-dhcp
-COMPONENT_VERSION=	4.1-ESV-R7
-IPS_COMPONENT_VERSION=	4.1.0.7
+COMPONENT_VERSION=	4.2.7
+IPS_COMPONENT_VERSION=	4.2.7
 COMPONENT_SRC_NAME=	dhcp
 COMPONENT_SRC=		$(COMPONENT_SRC_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:25d579291a13ccce39c5dbb0e2f2ce8e974c82015bc4e3ee653cf95a4ed15ca4
+    sha256:dc5c15147721aae52e83e6d7305f05e70eff126f39f1ea11953fd812faa2b781
 COMPONENT_BUGDB=	service/dhcp-server
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-COMPONENT_PRE_CONFIGURE_ACTION = \
-	($(CLONEY) $(SOURCE_DIR) $(@D))
+CONFIGURE_SCRIPT	= $(@D)/configure
+COMPONENT_PRE_CONFIGURE_ACTION+=	$(CP) -R $(SOURCE_DIR)/* $(@D)/
 
 CONFIGURE_OPTIONS  +=	--sysconfdir=$(ETCDIR)/inet
 CONFIGURE_OPTIONS  +=	--sbindir=$(USRLIBDIR)/inet

diff --git a/components/isc-dhcp/dhcp.p5m b/components/isc-dhcp/dhcp.p5m
@@ -40,7 +40,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 # start method to create empty lease files if needed and is world
 # readable to allow any user scripts to parse the lease db files.
 dir path=var/db/isc-dhcp group=netadm mode=0755 owner=dhcpserv
-file server/dhcpd.conf path=etc/inet/dhcpd.conf.example group=sys
 file dhcp_auths path=etc/security/auth_attr.d/service%2Fnetwork%2Fisc-dhcp
 file isc-dhcp-relay.xml path=lib/svc/manifest/network/dhcp/isc-dhcp-relay.xml \
     group=sys mode=0444
@@ -50,6 +49,7 @@ file isc-dhcp-server.xml \
 file isc-dhcp path=lib/svc/method/isc-dhcp mode=0555
 file SmfDHCPStates.html path=usr/lib/help/auths/locale/SmfDHCPStates.html
 file SmfValueDHCP.html path=usr/lib/help/auths/locale/SmfValueDHCP.html
+file path=etc/inet/dhcpd.conf.example group=sys
 file path=usr/lib/inet/dhcpd
 file path=usr/lib/inet/dhcrelay
 file path=usr/sbin/omshell