dhcpcd: Update to 7.0.8

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

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 89ab92ea19b3667635bc73f3786c227ac49e46c0..9f3f5fbb6ef7ede6efcb04ea638f763c723cb7a5 100644 (file)
--- 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) 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,10 +24,10 @@
 
 include Config
 
-VER        = 3.1.7
+VER        = 7.0.8
 
 THISAPP    = dhcpcd-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6f69c3c9d3b36666078c4aba25e650ab
+$(DL_FILE)_MD5 = 77bbb1d73b6f30d6ddcc8b0fd3eae266
 
 install : $(TARGET)
 
@@ -69,11 +69,28 @@ $(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
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix="" --sysconfdir=/var/ipfire/dhcpc \
+                       --dbdir=/var/ipfire/dhcpc \
+                       --libexecdir=/var/ipfire/dhcpc \
+                       --mandir=/usr/share/man
        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
+
+       rm -rf /usr/share/dhcpcd
+
+       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)