Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	config/rootfiles/packages/miniupnpd

diff --git a/config/rootfiles/common/dhcpcd b/config/rootfiles/common/dhcpcd
index 74a0f7acd6a0095fc15011c750ff5eb34b70571e..3f62fc65599fef4f031eb7d02c76e48d9a9b8e75 100644 (file)
--- a/config/rootfiles/common/dhcpcd
+++ b/config/rootfiles/common/dhcpcd
@@ -1,13 +1,13 @@
 sbin/dhcpcd
-#var/ipfire/dhcpc
+#usr/share/man/man5/dhcpcd.conf.5
+#usr/share/man/man8/dhcpcd-run-hooks.8
+#usr/share/man/man8/dhcpcd.8
 var/ipfire/dhcpc/dhcpcd-hooks
 #var/ipfire/dhcpc/dhcpcd-hooks/01-test
+#var/ipfire/dhcpc/dhcpcd-hooks/02-dump
 #var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
 #var/ipfire/dhcpc/dhcpcd-hooks/29-lookup-hostname
 #var/ipfire/dhcpc/dhcpcd-hooks/30-hostname
 #var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe
 var/ipfire/dhcpc/dhcpcd-run-hooks
-#usr/share/man/man5/dhcpcd.conf.5
-#usr/share/man/man8/dhcpcd-run-hooks.8
-#usr/share/man/man8/dhcpcd.8
 var/ipfire/dhcpc/dhcpcd.conf

diff --git a/config/rootfiles/core/43/filelists/dhcpcd b/config/rootfiles/core/43/filelists/dhcpcd
new file mode 120000 (symlink)
index 0000000..1e799da
--- /dev/null
+++ b/config/rootfiles/core/43/filelists/dhcpcd
@@ -0,0 +1 @@
+../../../common/dhcpcd
\ No newline at end of file

diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files
index 49c6586bb6f7b68da7cc8abc54b06d3dc5c6e37d..cf87bc6ca99520b6763699c0e16c819d21526d68 100644 (file)
--- a/config/rootfiles/core/43/filelists/files
+++ b/config/rootfiles/core/43/filelists/files
@@ -1,7 +1,7 @@
-etc/init.d/firewall
 etc/system-release
 etc/rc.d/init.d/checkfs
 etc/rc.d/init.d/checkfstab
+etc/rc.d/init.d/firewall
 etc/rc.d/init.d/squid
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/speed.cgi

diff --git a/config/rootfiles/core/43/filelists/fireinfo b/config/rootfiles/core/43/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/43/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file

diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 840691381a5b9cb4bdcc0604bca58db1aa3ce479..e843b9a75cb6ba864c4f458ba77eda77b14621f5 100644 (file)
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -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)
 
@@ -79,5 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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)

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 09961283342280d26ee61fc78417a1cb9e2cc05f..a0aafbf5bcd6b452c0259b8cd63058960fc9813e 100644 (file)
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        #