Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 840691381a5b9cb4bdcc0604bca58db1aa3ce479..f7a8c361c6f5ce495d37f8368211ddd45c079fc2 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) 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        = 5.1.3
+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 = f852090ad221b6331478f50fc1aa539e
+$(DL_FILE)_MD5 = aabe4a3c1f23c55f2c99a416c9085de9
 
 install : $(TARGET)
 
@@ -76,8 +76,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --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-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)