From 8c7d2e3f7c9e157d5e310142832a683958fc8a27 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 06:23:12 +0000
Subject: [PATCH] auto-import changelog data from iproute-2.4.7-14.src.rpm Wed
 Apr 21 2004 Phil Knirsch <pknirsch@redhat.com> 2.4.7-14 - Fixed -f option for
 ss (#118355). - Small description fix (#110997). - Added initialization of
 some vars (#74961). - Added patch to initialize "default" rule as well
 (#60693).

---
 iproute.spec                 | 18 +++++++++++++++---
 iproute2-2.4.7-initvar.patch | 12 ++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 iproute2-2.4.7-initvar.patch

diff --git a/iproute.spec b/iproute.spec
index 60cc238..8173551 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,7 +1,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.4.7
-Release: 13
+Release: 14
 Group: Applications/System
 Source: http://ftp.sunet.se/pub/os/Linux/ip-routing/iproute2-2.4.7-now-ss020116-try.tar.gz
 Source1: ip.8
@@ -16,14 +16,17 @@ Patch8: iproute2-2.4.7-htb3-tc.patch
 Patch9: iproute2-2.4.7-ss.patch
 Patch10: iproute2-2.4.7-db.patch
 Patch11: iproute2-2.4.7-netlink.patch
+Patch12: iproute2-2.4.7-optarg.patch
+Patch13: iproute2-2.4.7-initvar.patch
+Patch14: iproute2-2.4.7-default.patch
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools
+BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
 example) which are designed to use the advanced networking
-capabilities of the Linux 2.2.x kernel.
+capabilities of the Linux 2.4.x and 2.6.x kernel.
 
 %prep
 %setup -q -n iproute2
@@ -38,6 +41,9 @@ capabilities of the Linux 2.2.x kernel.
 %patch9 -p1 -b .ss
 %patch10 -p1 -b .db
 %patch11 -p1 -b .netlink
+%patch12 -p1 -b .optarg
+%patch13 -p1 -b .initvar
+%patch14 -p1 -b .default
 
 %build
 make
@@ -71,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 
 %changelog
+* Wed Apr 21 2004 Phil Knirsch <pknirsch@redhat.com> 2.4.7-14
+- Fixed -f option for ss (#118355).
+- Small description fix (#110997).
+- Added initialization of some vars (#74961). 
+- Added patch to initialize "default" rule as well (#60693).
+
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/iproute2-2.4.7-initvar.patch b/iproute2-2.4.7-initvar.patch
new file mode 100644
index 0000000..09adc4a
--- /dev/null
+++ b/iproute2-2.4.7-initvar.patch
@@ -0,0 +1,12 @@
+--- iproute2/ip/iproute.c.initvar	2004-04-21 16:57:59.307562694 +0200
++++ iproute2/ip/iproute.c	2004-04-21 16:58:35.353103364 +0200
+@@ -620,6 +620,9 @@
+ 		}
+ 		memset(rtnh, 0, sizeof(*rtnh));
+ 		rtnh->rtnh_len = sizeof(*rtnh);
++		rtnh->rtnh_ifindex = 0;
++		rtnh->rtnh_flags = 0;
++		rtnh->rtnh_hops = 0;
+ 		rta->rta_len += rtnh->rtnh_len;
+ 		parse_one_nh(rta, rtnh, &argc, &argv);
+ 		rtnh = RTNH_NEXT(rtnh);