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

New Version will be 2.3

Browse Source 
Upgraded collectd
Tried to fix a bug when using usb cdrom for install
This commit is contained in:
Christian Schmidt
2008-06-14 11:54:51 +02:00
parent a2deff9ce2
commit 6b9f1b8884
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/updater/filelists/other
View File

@@ -8,6 +8,7 @@ etc/rc.d/init.d/networking/red.up/40-ipac
etc/linuxigd/gatedesc.xml
usr/local/bin/getiptstate
usr/local/bin/makegraphs
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi

10
config/upnp/gatedesc.xml
View File

@@ -9,7 +9,7 @@
<friendlyName>IPFire UPnP Device</friendlyName>
<manufacturer>IPFire Project</manufacturer>
<manufacturerURL>http://www.ipfire.org</manufacturerURL>
<modelName>IPFire 2.2</modelName>
<modelName>IPFire 2.3</modelName>
<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
<iconList>
<icon>
@@ -37,9 +37,9 @@
<manufacturerURL>http://www.ipfire.org</manufacturerURL>
<modelDescription>WAN Device on Linux IGD</modelDescription>
<modelName>IPFire</modelName>
<modelNumber>2.2</modelNumber>
<modelNumber>2.3</modelNumber>
<modelURL>http://linux-igd.sourceforge.net</modelURL>
<serialNumber>2.2</serialNumber>
<serialNumber>2.3</serialNumber>
<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
<UPC>Linux IGD</UPC>
<serviceList>
@@ -59,9 +59,9 @@
<manufacturerURL>http://www.ipfire.org</manufacturerURL>
<modelDescription>Internet connection on Linux IPFire Firewall</modelDescription>
<modelName>IPFire</modelName>
<modelNumber>2.2</modelNumber>
<modelNumber>2.3</modelNumber>
<modelURL>http://www.ipfire.org</modelURL>
<serialNumber>2.2</serialNumber>
<serialNumber>2.3</serialNumber>
<UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
<UPC>Linux IGD</UPC>
<serviceList>

4
doc/packages-list.txt
View File

@@ -1,4 +1,4 @@
== List of softwares used to build IPFire Version: 2.2-test ==
== List of softwares used to build IPFire Version: 2.3 ==
* Archive-Tar-1.29
* Archive-Zip-1.16
* BerkeleyDB-0.27
@@ -61,7 +61,7 @@
* centerim-4.22.1
* clamav-0.93
* cmake-2.4.8
* collectd-4.4.0
* collectd-4.4.1
* coreutils-5.96
* cpio-2.6
* cups-1.3.7

12
html/cgi-bin/credits.cgi
View File

@@ -55,22 +55,20 @@ Project Leader - Michael Tremer
(<a href='mailto:mitch\@ipfire.org'>mitch\@ipfire.org</a>)<br />
Vice Project Leader - Christian Schmidt
(<a href='mailto:maniacikarus\@ipfire.org'>maniacikarus\@ipfire.org</a>)<br />
Developer - Arne Fitzenreiter
(<a href='mailto:arne\@ipfire.org'>arne\@ipfire.org</a>)<br />
Developer - Heiner Schmeling
(<a href='mailto:cm\@ipfire.org'>cm\@ipfire.org</a>)<br />
Developer - Sven Nierlein
(<a href='mailto:affect\@ipfire.org'>affect\@versatel.de</a>)<br />
Developer - Arne Fitzenreiter
(<a href='mailto:arne\@ipfire.org'>arne\@ipfire.org</a>)<br />
Sponsor - Detlef Lampart
(<a href='mailto:delaco\@ipfire.org'>delaco\@ipfire.org</a>)<br />
Developer &amp; Security Manager - Rene Zingel
Developer - Rene Zingel
(<a href='mailto:linuxadmin\@ipfire.org'>linuxadmin\@ipfire.org</a>)<br />
Supporter - Silvio Rechenbach
(<a href='mailto:exciter\@ipfire.org'>exciter\@ipfire.org</a>)<br />
Sponsor - Karsten Rechenbach
(<a href='mailto:space\@ipfire.org'>space\@ipfire.org</a>)<br />
Tester - Ronald Wiesinger
(<a href='mailto:rowie\@ipfire.org'>rowie\@ipfire.org</a>)<br />
Tester - Silvio Rechenbach
(<a href='mailto:exciter\@ipfire.org'>exciter\@ipfire.org</a>)<br />
</p>
<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, mbmon-Graphs, Hddtemp and Wake-on-LAN.<br />

2
html/cgi-bin/samba.cgi
View File

@@ -73,7 +73,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'NETBIOSNAME'} = 'IPFire';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.2';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.3';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'share';
$sambasettings{'OSLEVEL'} = '33';

4
lfs/collectd
View File

@@ -25,7 +25,7 @@
include Config
PKG_NAME = collectd
VER = 4.4.0
VER = 4.4.1
THISAPP = collectd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 76ec42bf1976c1d4110443d845decca3
$(DL_FILE)_MD5 = 176880c32a06bee9d5e6e2e7c76751a3
install : $(TARGET)

2
make.sh
View File

@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.2"
VERSION="2.3"
GIT_BRANCH=master:master # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir

2
src/install+setup/install/mountsource.sh
View File

@@ -34,7 +34,7 @@ for DEVICE in $(kudzu -qps -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sor
done
# scan HD device (usb sticks, etc.)
for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 | sort | uniq); do
mount /dev/${DEVICE}1 /cdrom 2> /dev/null
if [ -n "$(ls /cdrom/ipfire-*.tbz2 2>/dev/null)" ]; then
echo -n ${DEVICE}1 > /tmp/source_device

2
src/pakfire/pakfire.conf
View File

@@ -21,7 +21,7 @@
package Conf;
$version = "2.2-test";
$version = "2.3";
$mainserver = "pakfire.ipfire.org";