From patchwork Thu Jan 21 03:31:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 571019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3A58B1402EC for ; Thu, 21 Jan 2016 14:31:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=bDLvPxAL; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1237D88A50; Thu, 21 Jan 2016 03:31:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xvYOKiNYVaBK; Thu, 21 Jan 2016 03:31:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0E50A8852C; Thu, 21 Jan 2016 03:31:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 484CD1C1094 for ; Thu, 21 Jan 2016 03:31:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 436588852C for ; Thu, 21 Jan 2016 03:31:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lyLZhc3QwjoA for ; Thu, 21 Jan 2016 03:31:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1E2EB865E7 for ; Thu, 21 Jan 2016 03:31:53 +0000 (UTC) Received: by mail-io0-f196.google.com with SMTP id q21so3252330iod.3 for ; Wed, 20 Jan 2016 19:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=eewmWwyRfdd2ZIXyGQJBIV7ZiH13ZTj/KsmKajPAzls=; b=bDLvPxAL3IL6J7bK9ymvSm3PjzrBpsYWO1ilgvW5txEUix/WYu9jX4A0ZITyHsBkCp LSw5ZG/Ejg18wj4EHAZtUIiGmbBrZtxJ9bjwXe4spTpaQ0IaXPIke0fTueBo+Vm47mmd WTv3ho5suj4+1gpOc5LtqNxDQn7dEXtv8YxnAu1UU4H5ShWipS5ZR7k/vLNZhjfhH1bn q98qmcjChJM6eL9c5X2YC9kyCXB+8tJnEJa3VwIqvZuzd8wuiOkU+aEK7klhQYMGI80O N7S2qMbSYhTy1lS+Zs2kYVJyXmycCE6+8EeBm4FEr3K7pGCAGyTCvGn2E5beiA2h5qST MeBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=eewmWwyRfdd2ZIXyGQJBIV7ZiH13ZTj/KsmKajPAzls=; b=BC4E0DUQFa8ofrdnd9JkoF5N1+unQ/whrF7mTZIL1viKrOB0NyJWAFhlTcOOhYmCdq n2xJo0OV4Mm7xsq235j1jZlILJuA+JyJjfH7H1yMgc70F6ukMjydzrH5/WD/+oVaGv3F QuwGXoLYLKdr82b6SMG2XpZrGT70jTZ9lh7aj7vwLjO6iU7oM//Egi2o86FSxemfR8Yy PTDTVONGSkpCJnPVgOPjNlVABtWPbfx/3+Zcqt//BERQxMzVCE77JYzssMu9erl90Wex l54dGLPtmoTDmqtpTyvTOyd88ZHlxzTotBJgJyqYgSCfip1tyGDoAanVUB/1wgmxd1MQ AbDA== X-Gm-Message-State: ALoCoQkntN90SUlouXiftXglEA+5/IQwOW64o7dgYoWUmVWAJWwrgzMoCnImicx5H10lf85ULQfuU61ZXCQojVrJdEBRwBKqPw== X-Received: by 10.107.19.203 with SMTP id 72mr41217145iot.41.1453347112328; Wed, 20 Jan 2016 19:31:52 -0800 (PST) Received: from buildroot.c.rising-medley-111118.internal (119.72.154.104.bc.googleusercontent.com. [104.154.72.119]) by smtp.gmail.com with ESMTPSA id p18sm497745ioi.1.2016.01.20.19.31.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 19:31:51 -0800 (PST) From: Matt Weber To: buildroot@buildroot.org Date: Thu, 21 Jan 2016 03:31:47 +0000 Message-Id: <1453347107-2275-1-git-send-email-matt@thewebers.ws> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v4 1/1] iputils: resolve musl compatibility X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The new upstream is a fork of the original that consolidates other distro's patches. This fork resolves a series of musl build failures noted in the autobuilder log. http://autobuild.buildroot.net/results/12cb73f3def95efe706bcd957bc2c091e7931d5a/ - Updated to github fork, selected merge from Nov 3 2015 which provided musl fixes (last release was to old, 20150815) - Why the fork ? (http://www.spinics.net/lists/netdev/msg279881.html) - Added missing dependencies for kernel capabilies lib - Accounted for new consolidated ping (ipv4/6) Tested against a buildroot arm musl/glibc toolchains, as well as autobuilder defconfig. Signed-off-by: Matt Weber --- v3 -> v4 - Made libcap optional and if selected set make ops (Suggested by Thomas) v2 -> v3 - Added comment about fork status (Suggested by Thomas) v1 -> v2 - Removed old hash (Suggested by Thomas) - Added libcap depends to Config.in (Suggested by Thomas) - Moved comments up to commit log (Suggested by Thomas) .../0001-ping-ping6-Fix-hang-with-f-option.patch | 34 ---------------------- package/iputils/Config.in | 2 +- package/iputils/iputils.hash | 4 +-- package/iputils/iputils.mk | 29 +++++++++++------- 4 files changed, 22 insertions(+), 47 deletions(-) delete mode 100644 package/iputils/0001-ping-ping6-Fix-hang-with-f-option.patch diff --git a/package/iputils/0001-ping-ping6-Fix-hang-with-f-option.patch b/package/iputils/0001-ping-ping6-Fix-hang-with-f-option.patch deleted file mode 100644 index fe1ab77..0000000 --- a/package/iputils/0001-ping-ping6-Fix-hang-with-f-option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 712fddacfb5c4a8a48d9c5debe1870bc051d836c Mon Sep 17 00:00:00 2001 -From: YOSHIFUJI Hideaki -Date: Tue, 6 Nov 2012 02:44:12 +0900 -Subject: [PATCH] ping,ping6: Fix hang with -f option. - -Bug was introduced by commit 8feb586c4... (ping,ping6: Check return -value of write(2) for stdout.). - -https://bugs.archlinux.org/task/32306 - -Patch-by: Jan Synacek -Reported-by: Mohammad Alsaleh -Signed-off-by: YOSHIFUJI Hideaki -Signed-off-by: Peter Korsgaard ---- - ping_common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ping_common.h b/ping_common.h -index d2a2b5c..6726e1b 100644 ---- a/ping_common.h -+++ b/ping_common.h -@@ -140,7 +140,7 @@ static inline void write_stdout(const char *str, size_t len) - do { - cc = write(STDOUT_FILENO, str + o, len - o); - o += cc; -- } while (len >= o || cc < 0); -+ } while (len > o || cc < 0); - } - - /* --- -2.1.3 - diff --git a/package/iputils/Config.in b/package/iputils/Config.in index 5324639..40580d2 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_IPUTILS This package is set of small useful utilities for Linux networking. It includes complete versions of ping, traceroute, etc. - http://sourceforge.net/projects/iputils/ + https://github.com/iputils/iputils diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index 21a2044..e32e134 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,2 +1,2 @@ -# From http://sourceforge.net/projects/iputils/files/ -sha1 3e85179746fd93000d6267bd55addfe97f321ba7 iputils-s20121011.tar.bz2 +# Locally computed +sha256 0e98cb527fa175d1e08afb969c124e452b30968f10ec2c3b078f1440c8977a94 iputils-c8ff6feaf0442f8efd96ccb415770c54f9e84d47.tar.gz diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 7510d99..6392dec 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -4,10 +4,16 @@ # ################################################################################ -IPUTILS_VERSION = s20121011 -IPUTILS_SITE = http://www.skbuff.net/iputils -IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2 -IPUTILS_LICENSE = GPLv2+, BSD-3c +# The original upstream was forked to the github repository in 2014 to +# pull fixes from other distribution and centralize the changes after +# the upstream seemed to have gone dormant. The fork contains the +# latest changes including msul support, removing a libsysfs dependency +# and IPv6 updates. +# http://www.spinics.net/lists/netdev/msg279881.html + +IPUTILS_VERSION = c8ff6feaf0442f8efd96ccb415770c54f9e84d47 +IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) +IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING IPUTILS_DEPENDENCIES = openssl @@ -18,11 +24,15 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) IPUTILS_DEPENDENCIES += busybox endif -# Disabling CAP_SETPCAP (file capabilities) -IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - arping clockdiff ping rarpd rdisc tftpd tracepath \ - ping6 tracepath6 traceroute6 +IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +IPUTILS_MAKE_OPTS += USE_CAP=yes +IPUTILS_DEPENDENCIES += libcap +else +IPUTILS_MAKE_OPTS += USE_CAP=no +endif define IPUTILS_BUILD_CMDS $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) @@ -36,7 +46,6 @@ define IPUTILS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath - $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 endef