From patchwork Sun Mar 17 16:05:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1057520 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sNcHMjzT"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44MkgX20xKz9s7h for ; Mon, 18 Mar 2019 03:05:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2BB7924856; Sun, 17 Mar 2019 16:05:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pXiOnYRO4vIB; Sun, 17 Mar 2019 16:05:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9CE6027FA1; Sun, 17 Mar 2019 16:05:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 148EE1BF360 for ; Sun, 17 Mar 2019 16:05:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1047327FA1 for ; Sun, 17 Mar 2019 16:05:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 99EizPX2wX0p for ; Sun, 17 Mar 2019 16:05:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by silver.osuosl.org (Postfix) with ESMTPS id EE72724856 for ; Sun, 17 Mar 2019 16:05:34 +0000 (UTC) Received: by mail-wm1-f50.google.com with SMTP id f3so10789960wmj.4 for ; Sun, 17 Mar 2019 09:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Uil6akKqc265tQgca5Tl5LVb2OOCsR0B83UTPgrFj6U=; b=sNcHMjzTLsuE7CPOqOfYb/SHe+pxQwqJfqfaFoVEkN4NCdRd1YVS1rNXROoZMpkfHh il1YfABbn0frSFDt+Rh3WqXlBZtEZI6KBaAFMxM5tMkva5bbH1YrV8fvwbUG+xYE1pcl 4rzzshFLlTMT0MYr/suI6uL0MMOonkrwwLR8OJS4LeLOrfpAgvQAOR0UDgNFYM3wEhVu XdQw86VHkxZJgYUdy0WGWTImKCko6uI4f0hvO06UAl+fYVlqxpaKyF5ljEosXF6X3Mhj eG3mBoDgKYeXGYP8kuAXLxyfdMDx4d3xXyc/l1HDSx9W2K4M9KwevPKYfE581V4YgZuO DjXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Uil6akKqc265tQgca5Tl5LVb2OOCsR0B83UTPgrFj6U=; b=nUYY8vWTgNBT6ymu5y5QOofZsVGsScfO3CEHh8XU34YMZiI1N7SDQI9vFRKQ8ZJB0t Vp6sQIeXqsOfxAASuuHNwqCyoc85filnBP9QsHafZO9RDznDGMtWJMeuba1+AAaaCst7 IDTwDuU2Obin6hBARGB9Zr3scAEJRNao2vvhfY0VtGwsQB1ThRky5TYb7OeGrS8MO/9i vZE6ceUxewu9OrAx9wkznahw00tiVOzSble6MN1eDjEJAJv+iEt3OCSotBIZ9pDIyrS0 B7c7ioTHaV+uPN5Th5jcYjCHuWorDXluBdrCrmb6ediPuMRZrU0+oRwjXR6OnLueyAkf gaPA== X-Gm-Message-State: APjAAAW/+FUcm9Dr6V8mjO9vmqQ3H2bdcKP1bnX2JgdTx1yQpQBlg3Bz z7ZSLXPJapYj6iEw03FXLEcx5uVp X-Google-Smtp-Source: APXvYqyglIgE2PD6GWvSba2khA06ySRLBwdmCovwdkDTGi4JHOQK0SIuA8bCLZ3b2VC+NOonGwPuYg== X-Received: by 2002:a7b:cf23:: with SMTP id m3mr3303027wmg.96.1552838733072; Sun, 17 Mar 2019 09:05:33 -0700 (PDT) Received: from fabrice-VirtualBox.home (lfbn-ren-1-128-3.w83-205.abo.wanadoo.fr. [83.205.212.3]) by smtp.gmail.com with ESMTPSA id f11sm3346749wrp.76.2019.03.17.09.05.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Mar 2019 09:05:31 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 17 Mar 2019 17:05:19 +0100 Message-Id: <20190317160519.28904-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] package/wpan-tools: bump to version 0.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Switch site to github - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine --- ...tras.h-fix-compatibility-with-libnl-3.3.0.patch | 49 ---------------------- package/wpan-tools/wpan-tools.hash | 7 ++-- package/wpan-tools/wpan-tools.mk | 7 ++-- 3 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch diff --git a/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch b/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch deleted file mode 100644 index 8b881ad3ae..0000000000 --- a/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bb522bd584f05e6658d5dba97f48ca018f46394c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 May 2017 14:36:08 +0200 -Subject: [PATCH] src/nl_extras.h: fix compatibility with libnl 3.3.0 - -nl_extras.h defines a set of nla_set_s*() functions if not provided by -libnl. They are provided by libnl since version 3.2.26. The test -(LIBNL_VER_MIC <= 26) was working fine while libnl was in the 3.2.x -series, but now that they have incremented the minor version, the -micro version was reset to 0, with the latest libnl version being -3.3.0. - -Due to this, the condition (LIBNL_VER_MIC <= 26) is true, and we get -redefinition errors because nl_extras.h redefines functions already -provided by libnl. - -This commit improves the condition so that nl_extras.h provides the -missing functions only if the minor version is < 2, or if minor is 2 -and micro is < 26. - -Signed-off-by: Thomas Petazzoni ---- - src/nl_extras.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/nl_extras.h b/src/nl_extras.h -index c4d1d14..37844f9 100644 ---- a/src/nl_extras.h -+++ b/src/nl_extras.h -@@ -1,7 +1,7 @@ - #ifndef __NL_EXTRAS_H - #define __NL_EXTRAS_H - --#if LIBNL_VER_MIC <= 26 -+#if (LIBNL_VER_MIN < 2) || (LIBNL_VER_MIN == 2) && (LIBNL_VER_MIC <= 26) - - #ifndef NLA_S8 - -@@ -45,6 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla) - - #endif /* NLA_S64 */ - --#endif /* LIBNL_VER_MIC */ -+#endif /* LIBNL_VER_* */ - - #endif /* __NL_EXTRAS_H */ --- -2.7.4 - diff --git a/package/wpan-tools/wpan-tools.hash b/package/wpan-tools/wpan-tools.hash index cfad89aa00..c9f0df2c1b 100644 --- a/package/wpan-tools/wpan-tools.hash +++ b/package/wpan-tools/wpan-tools.hash @@ -1,4 +1,3 @@ -# From http://wpan.cakelab.org/releases/md5sum -md5 91f0b640ff66910e977fab6525625624 wpan-tools-0.7.tar.xz -# Calculated based on the hash above -sha256 c16de9d7861c2d9b6a4436a0fac730f9f545ee290b92bc770c538ec6a3f22309 wpan-tools-0.7.tar.xz +# Locally calculated +sha256 3e509d9ed838df1247cc9a0c6ca483cb356ae778851817bd7410044687b655e2 wpan-tools-0.9.tar.gz +sha256 fe8e595c24d821a60885eb259619df5e5e3976c48465fde0be29fcd78530798f COPYING diff --git a/package/wpan-tools/wpan-tools.mk b/package/wpan-tools/wpan-tools.mk index d5e43a92c8..d8898a7299 100644 --- a/package/wpan-tools/wpan-tools.mk +++ b/package/wpan-tools/wpan-tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -WPAN_TOOLS_VERSION = 0.7 -WPAN_TOOLS_SOURCE = wpan-tools-$(WPAN_TOOLS_VERSION).tar.xz -WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases +WPAN_TOOLS_VERSION = 0.9 +WPAN_TOOLS_SITE = $(call github,linux-wpan,wpan-tools,wpan-tools-$(WPAN_TOOLS_VERSION)) WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl WPAN_TOOLS_LICENSE = ISC WPAN_TOOLS_LICENSE_FILES = COPYING +# From git +WPAN_TOOLS_AUTORECONF = YES $(eval $(autotools-package))