From 27040a3e1da2327e277494b75601812d63684b59 Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@localhost.(none)>
Date: Mon, 11 Oct 2010 09:45:47 +0200
Subject: [PATCH] * Mon Oct 11 2010 Jiri Skala <jskala@redhat.com> - 20101006-1
 - update to latest upstream

---
 .gitignore                        |  1 +
 iputils-20071127-infiniband.patch |  8 ++++----
 iputils-20100418-dos.patch        | 21 ---------------------
 iputils.spec                      |  9 +++++----
 sources                           |  4 +---
 5 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 iputils-20100418-dos.patch

diff --git a/.gitignore b/.gitignore
index a0d20a6..d1a4d6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 iputils-s20100418.tar.bz2
 rdisc.initd
 ifenslave.tar.gz
+/iputils-s20101006.tar.bz2
diff --git a/iputils-20071127-infiniband.patch b/iputils-20071127-infiniband.patch
index 9e543da..0d1a544 100644
--- a/iputils-20071127-infiniband.patch
+++ b/iputils-20071127-infiniband.patch
@@ -1,6 +1,6 @@
-diff -up iputils-s20100418/arping.c.infiniband iputils-s20100418/arping.c
---- iputils-s20100418/arping.c.infiniband	2010-04-23 11:29:24.982567625 +0200
-+++ iputils-s20100418/arping.c	2010-04-23 14:28:28.328587690 +0200
+diff -up iputils-s20101006/arping.c.infiniband iputils-s20101006/arping.c
+--- iputils-s20101006/arping.c.infiniband	2010-10-11 09:17:57.440390823 +0200
++++ iputils-s20101006/arping.c	2010-10-11 09:23:36.147402252 +0200
 @@ -32,8 +32,6 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
@@ -151,7 +151,7 @@ diff -up iputils-s20100418/arping.c.infiniband iputils-s20100418/arping.c
 +                return -1;
  
 -	for (p = ba, ch = 0; p < ba + balen; p++, ch += 3)
--		*p++ = strtoul(brdcast->value + ch * 3, NULL, 16);
+-		*p = strtoul(brdcast->value + ch, NULL, 16);
 +        snprintf(broadcast_path, len,
 +                "%s/" SYSFS_CLASS "/" SYSFS_NET "/%s/" SYSFS_BROADCAST,
 +                mnt_path, device);
diff --git a/iputils-20100418-dos.patch b/iputils-20100418-dos.patch
deleted file mode 100644
index ad23c71..0000000
--- a/iputils-20100418-dos.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up iputils-s20100418/ping.c.dos iputils-s20100418/ping.c
---- iputils-s20100418/ping.c.dos	2010-07-13 08:53:29.356694202 +0200
-+++ iputils-s20100418/ping.c	2010-07-13 08:53:55.350694373 +0200
-@@ -1083,7 +1083,7 @@ void pr_options(unsigned char * cp, int 
- 				i = j;
- 			i -= IPOPT_MINOFF;
- 			if (i <= 0)
--				continue;
-+				break;
- 			if (i == old_rrlen
- 			    && !strncmp((char *)cp, old_rr, i)
- 			    && !(options & F_FLOOD)) {
-@@ -1120,7 +1120,7 @@ void pr_options(unsigned char * cp, int 
- 				i = j;
- 			i -= 5;
- 			if (i <= 0)
--				continue;
-+				break;
- 			flags = *++cp;
- 			printf("\nTS: ");
- 			cp++;
diff --git a/iputils.spec b/iputils.spec
index d557343..4b35de8 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
-Version: 20100418
-Release: 3%{?dist}
+Version: 20101006
+Release: 1%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -24,7 +24,6 @@ Patch10: iputils-20071127-corr_type.patch
 Patch11: iputils-20071127-infiniband.patch
 Patch12: iputils-20100418-convtoint.patch
 Patch13: iputils-20100418-flowlabel.patch
-Patch14: iputils-20100418-dos.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -59,7 +58,6 @@ the target machine is alive and receiving network traffic.
 %patch11 -p1 -b .infiniband
 %patch12 -p1 -b .convtoint
 %patch13 -p1 -b .flowlabel
-%patch14 -p1 -b .dos
 
 %build
 %ifarch s390 s390x
@@ -149,6 +147,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Mon Oct 11 2010 Jiri Skala <jskala@redhat.com> - 20101006-1
+- update to latest upstream
+
 * Tue Jul 13 2010 Jiri Skala <jskala@redhat.com> - 20100418-3
 - applied patch preventing ping against dos attack
 
diff --git a/sources b/sources
index 6e7d391..975d53b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-df6b0062118cdc5c62e3c810f831e976  iputils-s20100418.tar.bz2
-b044213f027e70a2cc1aa882e21fba3b  rdisc.initd
-5f2b3099a83a9561c98d5ee6b7c4f634  ifenslave.tar.gz
+a36c25e9ec17e48be514dc0485e7376c  iputils-s20101006.tar.bz2