net-misc/htbinit/files: Update patches

Some of them applied only with a fuzz factor.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

6 files changed, 24 insertions, 24 deletions

diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
index f45b5c073493..438ba7d83962 100644
--- a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
+++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
@@ -1,8 +1,8 @@
 --- a/htb.init
 +++ b/htb.init
 @@ -240,6 +240,10 @@
- #      Maximum packet size HTB creates rate maps for. The default should
- #      be sufficient for most cases, it certainly is for Ethernet.
+ #	Maximum packet size HTB creates rate maps for. The default should
+ #	be sufficient for most cases, it certainly is for Ethernet.
  #
 +# TOS=<number>                                 optional, default "none"
 +#
@@ -11,7 +11,7 @@
  ### SFQ qdisc parameters
  #
  # The SFQ queueing discipline is a cheap way to fairly share class bandwidth
-@@ -435,6 +435,7 @@
+@@ -435,6 +439,7 @@
  HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU"
  HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM"
  HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB"
@@ -19,7 +19,7 @@
  
  
  #############################################################################
-@@ -646,7 +647,7 @@
+@@ -646,7 +651,7 @@
  	### Set defaults & load class
  	MTU=""; LEAF=none; PERTURB=10
  	RATE=""; BURST=""; CEIL=""; CBURST=""
@@ -28,7 +28,7 @@
  	
  	PRIO_RULE=$PRIO_RULE_DEFAULT
  	PRIO_MARK=$PRIO_MARK_DEFAULT
-@@ -868,12 +869,19 @@
+@@ -868,12 +873,19 @@
  		u32_d="${DPORT:+match ip dport $DPORT $DMASK}"
  		u32_d="${DADDR:+match ip dst $DADDR} $u32_d"
  
diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch b/net-misc/htbinit/files/htb.init_find_fix.patch
index 27fce89ef2da..200fcfbfb411 100644
--- a/net-misc/htbinit/files/htb.init_find_fix.patch
+++ b/net-misc/htbinit/files/htb.init_find_fix.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -468,8 +468,8 @@
+@@ -473,8 +473,8 @@
  	### List of classes in $HTB_PATH
  	htb_class_list () {
  		for dev in `htb_device_list`; do
@@ -11,7 +11,7 @@
  			-printf "%f\n"| sort
  		done
  	} # htb_class_list
