New Version will be 2.3

Upgraded collectd
Tried to fix a bug when using usb cdrom for install

diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
index bcf49116db6b388caa0e6c058020e5de6963b40a..67dd478b92353adb03290ae87f0dbda433e8c860 100644 (file)
--- 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
 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
 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 3d878194ac2fb8e3a09498c51df84a99e2ba08c4..a0608bb532c3618990087946ba314cb97453d436 100755 (executable)
--- a/config/upnp/gatedesc.xml
+++ b/config/upnp/gatedesc.xml
@@ -9,7 +9,7 @@
                <friendlyName>IPFire UPnP Device</friendlyName>
                <manufacturer>IPFire Project</manufacturer>
                <manufacturerURL>http://www.ipfire.org</manufacturerURL>
                <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>
                <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>
                                <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>
                                <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>
                                <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>
                                                <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>
                                                <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>
                                                <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN>
                                                <UPC>Linux IGD</UPC>
                                                <serviceList>

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index a8ba0a4ccfc7b328e7d0674c3d26423e5767c34c..35d7cae4884700bbbaa2bd20556f19d159450b51 100644 (file)
--- 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
 * 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
 * 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
 * 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 a9c82330f56a13d7fbdcf0321c8e1f0c7a2ca663..160f3b98f299f92fdeb4de972a5323c7fbae1e58 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -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 />
 (<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 - 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 />
 (<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 />
 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 />
 </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 />

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 85d8add674dd3576e5f4e4cfc1e02155c76a44a0..83b44e65c99a3782ede7a015185c2200f6038379 100644 (file)
--- 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{'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';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'share';
 $sambasettings{'OSLEVEL'} = '33';

diff --git a/lfs/collectd b/lfs/collectd
index 7114a70fac8ce5f993ad5f2867b1bec5a1d072c3..56ccdc10b67f0904fa89de75606242e7f2be87ad 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = collectd
 include Config
 
 PKG_NAME   = collectd

-VER        = 4.4.0
+VER        = 4.4.1

 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 
 THISAPP    = collectd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 76ec42bf1976c1d4110443d845decca3
+$(DL_FILE)_MD5 = 176880c32a06bee9d5e6e2e7c76751a3

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index cd3601307855fae6c85d4eb94679ed2ae8c95112..73e3c5d38ac22277154a805331d4d99de64ab254 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 
 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
 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 04a5e44a43fb4a3c19507285abfbe92643651361..cb2e268c465721bd472dc6cd20e0d9482109de4f 100644 (file)
--- 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.)
 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
                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 7eeb592ad239b26035f594c06181d6aa934a65e6..6c4dea5d56a6f0966e06fbdd6a745fad67ebc816 100644 (file)
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -21,7 +21,7 @@
 
 package Conf;
 
 
 package Conf;
 

-$version = "2.2-test";
+$version = "2.3";

 
 $mainserver = "pakfire.ipfire.org";
 
 
 $mainserver = "pakfire.ipfire.org";