From patchwork Mon Mar 16 10:54:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 450483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5B3991400D5 for ; Mon, 16 Mar 2015 21:54:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 990C233064; Mon, 16 Mar 2015 10:54:46 +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 76a4canIKzhS; Mon, 16 Mar 2015 10:54:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4C24E2FC6A; Mon, 16 Mar 2015 10:54:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7EEF41C242B for ; Mon, 16 Mar 2015 10:54:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 79D002FD4D for ; Mon, 16 Mar 2015 10:54:39 +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 jD34uQfCrdhV for ; Mon, 16 Mar 2015 10:54:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx02.posteo.de (mx02.posteo.de [89.146.194.165]) by silver.osuosl.org (Postfix) with ESMTPS id E5B892FC6A for ; Mon, 16 Mar 2015 10:54:36 +0000 (UTC) Received: from dovecot03.posteo.de (unknown [185.67.36.28]) by mx02.posteo.de (Postfix) with ESMTPS id 7E2D31139157 for ; Mon, 16 Mar 2015 11:54:34 +0100 (CET) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3l5DzF6s31z5vND for ; Mon, 16 Mar 2015 11:54:33 +0100 (CET) Received: from timelineX.localdomain (ip5b401a2a.dynamic.kabel-deutschland.de [91.64.26.42]) (Authenticated sender: joerg.krause@embedded.rocks) by embedded.rocks (Postfix) with ESMTPSA id BA63C980048; Mon, 16 Mar 2015 11:54:32 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Mon, 16 Mar 2015 11:54:58 +0100 Message-Id: <1426503299-17058-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.3.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: bump to version 2.4 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also: - remove patches: merged upstream - update hash Signed-off-by: Jörg Krause --- .../wpa_supplicant/0001-fix-musl-build-error.patch | 45 ---------------------- ...02-use-correct-include-path-for-libnl-3.0.patch | 26 ------------- package/wpa_supplicant/wpa_supplicant.hash | 4 +- package/wpa_supplicant/wpa_supplicant.mk | 2 +- 4 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 package/wpa_supplicant/0001-fix-musl-build-error.patch delete mode 100644 package/wpa_supplicant/0002-use-correct-include-path-for-libnl-3.0.patch diff --git a/package/wpa_supplicant/0001-fix-musl-build-error.patch b/package/wpa_supplicant/0001-fix-musl-build-error.patch deleted file mode 100644 index 08f63df..0000000 --- a/package/wpa_supplicant/0001-fix-musl-build-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ccc079dc16e70844bb28e84d00bd26b61ecc755c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 3 Dec 2014 22:29:29 +0100 -Subject: [PATCH 1/1] fix musl build error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building wpa_supplicant with the musl C library fails since musl does not -define type names such as '__uint32_t'. To support building wpa_supplicant -with the musl C library use the integer types declared in the ISO C standard -header file . - -Signed-off-by: Jörg Krause ---- - src/drivers/linux_wext.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/drivers/linux_wext.h b/src/drivers/linux_wext.h -index 55cf955..e7c7001 100644 ---- a/src/drivers/linux_wext.h -+++ b/src/drivers/linux_wext.h -@@ -19,13 +19,13 @@ - #define _LINUX_SOCKET_H - #define _LINUX_IF_H - --#include -+#include - #include --typedef __uint32_t __u32; --typedef __int32_t __s32; --typedef __uint16_t __u16; --typedef __int16_t __s16; --typedef __uint8_t __u8; -+typedef uint32_t __u32; -+typedef int32_t __s32; -+typedef uint16_t __u16; -+typedef int16_t __s16; -+typedef uint8_t __u8; - #ifndef __user - #define __user - #endif /* __user */ --- -2.1.3 - diff --git a/package/wpa_supplicant/0002-use-correct-include-path-for-libnl-3.0.patch b/package/wpa_supplicant/0002-use-correct-include-path-for-libnl-3.0.patch deleted file mode 100644 index 6ed0eed..0000000 --- a/package/wpa_supplicant/0002-use-correct-include-path-for-libnl-3.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4426de35f0e5dd5b0152474ce6a885b73de60656 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 16 Dec 2014 23:50:33 +0100 -Subject: [PATCH 2/2] use correct include path for libnl-3.0 - -Signed-off-by: Romain Naour ---- - src/drivers/drivers.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak -index cdb913e..e9fc83c 100644 ---- a/src/drivers/drivers.mak -+++ b/src/drivers/drivers.mak -@@ -35,7 +35,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - ifdef CONFIG_LIBNL3_ROUTE - DRV_LIBS += -lnl-route-3 - DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE --- -1.9.3 - diff --git a/package/wpa_supplicant/wpa_supplicant.hash b/package/wpa_supplicant/wpa_supplicant.hash index 947ae23..37a9fee 100644 --- a/package/wpa_supplicant/wpa_supplicant.hash +++ b/package/wpa_supplicant/wpa_supplicant.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a wpa_supplicant-2.3.tar.gz +# Locally calculated with: sha256sum wpa_supplicant-2.4.tar.gz +sha256 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122 wpa_supplicant-2.4.tar.gz diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 682cb4c..3ab8e05 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPA_SUPPLICANT_VERSION = 2.3 +WPA_SUPPLICANT_VERSION = 2.4 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c WPA_SUPPLICANT_LICENSE_FILES = README