From 99efa3de3b750978aac09cd8e34aaeb63e014df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Fri, 27 Nov 2009 13:45:57 +0000
Subject: [PATCH] - 539232 patch cbq initscript

---
 iproute.spec                       |  7 ++++++-
 iproute2-example-cbq-service.patch | 22 ++++++++++++++++++++++
 man-pages.patch                    |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 iproute2-example-cbq-service.patch

diff --git a/iproute.spec b/iproute.spec
index 437e000..61f9d15 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.29
-Release: 5.0.%{date_version}gita7a9ddbb%{?dist}
+Release: 5.1.%{date_version}gita7a9ddbb%{?dist}
 Group: Applications/System
 Source: iproute2-%{date_version}.tar.bz2
 #Source1: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
@@ -16,6 +16,7 @@ Patch3: iproute2-2.6.25-segfault.patch
 Patch4: iproute2-sharepath.patch
 Patch5: iproute2-2.6.29-tc_modules.patch
 Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
+Patch7: iproute2-example-cbq-service.patch
 
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,6 +47,7 @@ The iproute documentation contains howtos and examples of settings.
 %patch4 -p1 -b .share
 %patch5 -p1 -b .ipt
 %patch6 -p1 -b .ipproto
+%patch7 -p1 -b .fix_cbq
 
 %build
 export LIBDIR=/%{_libdir}
@@ -124,6 +126,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Fri Nov 27 2009 Marcela Mašláňová <mmaslano@redhat.com> - 2.6.29-5.1.20091106gita7a9ddbb
+- 539232 patch cbq initscript
+
 * Fri Nov 27 2009 Marcela Mašláňová <mmaslano@redhat.com> - 2.6.29-5.0.20091106gita7a9ddbb
 - snapshot with kernel headers for 2.6.32
 
diff --git a/iproute2-example-cbq-service.patch b/iproute2-example-cbq-service.patch
new file mode 100644
index 0000000..f8b4978
--- /dev/null
+++ b/iproute2-example-cbq-service.patch
@@ -0,0 +1,22 @@
+diff -up iproute2-20091106/examples/cbq.init-v0.7.3.fix iproute2-20091106/examples/cbq.init-v0.7.3
+--- iproute2-20091106/examples/cbq.init-v0.7.3.fix	2009-11-10 19:41:44.000000000 +0100
++++ iproute2-20091106/examples/cbq.init-v0.7.3	2009-11-27 13:36:07.957310549 +0100
+@@ -579,14 +579,14 @@ cbq_show () {
+ ### Check configuration and load DEVICES, DEVFIELDS and CLASSLIST from $1
+ cbq_init () {
+ 	### Get a list of configured classes
+-	CLASSLIST=`find $1 \( -type f -or -type l \) -name 'cbq-*' \
+-		-not -name '*~' -maxdepth 1 -printf "%f\n"| sort`
++	CLASSLIST=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \
++		-not -name '*~' -printf "%f\n"| sort`
+ 	[ -z "$CLASSLIST" ] &&
+ 		cbq_failure "no configuration files found in $1!"
+ 
+ 	### Gather all DEVICE fields from $1/cbq-*
+-	DEVFIELDS=`find $1 \( -type f -or -type l \) -name 'cbq-*' \
+-		  -not -name '*~' -maxdepth 1| xargs sed -n 's/#.*//; \
++	DEVFIELDS=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \
++		  -not -name '*~' | xargs sed -n 's/#.*//; \
+ 		  s/[[:space:]]//g; /^DEVICE=[^,]*,[^,]*\(,[^,]*\)\?/ \
+ 		  { s/.*=//; p; }'| sort -u`
+ 	[ -z "$DEVFIELDS" ] &&
diff --git a/man-pages.patch b/man-pages.patch
index 4525aec..c565a83 100644
--- a/man-pages.patch
+++ b/man-pages.patch
@@ -2,7 +2,7 @@ diff -up iproute2-2.6.29/man/man8/cbq.8.man iproute2-2.6.29/man/man8/cbq.8
 --- iproute2-2.6.29/man/man8/cbq.8.man	2009-09-24 14:05:44.868922557 +0200
 +++ iproute2-2.6.29/man/man8/cbq.8	2009-09-24 14:05:24.760143753 +0200
 @@ -0,0 +1 @@
-+.so man8/cbq.8
++.so man8/tc-cbq.8
 \ No newline at end of file
 diff -up /dev/null iproute2-2.6.29/man/man8/ifcfg.8
 --- /dev/null	2009-09-22 09:26:40.270218984 +0200