webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	config/rootfiles/core/49/filelists/files
This commit is contained in:
Christian Schmidt
2011-04-02 19:49:11 +02:00
parent 78e1facfba cadb66f381
commit 80c7f007fe
9 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/lm_sensors
View File

@@ -8,9 +8,8 @@ usr/bin/sensors-conf-convert
#usr/lib/libsensors.a
usr/lib/libsensors.so
usr/lib/libsensors.so.4
usr/lib/libsensors.so.4.2.1
usr/lib/libsensors.so.4.3.1
#usr/man/man1/sensors.1
#usr/man/man3
#usr/man/man3/libsensors.3
#usr/man/man5/sensors.conf.5
#usr/man/man5/sensors3.conf.5

1
config/rootfiles/core/49/exclude
View File

@@ -0,0 +1 @@
/srv/web/ipfire/html/proxy.pac

1
config/rootfiles/core/49/filelists/MIME-Tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/MIME-Tools

1
config/rootfiles/core/49/filelists/Mail-Tools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/Mail-Tools

3
config/rootfiles/core/49/filelists/files
View File

@@ -1,3 +1,6 @@
etc/system-release
etc/init.d/squid
var/ipfire/backup/bin/backup.pl
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi

1
config/rootfiles/core/49/filelists/lm_sensors Symbolic link
View File

@@ -0,0 +1 @@
../../../common/lm_sensors

6
lfs/MIME-Tools
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 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.420
VER = 5.502
THISAPP = MIME-tools-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4db6505cc0132c80c5a9cc54f443a21a
$(DL_FILE)_MD5 = 6a87adda74867e3f8868a0599137bde0
install : $(TARGET)

4
lfs/Mail-Tools
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.74
VER = 2.07
THISAPP = MailTools-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = aba82a7eb87906278d98174e10d838be
$(DL_FILE)_MD5 = df861e05cbcf3a336ecebfb2c42529d0
install : $(TARGET)

4
lfs/lm_sensors
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.1.2
VER = 3.3.0
THISAPP = lm_sensors-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 58a9a225808ac4587c4c8cbd12b40b5c
$(DL_FILE)_MD5 = 5eb18d7531ead4f54f28a1133a606535
install : $(TARGET)