rpms/iproute/devel iproute2-example-cbq-service.patch, NONE, 1.1 iproute.spec, 1.102, 1.103 man-pages.patch, 1.2, 1.3

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4057

Modified Files:
	iproute.spec man-pages.patch 
Added Files:
	iproute2-example-cbq-service.patch 
Log Message:
* Fri Nov 27 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.29-5.1.20091106gita7a9ddbb
- 539232 patch cbq initscript


iproute2-example-cbq-service.patch:
 cbq.init-v0.7.3 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE iproute2-example-cbq-service.patch ---
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" ] &&


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- iproute.spec	27 Nov 2009 10:20:11 -0000	1.102
+++ iproute.spec	27 Nov 2009 13:45:57 -0000	1.103
@@ -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 howto
 %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 at redhat.com> - 2.6.29-5.1.20091106gita7a9ddbb
+- 539232 patch cbq initscript
+
 * Fri Nov 27 2009 Marcela Mašláňová <mmaslano at redhat.com> - 2.6.29-5.0.20091106gita7a9ddbb
 - snapshot with kernel headers for 2.6.32
 

man-pages.patch:
 cbq.8   |    1 +
 ifcfg.8 |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ip.8    |    7 +++++++
 nstat.8 |    1 +
 4 files changed, 66 insertions(+)

Index: man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/man-pages.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- man-pages.patch	9 Oct 2009 11:49:26 -0000	1.2
+++ man-pages.patch	27 Nov 2009 13:45:57 -0000	1.3
@@ -2,7 +2,7 @@ diff -up 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