From b47e8a940e38a0d23b9f0039050289d10970901d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 15:52:44 +0000
Subject: import iputils-20121221-7.el7


---

diff --git a/SOURCES/iputils-20121221-ping-wrong-inet6-host.patch b/SOURCES/iputils-20121221-ping-wrong-inet6-host.patch
new file mode 100644
index 0000000..fd4620f
--- /dev/null
+++ b/SOURCES/iputils-20121221-ping-wrong-inet6-host.patch
@@ -0,0 +1,27 @@
+diff -rup iputils-s20121221/ping.c iputils-s20121221-new/ping.c
+--- iputils-s20121221/ping.c	2012-12-21 15:01:07.000000000 +0100
++++ iputils-s20121221-new/ping.c	2015-04-29 13:40:42.978415476 +0200
+@@ -279,7 +279,7 @@ main(int argc, char **argv)
+ #else
+ 			idn = target;
+ #endif
+-			hp = gethostbyname(idn);
++			hp = gethostbyname2(idn, AF_INET);
+ 			if (!hp) {
+ 				fprintf(stderr, "ping: unknown host %s\n", target);
+ 				exit(2);
+diff -rup iputils-s20121221/tracepath.c iputils-s20121221-new/tracepath.c
+--- iputils-s20121221/tracepath.c	2012-12-21 15:01:07.000000000 +0100
++++ iputils-s20121221-new/tracepath.c	2015-04-29 13:41:09.506353342 +0200
+@@ -370,9 +370,9 @@ main(int argc, char **argv)
+ 	}
+ #endif
+ 
+-	he = gethostbyname(p);
++	he = gethostbyname2(p, AF_INET);
+ 	if (he == NULL) {
+-		herror("gethostbyname");
++		herror("gethostbyname2");
+ 		exit(1);
+ 	}
+ 
diff --git a/SOURCES/iputils-20121221-tracepath-back-count.patch b/SOURCES/iputils-20121221-tracepath-back-count.patch
new file mode 100644
index 0000000..98debb2
--- /dev/null
+++ b/SOURCES/iputils-20121221-tracepath-back-count.patch
@@ -0,0 +1,60 @@
+diff -urp iputils-s20071127/tracepath6.c iputils-new/tracepath6.c
+--- iputils-s20071127/tracepath6.c	2014-11-18 15:08:22.691677284 +0100
++++ iputils-new/tracepath6.c	2014-11-18 15:11:42.434034029 +0100
+@@ -183,6 +183,13 @@ restart:
+ 			printf("(This broken router returned corrupted payload) ");
+ 	}
+ 
++	if (rethops<=64)
++		rethops = 65-rethops;
++	else if (rethops<=128)
++		rethops = 129-rethops;
++	else
++		rethops = 256-rethops;
++
+ 	switch (e->ee_errno) {
+ 	case ETIMEDOUT:
+ 		printf("\n");
+@@ -208,12 +215,6 @@ restart:
+ 		     e->ee_type == 3 &&
+ 		     e->ee_code == 0)) {
+ 			if (rethops>=0) {
+-				if (rethops<=64)
+-					rethops = 65-rethops;
+-				else if (rethops<=128)
+-					rethops = 129-rethops;
+-				else
+-					rethops = 256-rethops;
+ 				if (sndhops>=0 && rethops != sndhops)
+ 					printf("asymm %2d ", rethops);
+ 				else if (sndhops<0 && rethops != ttl)
+diff -urp iputils-s20071127/tracepath.c iputils-new/tracepath.c
+--- iputils-s20071127/tracepath.c	2014-11-18 15:08:22.685677303 +0100
++++ iputils-new/tracepath.c	2014-11-18 15:10:46.531214060 +0100
+@@ -170,6 +170,13 @@ restart:
+ 			printf("(This broken router returned corrupted payload) ");
+ 	}
+ 
++	if (rethops<=64)
++		rethops = 65-rethops;
++	else if (rethops<=128)
++		rethops = 129-rethops;
++	else
++		rethops = 256-rethops;
++
+ 	switch (e->ee_errno) {
+ 	case ETIMEDOUT:
+ 		printf("\n");
+@@ -192,12 +199,6 @@ restart:
+ 		    e->ee_type == 11 &&
+ 		    e->ee_code == 0) {
+ 			if (rethops>=0) {
+-				if (rethops<=64)
+-					rethops = 65-rethops;
+-				else if (rethops<=128)
+-					rethops = 129-rethops;
+-				else
+-					rethops = 256-rethops;
+ 				if (sndhops>=0 && rethops != sndhops)
+ 					printf("asymm %2d ", rethops);
+ 				else if (sndhops<0 && rethops != ttl)
diff --git a/SPECS/iputils.spec b/SPECS/iputils.spec
index a10326b..13b7e7c 100644
--- a/SPECS/iputils.spec
+++ b/SPECS/iputils.spec
@@ -3,7 +3,7 @@
 Summary: Network monitoring tools including ping
 Name: iputils
 Version: 20121221
-Release: 6%{?dist}.1
+Release: 7%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
@@ -21,6 +21,8 @@ Patch0: iputils-20020927-rh.patch
 Patch1: iputils-ifenslave.patch
 Patch2: iputils-20121221-floodlocale.patch
 Patch3: iputils-20121221-caps.patch
+Patch4: iputils-20121221-ping-wrong-inet6-host.patch
+Patch5: iputils-20121221-tracepath-back-count.patch
 
 BuildRequires: docbook-utils perl-SGMLSpm
 BuildRequires: glibc-kernheaders >= 2.4-8.19
@@ -72,6 +74,8 @@ Queries.
 %patch1 -p1 -b .addr
 %patch2 -p1 -b .floc
 %patch3 -p1 -b .caps
+%patch4 -p1 -b .wrong-inet6-host
+%patch5 -p1 -b .tracepath-back-count
 
 %build
 %ifarch s390 s390x
@@ -179,8 +183,12 @@ mv -f RELNOTES.tmp RELNOTES
 %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
 
 %changelog
-* Mon Jun  8 2015 Jan Synáček <jsynacek@redhat.com> - 20121221-6.1
-- ping does not work in dkr images (#1228606)
+* Wed Apr 29 2015 Jan Synáček <jsynacek@redhat.com> - 20121221-7
+- ping returns odd results with options inet6 in resolv.conf (#1210331)
+- count of "back" is not correct in tracepath (#1208372)
+
+* Mon Mar 23 2015 Jan Synáček <jsynacek@redhat.com> - 20121221-7
+- ping does not work in dkr images (#1142311)
 
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 20121221-6
 - Mass rebuild 2014-01-24