From 6b9f1b888458608580d3645c35b16ffa99af782a Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sat, 14 Jun 2008 11:54:51 +0200 Subject: [PATCH] New Version will be 2.3 Upgraded collectd Tried to fix a bug when using usb cdrom for install --- config/rootfiles/updater/filelists/other | 1 + config/upnp/gatedesc.xml | 10 +++++----- doc/packages-list.txt | 4 ++-- html/cgi-bin/credits.cgi | 12 +++++------- html/cgi-bin/samba.cgi | 2 +- lfs/collectd | 4 ++-- make.sh | 2 +- src/install+setup/install/mountsource.sh | 2 +- src/pakfire/pakfire.conf | 2 +- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other index bcf49116d..67dd478b9 100644 --- a/config/rootfiles/updater/filelists/other +++ b/config/rootfiles/updater/filelists/other @@ -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 diff --git a/config/upnp/gatedesc.xml b/config/upnp/gatedesc.xml index 3d878194a..a0608bb53 100755 --- a/config/upnp/gatedesc.xml +++ b/config/upnp/gatedesc.xml @@ -9,7 +9,7 @@ IPFire UPnP Device IPFire Project http://www.ipfire.org - IPFire 2.2 + IPFire 2.3 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e @@ -37,9 +37,9 @@ http://www.ipfire.org WAN Device on Linux IGD IPFire - 2.2 + 2.3 http://linux-igd.sourceforge.net - 2.2 + 2.3 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e Linux IGD @@ -59,9 +59,9 @@ http://www.ipfire.org Internet connection on Linux IPFire Firewall IPFire - 2.2 + 2.3 http://www.ipfire.org - 2.2 + 2.3 uuid:75802409-bccb-40e7-8e6c-fa095ecce13e Linux IGD diff --git a/doc/packages-list.txt b/doc/packages-list.txt index a8ba0a4cc..35d7cae48 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -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 diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index a9c82330f..160f3b98f 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -55,22 +55,20 @@ Project Leader - Michael Tremer (mitch\@ipfire.org)
Vice Project Leader - Christian Schmidt (maniacikarus\@ipfire.org)
+Developer - Arne Fitzenreiter +(arne\@ipfire.org)
Developer - Heiner Schmeling (cm\@ipfire.org)
Developer - Sven Nierlein (affect\@versatel.de)
-Developer - Arne Fitzenreiter -(arne\@ipfire.org)
-Sponsor - Detlef Lampart -(delaco\@ipfire.org)
-Developer & Security Manager - Rene Zingel +Developer - Rene Zingel (linuxadmin\@ipfire.org)
-Supporter - Silvio Rechenbach -(exciter\@ipfire.org)
Sponsor - Karsten Rechenbach (space\@ipfire.org)
Tester - Ronald Wiesinger (rowie\@ipfire.org)
+Tester - Silvio Rechenbach +(exciter\@ipfire.org)

Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.
There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, mbmon-Graphs, Hddtemp and Wake-on-LAN.
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 85d8add67..83b44e65c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -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'; diff --git a/lfs/collectd b/lfs/collectd index 7114a70fa..56ccdc10b 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -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) diff --git a/make.sh b/make.sh index cd3601307..73e3c5d38 100755 --- a/make.sh +++ b/make.sh @@ -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 diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh index 04a5e44a4..cb2e268c4 100644 --- a/src/install+setup/install/mountsource.sh +++ b/src/install+setup/install/mountsource.sh @@ -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 diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 7eeb592ad..6c4dea5d5 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -21,7 +21,7 @@ package Conf; -$version = "2.2-test"; +$version = "2.3"; $mainserver = "pakfire.ipfire.org"; -- 2.39.2