Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / lfs / dhcpcd

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 89ab92ea19b3667635bc73f3786c227ac49e46c0..e843b9a75cb6ba864c4f458ba77eda77b14621f5 100644 (file)
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -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 = 6f69c3c9d3b36666078c4aba25e650ab
+$(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)