-@@ -483,8 +483,8 @@
+@@ -488,8 +488,8 @@
  	### Validate cache against config files
  	htb_valid_cache () {
  		for dev in `htb_device_list`; do
@@ -22,7 +22,7 @@
  			  wc -l` -gt 0 ] && VALID=0
  			[ $VALID -ne 1 ] && break
  		done
-@@ -493,7 +493,7 @@
+@@ -498,7 +498,7 @@
  
  	### Find class config for device $1, which is newer than cache
  	htb_cache_older () {
diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.patch b/net-misc/htbinit/files/htb_0.8.5_esfq.patch
index 506c505f8e47..fc7c92ddb4cb 100644
--- a/net-misc/htbinit/files/htb_0.8.5_esfq.patch
+++ b/net-misc/htbinit/files/htb_0.8.5_esfq.patch
@@ -9,7 +9,7 @@
  #
  #	Tells the script to attach specified leaf queueing discipline to HTB
  #	class. By default, no leaf qdisc is used.
-@@ -261,6 +261,15 @@
+@@ -265,6 +265,15 @@
  #	will never take place which is what you probably don't want. The
  #	default value of 10 seconds is probably a good value.
  #
@@ -25,7 +25,7 @@
  ### PFIFO/BFIFO qdisc parameters
  #
  # Those are simple FIFO queueing disciplines. They only have one parameter
-@@ -427,14 +445,14 @@
+@@ -440,14 +449,14 @@
  
  ### Modules to probe for. Uncomment the last HTB_PROBE
  ### line if you have QoS support compiled into kernel
@@ -42,7 +42,7 @@
  HTB_CLASS="$HTB_CLASS\|TOS"
  
  
-@@ -801,6 +819,8 @@
+@@ -815,6 +824,8 @@
  			LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}"
  		elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then
  			LEAFPARM="${LIMIT:+limit $LIMIT}"
diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
index 6e99319f2c62..526e7fcb85c5 100644
--- a/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
+++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -275,6 +284,7 @@
+@@ -279,6 +279,7 @@
  ### Filtering parameters
  #
  # RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]]
@@ -8,7 +8,7 @@
  #
  #	These parameters make up "u32" filter rules that select traffic for
  #	each of the classes. You can use multiple RULE fields per config.
-@@ -300,9 +310,13 @@
+@@ -304,9 +305,13 @@
  #	RULE=10.5.5.5:80,
  #		selects traffic going from port 80 of single host 10.5.5.5
  #
@@ -22,7 +22,7 @@
  #
  #	These parameters make up "route" filter rules that classify traffic
  #	according to packet source/destination realms. For information about
-@@ -327,6 +341,7 @@
+@@ -331,6 +336,7 @@
  #
  #
  # MARK=<mark>
@@ -30,7 +30,7 @@
  #
  #	These parameters make up "fw" filter rules that select traffic for
  #	each of the classes accoring to firewall "mark". Mark is a decimal
-@@ -414,6 +429,9 @@
+@@ -418,6 +424,9 @@
  PRIO_RULE_DEFAULT=${PRIO_RULE:-100}
  PRIO_MARK_DEFAULT=${PRIO_MARK:-200}
  PRIO_REALM_DEFAULT=${PRIO_REALM:-300}
@@ -40,7 +40,7 @@
  
  ### Default HTB_PATH & HTB_CACHE settings
  HTB_PATH=${HTB_PATH:-/etc/sysconfig/htb}
-@@ -818,6 +838,13 @@
+@@ -823,6 +832,13 @@
  		prio $PRIO_MARK handle $mark fw classid 1:$CLASS
  	done ### mark
  
@@ -54,7 +54,7 @@
  	### Create route filter for REALM fields
  	for realm in `htb_cfile_rules REALM`; do
  		### Split realm into source & destination realms
-@@ -833,6 +860,21 @@
+@@ -838,6 +854,21 @@
  		${DREALM:+to $DREALM} classid 1:$CLASS
  	done ### realm
  
@@ -76,8 +76,8 @@
  	### Create u32 filter for RULE fields
  	for rule in `htb_cfile_rules RULE`; do
  		### Split rule into source & destination
-@@ -876,6 +918,49 @@
- 		prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS
+@@ -888,6 +919,49 @@
+ 		prio $PRIO_RULE u32 $u32_s $u32_d $u32_tos classid 1:$CLASS
  	done ### rule
  
 +       ### Create u32 filter for RULEIPv6 fields
diff --git a/net-misc/htbinit/files/prio_rule.patch b/net-misc/htbinit/files/prio_rule.patch
index 429a1bed0ad1..9a73840e234d 100644
--- a/net-misc/htbinit/files/prio_rule.patch
+++ b/net-misc/htbinit/files/prio_rule.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -453,7 +457,7 @@
+@@ -458,7 +458,7 @@
  	### Load & filter file $HTB_PATH/$1
  	htb_filter_file () {
  		sed -n "s/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g; \
@@ -9,7 +9,7 @@
  	} # htb_filter_file
  
  
-@@ -517,7 +521,7 @@
+@@ -522,7 +522,7 @@
  
  	htb_filter_file () {
  		sed 's/#.*//; s/[^a-zA-Z0-9.,;:=/*-_]\+//g' $HTB_PATH/$1 \
diff --git a/net-misc/htbinit/files/timecheck_fix.patch b/net-misc/htbinit/files/timecheck_fix.patch
index 4797ea6fd0ab..e39ea9333d1b 100644
--- a/net-misc/htbinit/files/timecheck_fix.patch
+++ b/net-misc/htbinit/files/timecheck_fix.patch
@@ -1,6 +1,6 @@
 --- a/htb.init
 +++ b/htb.init
-@@ -891,7 +895,6 @@
+@@ -903,7 +903,6 @@
  TIME_TMP=`date +%w/%k:%M`
  TIME_DOW=${TIME_TMP%%/*}
  TIME_NOW=${TIME_TMP##*/}
@@ -8,7 +8,7 @@
  
  ### Check all classes (if configured)
  for classfile in `htb_class_list`; do
-@@ -914,6 +917,7 @@
+@@ -926,6 +925,7 @@
  		### Compute interval boundaries
  		BEG_ABS=`htb_time2abs $BEG_TIME`
  		END_ABS=`htb_time2abs $END_TIME`
@@ -16,7 +16,7 @@
  
  		### Midnight wrap fixup
  		if [ $BEG_ABS -gt $END_ABS ]; then
-@@ -926,6 +930,23 @@
+@@ -938,6 +938,23 @@
  		### If time period matches, remember params and set MATCH flag
  		if [ $TIME_ABS -ge $BEG_ABS -a $TIME_ABS -lt $END_ABS ]; then
  			RATESPEC=${PARAMS%%,*}; CEILSPEC=${PARAMS##*,}