From 06f99a468591935302bea41ec2106acf84fc1ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
Date: Fri, 7 Oct 2005 05:50:15 +0000
Subject: [PATCH] - update from upstream - fixed host_len size for memcpy
 (#168903) <Matt_Domsch@dell.com>

---
 .cvsignore                       |  2 +-
 iproute.spec                     | 14 +++++++++-----
 iproute2-ss050901-host_len.patch | 18 ++++++++++++++++++
 sources                          |  2 +-
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 iproute2-ss050901-host_len.patch

diff --git a/.cvsignore b/.cvsignore
index d3a7a64..4c200bf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-iproute2-ss050901.tar.bz2
+iproute2-050929.tar.gz
diff --git a/iproute.spec b/iproute.spec
index 2ee6dd7..3430522 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,12 +1,12 @@
-%define date_version ss050901
+%define date_version 050929
 %define cbq_version v0.7.3
 
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.14
-Release: 4
+Release: 5
 Group: Applications/System
-Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{date_version}.tar.bz2
+Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{date_version}.tar.gz
 URL:    http://developer.osdl.org/dev/iproute2/
 Source1: ip.8
 Source2: tc.8
@@ -25,8 +25,8 @@ Source13: README.cbq
 Patch1: iproute2-2.4.7-rt_config.patch
 Patch2: iproute2-2.6.9-kernel.patch
 Patch3: cbq-0.7.1-avpkt-enhancement.patch
-Patch4:	iproute2-ss050901-help.patch
 Patch5: iproute2-ss050901-opt_flags.patch
+Patch6: iproute2-ss050901-host_len.patch
 
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -43,8 +43,8 @@ cp %{SOURCE12} $RPM_BUILD_DIR/iproute2-%{date_version}
 %patch1 -p1 -b .rt_config
 %patch2 -p1 -b .kernel
 %patch3 -p0 -b .avpkt-enhancment
-%patch4 -p1 -b .help
 %patch5 -p1 -b .opt_flags
+%patch6 -p1 -b .host_len
 
 %build
 make
@@ -114,6 +114,10 @@ EOF
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Fri Oct 07 2005 Radek Vokal <rvokal@redhat.com> 2.6.14-5
+- update from upstream
+- fixed host_len size for memcpy (#168903) <Matt_Domsch@dell.com>
+
 * Fri Sep 23 2005 Radek Vokal <rvokal@redhat.com> 2.6.14-4
 - add RPM_OPT_FLAGS
 
diff --git a/iproute2-ss050901-host_len.patch b/iproute2-ss050901-host_len.patch
new file mode 100644
index 0000000..9567fe4
--- /dev/null
+++ b/iproute2-ss050901-host_len.patch
@@ -0,0 +1,18 @@
+--- iproute2-ss050901/ip/iproute.c~	2005-09-01 14:21:50.000000000 -0500
++++ iproute2-ss050901/ip/iproute.c	2005-10-06 21:30:36.000000000 -0500
+@@ -216,13 +216,13 @@ int print_route(const struct sockaddr_nl
+ 		memset(&via, 0, sizeof(via));
+ 		via.family = r->rtm_family;
+ 		if (tb[RTA_GATEWAY])
+-			memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len);
++			memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len/8);
+ 	}
+ 	if (filter.rprefsrc.bitlen>0) {
+ 		memset(&prefsrc, 0, sizeof(prefsrc));
+ 		prefsrc.family = r->rtm_family;
+ 		if (tb[RTA_PREFSRC])
+-			memcpy(&prefsrc.data, RTA_DATA(tb[RTA_PREFSRC]), host_len);
++			memcpy(&prefsrc.data, RTA_DATA(tb[RTA_PREFSRC]), host_len/8);
+ 	}
+ 
+ 	if (filter.rdst.family && inet_addr_match(&dst, &filter.rdst, filter.rdst.bitlen))
diff --git a/sources b/sources
index 17eba20..2fd9e23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4662a8f67caa70b079e615725f0444f7  iproute2-ss050901.tar.bz2
+12198a67c2f4d1f18182aa2e6d76986d  iproute2-050929.tar.gz