X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fdhcpcd;h=f7a8c361c6f5ce495d37f8368211ddd45c079fc2;hp=cc548bb06a161d850b39636e9e097d17c79a1dd3;hb=3e1145e1a0b1a08bf61d6c4962eeae48e3d0c355;hpb=c268e9f208b25f84a5ef5be0b90841f2166581ae

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index cc548bb06a..f7a8c361c6 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) 2012  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.7
+VER        = 5.2.9
 
 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 = aabe4a3c1f23c55f2c99a416c9085de9
 
 install : $(TARGET)
 
@@ -70,10 +70,22 @@ $(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
+
+	sed -i -e "s|-ge 576|-gt 576|g" $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/10-mtu
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)