[iputils] fixes #756439 - ping Record Route report incorrect (same route)

[Jiri Skala]

commit 3327d9d13d8c3e7caa44265fcfb3579e817d18cf
Author: Jiri Skala <jskala at redhat.com>
Date:   Thu Nov 24 14:52:19 2011 +0100

    fixes #756439 - ping Record Route report incorrect (same route)

 iputils-20101006-rr.patch |   12 ++++++++++++
 iputils.spec              |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/iputils-20101006-rr.patch b/iputils-20101006-rr.patch
new file mode 100644
index 0000000..e844ecd
--- /dev/null
+++ b/iputils-20101006-rr.patch
@@ -0,0 +1,12 @@
+diff -up iputils-s20100418/ping.c.rr iputils-s20100418/ping.c
+--- iputils-s20100418/ping.c.rr	2011-11-24 14:33:37.096831782 +0100
++++ iputils-s20100418/ping.c	2011-11-24 14:35:53.087308660 +0100
+@@ -1085,7 +1085,7 @@ void pr_options(unsigned char * cp, int 
+ 			if (i <= 0)
+ 				break;
+ 			if (i == old_rrlen
+-			    && !strncmp((char *)cp, old_rr, i)
++			    && !memcmp(cp, (unsigned char *)old_rr, i)
+ 			    && !(options & F_FLOOD)) {
+ 				printf("\t(same route)");
+ 				i = ((i + 3) / 4) * 4;
diff --git a/iputils.spec b/iputils.spec
index a01665d..fb42ebd 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20101006
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 URL: http://www.skbuff.net/iputils
 Group: System Environment/Daemons
@@ -30,6 +30,7 @@ Patch14: iputils-20101006-drop_caps.patch
 Patch15: iputils-20101006-unused.patch
 Patch16: iputils-20101006-man.patch
 Patch17: iputils-20101006-eth.patch
+Patch18: iputils-20101006-rr.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -80,6 +81,7 @@ The iputils-sysvinit contains SysV initscritps support.
 %patch15 -p1 -b .unused
 %patch16 -p1 -b .man
 %patch17 -p1 -b .eth
+%patch18 -p1 -b .rr
 
 %build
 %ifarch s390 s390x
@@ -184,6 +186,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Thu Nov 24 2011 Jiri Skala <jskala at redhat.com> - 20101006-12
+- fixes #756439 - ping Record Route report incorrect (same route)
+
 * Thu Nov 10 2011 Jiri Skala <jskala at redhat.com> - 20101006-11
 - fixes #752397 - arping uses eth0 as default interface