[iputils/f17: 3/7] Drop subint patch and make SO_BINDTODEVICE failure fatal

[jsynacek]

commit 81c9549577c93675ec7fdff67e4c928253c65f09
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Fri Dec 7 14:50:31 2012 +0100

    Drop subint patch and make SO_BINDTODEVICE failure fatal

 iputils-20020927-ping-subint.patch         |   12 ------------
 iputils-s20101006-sobinddevice-fatal.patch |   14 ++++++++++++++
 iputils.spec                               |    5 +++--
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/iputils-s20101006-sobinddevice-fatal.patch b/iputils-s20101006-sobinddevice-fatal.patch
new file mode 100644
index 0000000..cd9ab78
--- /dev/null
+++ b/iputils-s20101006-sobinddevice-fatal.patch
@@ -0,0 +1,14 @@
+Make SO_BINDTODEVICE failure fatal. Backported from upstream.
+
+--- iputils-s20101006/ping.c.orig	2012-12-07 14:41:56.000000000 +0100
++++ iputils-s20101006/ping.c	2012-12-07 14:42:42.665039189 +0100
+@@ -325,6 +325,9 @@ main(int argc, char **argv)
+ 						perror("ping: IP_MULTICAST_IF");
+ 						exit(2);
+ 					}
++				} else {
++					perror("ping: SO_BINDTODEVICE");
++					exit(2);
+ 				}
+ 			}
+ 		}
diff --git a/iputils.spec b/iputils.spec
index 325e3ed..3fd5afe 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -15,7 +15,6 @@ Source5: rdisc.sysconfig
 Patch0: iputils-20020927-rh.patch
 Patch1: iputils-20020124-countermeasures.patch
 Patch2: iputils-20020927-addrcache.patch
-Patch3: iputils-20020927-ping-subint.patch
 Patch4: iputils-ping_cleanup.patch
 Patch5: iputils-ifenslave.patch
 Patch6: iputils-20070202-idn.patch
@@ -31,6 +30,7 @@ Patch16: iputils-20101006-man.patch
 Patch17: iputils-20101006-eth.patch
 Patch18: iputils-20101006-rr.patch
 Patch21: iputils-20101006-caps.patch
+Patch22: iputils-s20101006-sobinddevice-fatal.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: docbook-utils perl-SGMLSpm
@@ -72,7 +72,6 @@ The iputils-sysvinit contains SysV initscritps support.
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .countermeasures
 %patch2 -p1 -b .addrcache
-%patch3 -p1 -b .ping-subint
 %patch4 -p1 -b .cleanup
 %patch5 -p1 -b .addr
 %patch6 -p1 -b .idn
@@ -88,6 +87,7 @@ The iputils-sysvinit contains SysV initscritps support.
 %patch17 -p1 -b .eth
 %patch18 -p1 -b .rr
 %patch21 -p1 -b .caps
+%patch22 -p1 -b .sobinddevice-fatal
 
 %build
 %ifarch s390 s390x
@@ -194,6 +194,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Fri Dec 07 2012 Jan Synáček <jsynacek at redhat.com> 20101006-16
 - Backport capability handling from master (fixes #870722 - ping -I interface
   isn't working) and drop unnecessary patches
+- Drop subint patch and make SO_BINDTODEVICE failure fatal
 
 * Mon Jun 25 2012 Jan Synáček <jsynacek at redhat.com> 20101006-15
 - Ping fixes: