webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	config/rootfiles/packages/miniupnpd
This commit is contained in:
Michael Tremer
2010-11-28 21:01:11 +01:00
parent d4e6e4ce5d 9aa36230a5
commit 24f1f6ce61
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lfs/dhcpcd
View File

@@ -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)

2
lfs/fireinfo
View File

@@ -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 #