X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fdhcpcd;h=3b9a094ce17876d20449cbcf319831f682ebd4df;hb=c63136978fefd00e61a4704a7082aeb12771dee8;hp=98d8080adc64d9c5e3e3e7650b822297c4b7838f;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=ipfire-2.x.git

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 98d8080adc..3b9a094ce1 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  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        = 2.0.8
+VER        = 6.7.1
 
 THISAPP    = dhcpcd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ec91c33b6d9cb46a42f9564e573fd249
+$(DL_FILE)_MD5 = ffb716b0e9327968e7200d519e1d4c0d
 
 install : $(TARGET)
 
@@ -70,10 +70,25 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=$(CONFIG_ROOT) \
-				 --mandir=/usr/share/man --disable-nls
+	cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \
+			--dbdir=/var/ipfire/dhcpc \
+			--libexecdir=/var/ipfire/dhcpc \
+			--mandir=/usr/share/man --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	ln -sf /etc/rc.d/init.d/networking/dhcpcd.exe $(CONFIG_ROOT)/dhcpc/dhcpcd.exe
+
+	ln -sf /etc/rc.d/init.d/networking/dhcpcd.exe \
+		$(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/70-dhcpcd.exe
+	rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/20-resolv.conf
+	rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-dhcpcd-compat
+	rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-ntp.conf
+	rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-yp.conf
+	rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-ypbind
+
+	install -m 644 $(DIR_SRC)/config/dhcpc/dhcpcd.conf $(CONFIG_ROOT)/dhcpc/
+	install -m 444 $(DIR_SRC)/config/dhcpc/dhcpcd-hooks/10-mtu $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks
+
+	chown root:root $(CONFIG_ROOT)/dhcpc/dhcpcd.conf
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)