X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fdhcpcd;h=d7372ea8273c61b9ee1ddf02c452587a37788c2a;hp=701d3f5a7646623b6e475235ccf8f0062239a050;hb=941a3dec4e69e5081d76682e635cdf47be51af1c;hpb=1393a0c8f8ffba8d00184ce810c9c1f916f0e132

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 701d3f5a76..d7372ea827 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,10 +24,10 @@
 
 include Config
 
-VER        = 2.0.8
+VER        = 7.1.1
 
 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)
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ec91c33b6d9cb46a42f9564e573fd249
+$(DL_FILE)_MD5 = adc0a949cb718b455d81deea9ba2875f
 
 install : $(TARGET)
 
@@ -71,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)