update samba to 3.28 and pakfire release 3

corrected some cgi issues for qos
change qosskript
started core update 2

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1122 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index fa0b6edf045a372d125ee0e03c18588fe146b984..18a3acec5d6474c248bb6129f231058fe5c33cd6 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -156,7 +156,7 @@ case "\$1" in
 
        ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
        ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'}
-       ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
+       #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
 
        ### ADD HTB QDISC FOR $qossettings{'RED_DEV'}
        tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}

diff --git a/config/rootfiles/core/1/files b/config/rootfiles/core/1/files
index 9f15b21f92ba727efaa2b7db879954a461665cd8..9f88ed2d9b794e8f88f9edeba97f05c20af291d0 100644 (file)
--- a/config/rootfiles/core/1/files
+++ b/config/rootfiles/core/1/files
@@ -5,3 +5,4 @@ opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 usr/sbin/updxlrator
 var/ipfire/updatexlrator/bin/download
+etc/httpd/conf/vhosts.d/ipfire-interface.conf

diff --git a/config/rootfiles/core/1/update.sh b/config/rootfiles/core/1/update.sh
index e5442e410bce8f8244653894a18ad546a78580b4..465a6deb09b91796e016960f695236e01f84ab1a 100644 (file)
--- a/config/rootfiles/core/1/update.sh
+++ b/config/rootfiles/core/1/update.sh
@@ -4,5 +4,3 @@
 extract_files
 mv /srv/web/ipfire/html/updatecache /var/
 /etc/init.d/squid restart
-
-reload_all

diff --git a/config/rootfiles/core/2/files b/config/rootfiles/core/2/files
new file mode 100644 (file)
index 0000000..e71d0fd
--- /dev/null
+++ b/config/rootfiles/core/2/files
@@ -0,0 +1,2 @@
+srv/web/ipfire/cgi-bin/qos.cgi
+var/ipfire/qos/bin/makeqosscripts.pl

diff --git a/config/rootfiles/core/2/meta b/config/rootfiles/core/2/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/2/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/2/update.sh b/config/rootfiles/core/2/update.sh
new file mode 100644 (file)
index 0000000..a47a783
--- /dev/null
+++ b/config/rootfiles/core/2/update.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+
+extract_files

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 9674a8a9fe5480dbfe7d7aafb960f15eeecfbe8b..6ba65b671c8536dd818eb2d4a56a423a90a70ee3 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -570,6 +570,11 @@ END
        $qossettings{'DEFCLASS_INC'} = "210";
        $qossettings{'DEFCLASS_OUT'} = "110";
        $qossettings{'ACK'} ="101";
+       system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
+       system("/usr/bin/touch /var/ipfire/qos/enable");
+       system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
+       system("logger -t ipfire 'QoS started'");
+       $qossettings{'ENABLED'} = 'on';
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 
 }
@@ -1149,7 +1154,7 @@ END
                <tr><td width='50%' align='left'>$Lang::tr{'min delay'} (8)             <td width='50%'><input type="radio" name="TOS" value="8" $checked[8] />
                <tr><td width='50%' align='left'>$Lang::tr{'max throughput'} (4)                <td width='50%'><input type="radio" name="TOS" value="4" $checked[4] />
                <tr><td width='50%' align='left'>$Lang::tr{'max reliability'} (2)       <td width='50%'><input type="radio" name="TOS" value="2" $checked[2] />
-               <tr><td width='50%' align='left'$Lang::tr{'min costs'} (1)                      <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
+               <tr><td width='50%' align='left'>$Lang::tr{'min costs'} (1)                     <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
                <tr><td width='100%' align='right' colspan='2'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOTOS' value='$Lang::tr{'save'}' />
                </table></form>
 END

diff --git a/lfs/samba b/lfs/samba
index a524b48975a619ce5d75506f8fbcb070f30928ee..ff563e326b87aff259f2cc925321c2c27b8e1f5f 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.0.27a
+VER        = 3.0.28
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 1
+PAK_VER    = 3
 
 DEPS       = "cups cyrus-sasl"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 57aedd342cafddbb28e2936c15dde96b
+$(DL_FILE)_MD5 = 8761cd7c02833d959fbebd4f69895075
 
 install : $(TARGET)
 

diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh
index 800823ef50bde1623c522e37274d393954af6439..89c40d0d7c5d3dd57b5944f3af4977d5f8d76760 100644 (file)
--- a/src/paks/samba/update.sh
+++ b/src/paks/samba/update.sh
@@ -22,3 +22,5 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh