From da7e266567ae65c3350e2f366c1660fe3e4acbf4 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Thu, 13 Dec 2007 22:10:38 +0000 Subject: [PATCH] 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 --- config/qos/makeqosscripts.pl | 2 +- config/rootfiles/core/1/files | 1 + config/rootfiles/core/1/update.sh | 2 -- config/rootfiles/core/2/files | 2 ++ config/rootfiles/core/2/meta | 1 + config/rootfiles/core/2/update.sh | 4 ++++ html/cgi-bin/qos.cgi | 7 ++++++- lfs/samba | 6 +++--- src/paks/samba/update.sh | 2 ++ 9 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 config/rootfiles/core/2/files create mode 100644 config/rootfiles/core/2/meta create mode 100644 config/rootfiles/core/2/update.sh diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index fa0b6edf04..18a3acec5d 100644 --- 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 9f15b21f92..9f88ed2d9b 100644 --- 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 e5442e410b..465a6deb09 100644 --- 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 index 0000000000..e71d0fdc26 --- /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 index 0000000000..d547fa86fa --- /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 index 0000000000..a47a7831dc --- /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 9674a8a9fe..6ba65b671c 100644 --- 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 $Lang::tr{'min delay'} (8) $Lang::tr{'max throughput'} (4) $Lang::tr{'max reliability'} (2) - + $Lang::tr{'min costs'} (1) END diff --git a/lfs/samba b/lfs/samba index a524b48975..ff563e326b 100644 --- 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 800823ef50..89c40d0d7c 100644 --- 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 -- 2.39.2