Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at 2015-04-27 22:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iputils (Old) and /work/SRC/openSUSE:Factory/.iputils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iputils" Changes: -------- --- /work/SRC/openSUSE:Factory/iputils/iputils.changes 2014-01-29 07:15:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iputils.new/iputils.changes 2015-04-27 22:07:04.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 20 17:07:42 CEST 2015 - [email protected] + +- Fix a bogus kernel version check (boo#927831): + iputils-remove-bogus-check-required-for-2.4.9-kernels.patch + +------------------------------------------------------------------- New: ---- iputils-remove-bogus-check-required-for-2.4.9-kernels.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.NLOb1p/_old 2015-04-27 22:07:05.000000000 +0200 +++ /var/tmp/diff_new_pack.NLOb1p/_new 2015-04-27 22:07:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iputils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,8 @@ Patch3: iputils-ifenslave.diff Patch8: iputils-s20101006-sec-ping-unblock.diff Patch9: iputils-s20101006-ping-interrupt.diff +# PATCH-FIX-UPSTREAM iputils-remove-bogus-check-required-for-2.4.9-kernels.patch [email protected] - boo#927831 +Patch10: iputils-remove-bogus-check-required-for-2.4.9-kernels.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -50,6 +52,7 @@ %patch3 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build make %{?_smp_mflags} KERNEL_INCLUDE=$PWD \ ++++++ iputils-remove-bogus-check-required-for-2.4.9-kernels.patch ++++++ >From 5bb0f0a8b0ed6f111a329c0d6911dfa516ab1d42 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans <[email protected]> Date: Fri, 18 Apr 2014 15:47:29 +0200 Subject: [PATCH] remove bogus check required for < 2.4.9 kernels Debian bug: #709052 --- ping.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/ping.c b/ping.c index b9d649531621..f9f4a28f5dc1 100644 --- a/ping.c +++ b/ping.c @@ -654,17 +654,6 @@ int receive_error_msg() acknowledge(ntohs(icmph.un.echo.sequence)); - if (!working_recverr) { - struct icmp_filter filt; - working_recverr = 1; - /* OK, it works. Add stronger filter. */ - filt.data = ~((1<<ICMP_SOURCE_QUENCH)| - (1<<ICMP_REDIRECT)| - (1<<ICMP_ECHOREPLY)); - if (setsockopt(icmp_sock, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt)) == -1) - perror("\rWARNING: setsockopt(ICMP_FILTER)"); - } - net_errors++; nerrors++; if (options & F_QUIET) @@ -820,19 +809,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) icp->type != ICMP_SOURCE_QUENCH); if (error_pkt) { acknowledge(ntohs(icp1->un.echo.sequence)); - if (working_recverr) { - return 0; - } else { - static int once; - /* Sigh, IP_RECVERR for raw socket - * was broken until 2.4.9. So, we ignore - * the first error and warn on the second. - */ - if (once++ == 1) - fprintf(stderr, "\rWARNING: kernel is not very fresh, upgrade is recommended.\n"); - if (once == 1) - return 0; - } + return 0; } nerrors+=error_pkt; if (options&F_QUIET) -- 2.3.5
