From: Arne Fitzenreiter <Arne_F@ipfire.org>
Date: Sat, 2 Feb 2013 08:47:58 +0000 (+0100)
Subject: qos: fix replacement of fq_codel with htb at qos start.
X-Git-Tag: v2.13-rc2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38288aeed180e2e9de3ec66d8ec5424c17b7cfb4;p=people%2Fms%2Fipfire-2.x.git

qos: fix replacement of fq_codel with htb at qos start.
---

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 590808e37b..202bf4da1c 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -166,6 +166,7 @@ case "\$1" in
 	#ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
 
 	### ADD HTB QDISC FOR $qossettings{'RED_DEV'}
+	tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
 	tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}
 
 	### MAIN RATE LIMIT
@@ -423,6 +424,7 @@ print <<END
 	# ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'}
 
 	### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
+	tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
 	tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'}
 
 	### MAIN RATE LIMIT
@@ -693,7 +695,6 @@ print <<END
 	killall qosd >/dev/null 2>&1
 	(sleep 3 && killall -9 qosd &>/dev/null) &
 	# DELETE QDISCS
-	tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
 	tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1
 	tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
 	tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1
diff --git a/lfs/strongswan b/lfs/strongswan
index 39459c878f..8e7532976b 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.0.1
+VER        = 5.0.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 58fdeb49f133139a58f4d8adafc69a16
+$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef
 
 install : $(TARGET)