X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fdhcpcd;h=e843b9a75cb6ba864c4f458ba77eda77b14621f5;hb=ff3839256462330a198008b7b69e3565b6e300b9;hp=98d8080adc64d9c5e3e3e7650b822297c4b7838f;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 98d8080adc..e843b9a75c 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.8
+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,19 @@ $(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
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)