4 files changed, 24 insertions, 42 deletions
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
deleted file mode 100644
index f58191e64..000000000
--- a/package/dhcp/Config.in
+++ /dev/null
@@ -1,24 +0,0 @@
-config ADK_COMPILE_DHCP
-	tristate
-	default n
-	depends on ADK_PACKAGE_DHCP_RELAY || ADK_PACKAGE_DHCP_SERVER
-
-config ADK_PACKAGE_DHCP_RELAY
-	prompt "dhcp-relay........................ ISC DHCP relay"
-	tristate
-	default n
-	select ADK_COMPILE_DHCP
-	help
-	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
-	  Protocol) relay daemon.
-	  http://www.isc.org/
-
-config ADK_PACKAGE_DHCP_SERVER
-	prompt "dhcp-server....................... ISC DHCP server"
-	tristate
-	default n
-	select ADK_COMPILE_DHCP
-	help
-	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
-	  Protocol) server daemon.
-	  http://www.isc.org/
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index 38cce03ce..1b12e3a5c 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -4,37 +4,32 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dhcp
-PKG_VERSION:=		4.1.0p1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		325ff8338c5a21f89d5304ac13ffebdf
+PKG_VERSION:=		4.1.1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		38a74c89d8913b9b5f33737047623c18
 PKG_DESCR:=		ISC DHCP server
 PKG_SECTION:=		net
 PKG_URL:=		https://www.isc.org/software/dhcp
 PKG_SITES:=		ftp://ftp.isc.org/isc/dhcp/
 
-PKG_DESCR_1:=		ISC DHCP relay server
+PKG_DESCR_RELAY:=	ISC DHCP relay server
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_RELAY},${PKG_SECTION}))
 
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_ARGS+=       --enable-dhcpv6         
-else
-CONFIGURE_ARGS+=       --disable-dhcpv6                
-endif
-
-TCFLAGS+=		-D_GNU_SOURCE
-CONFIGURE_STYLE:=	gnu
+#TCFLAGS+=		-D_GNU_SOURCE
 CONFIGURE_ENV+=		ac_cv_file__dev_random=yes
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay ${IDIR_DHCP_RELAY}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcrelay \
+		${IDIR_DHCP_RELAY}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd ${IDIR_DHCP_SERVER}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_DHCP_SERVER}/etc
+	${INSTALL_DATA} ./files/dhcpd.conf ${IDIR_DHCP_SERVER}/etc
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcpd \
+		${IDIR_DHCP_SERVER}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dhcp/files/dhcpd.conf b/package/dhcp/files/dhcpd.conf
new file mode 100644
index 000000000..1caf07048
--- /dev/null
+++ b/package/dhcp/files/dhcpd.conf
@@ -0,0 +1,11 @@
+# basic example configuration
+ddns-update-style none;
+option domain-name "example.org";
+option domain-name-servers ns1.example.org, ns2.example.org;
+default-lease-time 600;
+max-lease-time 7200;
+authoritative;
+
+subnet 192.168.0.0 netmask 255.255.255.0 {
+  range 192.168.0.10 192.168.0.20;
+}
diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init
index 6ba76df9f..acdfc501f 100644
--- a/package/dhcp/files/dhcpd.init
+++ b/package/dhcp/files/dhcpd.init
@@ -14,7 +14,7 @@ start)
 	dhcpd $dhcpd_flags
 	;;
 autostop|stop)
-	killall dhcpd
+	pkill dhcpd
 	;;
 restart)
 	sh $0 stop