Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at 2014-01-29 07:15:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-11-15 13:22:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iputils.new/iputils.changes 2014-01-29 07:15:11.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Jan 28 08:13:46 CET 2014 - [email protected] + +- Fixed ping segfaults (bnc#860616,bnc#860655) + * Removed iputils-pingnamelookuponce.diff + +------------------------------------------------------------------- +Thu Jan 23 11:02:06 CET 2014 - [email protected] + +- Update to upstream version s20121221 (FATE#316211) + - See RELNOTES for full changelog +- Removed merges patches: + * iputils-pingtypo.diff + * iputils-s20101006-capabilities.diff +- Updated patches for apply +- Remove libsysfs dependency (FATE#316211) + +------------------------------------------------------------------- Old: ---- iputils-pingnamelookuponce.diff iputils-pingtypo.diff iputils-s20101006-capabilities.diff iputils-s20101006.tar.bz2 New: ---- iputils-s20121221.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.IdWNfb/_old 2014-01-29 07:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.IdWNfb/_new 2014-01-29 07:15:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package iputils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,29 +19,21 @@ Name: iputils BuildRequires: docbook_3 BuildRequires: iso_ent +BuildRequires: libcap-devel BuildRequires: libopenssl-devel BuildRequires: opensp BuildRequires: perl-SGMLS -%if 0%{?suse_version} > 1130 -BuildRequires: sysfsutils-devel -%else -BuildRequires: sysfsutils -%endif -BuildRequires: libcap-devel Summary: IPv4 and IPv6 Networking Utilities License: BSD-3-Clause and GPL-2.0+ Group: Productivity/Networking/Other -Version: s20101006 +Version: s20121221 Release: 0 Url: http://www.skbuff.net/iputils Source: http://www.skbuff.net/iputils/iputils-%{version}.tar.bz2 # XXX: from linux/Documentation/networking/ifenslave.c Source1: ifenslave.c -Patch1: iputils-pingnamelookuponce.diff Patch2: iputils-traceroute6-stdint.diff Patch3: iputils-ifenslave.diff -Patch6: iputils-s20101006-capabilities.diff -Patch7: iputils-pingtypo.diff Patch8: iputils-s20101006-sec-ping-unblock.diff Patch9: iputils-s20101006-ping-interrupt.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,23 +46,16 @@ %prep %setup -q cp -a %SOURCE1 . -%patch1 -%patch2 +%patch2 -p1 %patch3 -#patch4 -#patch5 -%patch6 -p1 -%patch7 -%patch8 -%patch9 -mkdir linux -touch linux/autoconf.h +%patch8 -p1 +%patch9 -p1 %build make %{?_smp_mflags} KERNEL_INCLUDE=$PWD \ CCOPT='%optflags -fno-strict-aliasing -fpie -D_GNU_SOURCE' \ LDLIBS='-Wl,-z,relro,-z,now -pie -lcap -lresolv' \ - CAPABILITIES=1 + CAPABILITIES=1 LDFLAG_GNUTLS='-lcrypto -lssl' gcc $RPM_OPT_FLAGS -o ifenslave ifenslave.c make man ++++++ iputils-s20101006-ping-interrupt.diff ++++++ --- /var/tmp/diff_new_pack.IdWNfb/_old 2014-01-29 07:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.IdWNfb/_new 2014-01-29 07:15:12.000000000 +0100 @@ -1,6 +1,18 @@ ---- ping.c 2013-07-23 11:15:15.851715020 +0200 -+++ ping.c 2013-07-23 11:15:28.075824028 +0200 -@@ -103,6 +103,7 @@ +From 41e442fea26f20ceb815306777d36361575825cc Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke <[email protected]> +Date: Mon, 26 Aug 2013 13:05:01 +0200 +Subject: Allow ping to be interrupted + +Signed-off-by: Hannes Reinecke <[email protected]> +--- + ping.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/ping.c b/ping.c +index 0357c3d..83a7aad 100644 +--- a/ping.c ++++ b/ping.c +@@ -103,6 +103,7 @@ static void usage(void) __attribute__((noreturn)); static u_short in_cksum(const u_short *addr, int len, u_short salt); static void pr_icmph(__u8 type, __u8 code, __u32 info, struct icmphdr *icp); static int parsetos(char *str); @@ -8,7 +20,7 @@ static struct { struct cmsghdr cm; -@@ -266,6 +267,8 @@ +@@ -262,6 +263,8 @@ main(int argc, char **argv) options |= F_SOURCEROUTE; } } @@ -17,8 +29,8 @@ while (argc > 0) { target = *argv; -@@ -1273,3 +1276,9 @@ - " [-T tstamp-options] [-Q tos] [hop1 ...] destination\n"); +@@ -1398,3 +1401,9 @@ void usage(void) + ); exit(2); } + @@ -27,3 +39,6 @@ + exit (1); +} + +-- +1.8.1.4 + ++++++ iputils-s20101006-sec-ping-unblock.diff ++++++ --- /var/tmp/diff_new_pack.IdWNfb/_old 2014-01-29 07:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.IdWNfb/_new 2014-01-29 07:15:12.000000000 +0100 @@ -1,8 +1,27 @@ ---- ping.c 2013-07-23 11:02:26.364843595 +0200 -+++ ping.c 2013-07-23 11:02:32.740900627 +0200 -@@ -129,6 +129,16 @@ - cap_t caps; - #endif +From bf83678619dd0286f7a66f2ab02763751b0e8ca9 Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke <[email protected]> +Date: Mon, 26 Aug 2013 13:02:36 +0200 +Subject: Block SIGALRM in ping.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ping depends on SIGALRM to exit eventually, so we need to mask +it with UNBLOCK. + +Signed-off-by: Marcus Schäfer <[email protected]> +Signed-off-by: Hannes Reinecke <[email protected]> +--- + ping.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/ping.c b/ping.c +index 71b445d..0357c3d 100644 +--- a/ping.c ++++ b/ping.c +@@ -139,6 +139,16 @@ main(int argc, char **argv) + + enable_capability_raw(); + /* + * ping depend on SIGALARM to exit sometimes, @@ -17,3 +36,6 @@ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); socket_errno = errno; +-- +1.8.1.4 + ++++++ iputils-s20101006.tar.bz2 -> iputils-s20121221.tar.bz2 ++++++ ++++ 14488 lines of diff (skipped) ++++++ iputils-traceroute6-stdint.diff ++++++ --- /var/tmp/diff_new_pack.IdWNfb/_old 2014-01-29 07:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.IdWNfb/_new 2014-01-29 07:15:12.000000000 +0100 @@ -1,6 +1,18 @@ ---- traceroute6.c -+++ traceroute6.c 2004/09/03 09:38:22 -@@ -230,6 +230,7 @@ +From 9c60c5877436c2feabe55ff91f6d279564fe1a31 Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke <[email protected]> +Date: Thu, 23 Jan 2014 10:32:36 +0100 +Subject: traceroute6: Include stdint.h + +Signed-off-by: Hannes Reinecke <[email protected]> +--- + traceroute6.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/traceroute6.c b/traceroute6.c +index 0538d4b..7205fa3 100644 +--- a/traceroute6.c ++++ b/traceroute6.c +@@ -230,6 +230,7 @@ char copyright[] = * Tue Dec 20 03:50:13 PST 1988 */ @@ -8,3 +20,6 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> +-- +1.8.1.4 + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
