* dhcp: version bump to 4.1.0

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10603 33e552b5-05e3-0310-8538-816dae2090ed

3 files changed, 36 insertions, 64 deletions

diff --git a/patches/dhcp-4.1.0/generic/series b/patches/dhcp-4.1.0/generic/series
new file mode 100644
index 00000000..bb6466c0
--- /dev/null
+++ b/patches/dhcp-4.1.0/generic/series
@@ -0,0 +1 @@
+skip_bash.diff -p0
diff --git a/patches/dhcp-4.1.0/generic/skip_bash.diff b/patches/dhcp-4.1.0/generic/skip_bash.diff
new file mode 100644
index 00000000..77b0e8c0
--- /dev/null
+++ b/patches/dhcp-4.1.0/generic/skip_bash.diff
@@ -0,0 +1,18 @@
+From: Wolfram Sang <w.sang@pengutronix.de>
+Subject: Make script work with /bin/sh
+
+Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
+---
+ client/scripts/linux |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: client/scripts/linux
+===================================================================
+--- client/scripts/linux.orig
++++ client/scripts/linux
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # dhclient-script for Linux. Dan Halbert, March, 1997.
+ # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+ # No guarantees about this. I'm a novice at the details of Linux
diff --git a/rules/dhcp.make b/rules/dhcp.make
index 06907b65..6c3751c6 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -2,6 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
+# Copyright (C) 2009 by Wolfram Sang, Pengutronix
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -17,89 +18,40 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp
 #
 # Paths and names
 #
-DHCP_VERSION	= 3.0.5
+DHCP_VERSION	= 4.1.0
 DHCP		= dhcp-$(DHCP_VERSION)
 DHCP_SUFFIX	= tar.gz
-DHCP_URL	= ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/$(DHCP).$(DHCP_SUFFIX)
+DHCP_URL	= http://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) \
+		  http://ftp.isc.org/isc/dhcp/dhcp-4.1-history/$(DHCP).$(DHCP_SUFFIX)
 DHCP_SOURCE	= $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX)
 DHCP_DIR	= $(BUILDDIR)/$(DHCP)
 
-
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-dhcp_get: $(STATEDIR)/dhcp.get
-
-$(STATEDIR)/dhcp.get: $(dhcp_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(DHCP_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, DHCP)
 
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-dhcp_extract: $(STATEDIR)/dhcp.extract
-
-$(STATEDIR)/dhcp.extract: $(dhcp_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(DHCP_DIR))
-	@$(call extract, DHCP)
-	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-dhcp_prepare: $(STATEDIR)/dhcp.prepare
-
-DHCP_PATH	=  PATH=$(CROSS_PATH)
-DHCP_ENV 	=  $(CROSS_ENV)
-#DHCP_ENV	+=
-
-# linux-2.2 is the way to go ;-)
-
-$(STATEDIR)/dhcp.prepare: $(dhcp_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(DHCP_DIR)/config.cache)
-	cd $(DHCP_DIR) && \
-		$(DHCP_PATH) $(DHCP_ENV) \
-		./configure "linux-2.2"
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-dhcp_compile: $(STATEDIR)/dhcp.compile
-
-$(STATEDIR)/dhcp.compile: $(dhcp_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(DHCP_DIR) && $(DHCP_PATH) $(DHCP_ENV) make
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-dhcp_install: $(STATEDIR)/dhcp.install
-
-$(STATEDIR)/dhcp.install: $(dhcp_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, DHCP)
-	@$(call touch, $@)
+DHCP_PATH	:= PATH=$(CROSS_PATH)
+DHCP_ENV 	:= $(CROSS_ENV) \
+		   ac_cv_file__dev_random=yes
+DHCP_AUTOCONF	:= $(CROSS_AUTOCONF_USR) \
+		   --disable-dhcpv6
+#                   ^ sorry bbu ;)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-dhcp_targetinstall: $(STATEDIR)/dhcp.targetinstall
+$(STATEDIR)/dhcp.targetinstall:
 
-$(STATEDIR)/dhcp.targetinstall: $(dhcp_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init, dhcp)
@@ -113,12 +65,12 @@ $(STATEDIR)/dhcp.targetinstall: $(dhcp_targetinstall_deps_default)
 
 ifdef PTXCONF_DHCP_SERVER
 	@$(call install_copy, dhcp, 0, 0, 0755, \
-		$(DHCP_DIR)/work.linux-2.2/server/dhcpd, /sbin/dhcpd)
+		$(DHCP_DIR)/server/dhcpd, /sbin/dhcpd)
 endif
 
 ifdef PTXCONF_DHCP_CLIENT
 	@$(call install_copy, dhcp, 0, 0, 0755, \
-		$(DHCP_DIR)/work.linux-2.2/client/dhclient, /sbin/dhclient)
+		$(DHCP_DIR)/client/dhclient, /sbin/dhclient)
 	@$(call install_copy, dhcp, 0, 0, 0755, /var/state/dhcp )
 
 ifdef PTXCONF_DHCP_CLIENT_CONFIG_DEFAULT
@@ -130,12 +82,13 @@ ifdef PTXCONF_DHCP_CLIENT_CONFIG_USER
 		${PTXDIST_WORKSPACE}/projectroot/etc/dhclient.conf, \
 		/etc/dhclient.conf, n)
 endif
+	@$(call install_copy, dhcp, 0, 0, 0755, /var/db)
 	@$(call install_copy, dhcp, 0, 0, 0755, \
-		$(DHCP_DIR)/client/scripts/linux, /sbin/dhclient-script, n)
+		$(DHCP_DIR)/client/scripts/linux, /etc/dhclient-script, n)
 endif
 
 ifdef PTXCONF_DHCP_RELAY
-	@$(call install_copy, dhcp, 0, 0, 0755, $(DHCP_DIR)/work.linux-2.2/relay/dhcrelay, /sbin/dhcrelay)
+	@$(call install_copy, dhcp, 0, 0, 0755, $(DHCP_DIR)/relay/dhcrelay, /sbin/dhcrelay)
 endif
 
 	@$(call install_finish, dhcp)