X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fdhcp;h=5cf7e3545f8b31b37df7b52949e8cd19a68e4f1b;hb=addeeb1f79825fdf2e03c089d661686050b336d5;hp=235e825968d98a2b4f0583f78279fc55f3e06b39;hpb=51537b2aa8802586e6401785081b7f1fe6f39863;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/dhcp b/lfs/dhcp
index 235e825968..5cf7e3545f 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1-ESV-R3
+VER        = 4.4.1
 
 THISAPP    = dhcp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,6 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CFLAGS    += -fcommon
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = af3d8db60f62664f1d5538b81e406459
+$(DL_FILE)_MD5 = 18c7f4dcbb0a63df25098216d47b1ede
 
 install : $(TARGET)
 
@@ -70,11 +72,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp-3.1_linux3.patch
-	cd $(DIR_APP) && ./configure
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make LIBDIR=/usr/lib INCDIR=/usr/include install
+
+	# Extract bundled BIND
+	cd $(DIR_APP)/bind && tar xvfa bind.tar.gz
+
+	$(UPDATE_AUTOMAKE)
+
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--sysconfdir=/etc/dhcp \
+			--with-srv-conf-file=/etc/dhcp/dhcpd.conf \
+			--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
+			--enable-paranoia \
+			--enable-early-chroot \
+			--disable-dhcpv6
+
+	cd $(DIR_APP) && make #This package does not support parallel build
+	cd $(DIR_APP) && make install
+
+	mkdir -pv /var/state/dhcp
 	touch /var/state/dhcp/dhcpd.leases
-	ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf
+
+	ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)