From 6b9f1b888458608580d3645c35b16ffa99af782a Mon Sep 17 00:00:00 2001
From: Christian Schmidt
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