From patchwork Wed Jul 29 17:47:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 501778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 4EFC31402B7 for ; Thu, 30 Jul 2015 03:47:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B53B29209C; Wed, 29 Jul 2015 17:47:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dmvaViH9Hsj4; Wed, 29 Jul 2015 17:47:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 21CE3920E3; Wed, 29 Jul 2015 17:47:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0FFBB1C0B99 for ; Wed, 29 Jul 2015 17:47:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0A2F7A462D for ; Wed, 29 Jul 2015 17:47:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pFBHYeTMJFFc for ; Wed, 29 Jul 2015 17:47:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from zimbra3.corp.accelance.fr (zimbra3.corp.accelance.fr [213.162.49.233]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0DBD8A45CB for ; Wed, 29 Jul 2015 17:47:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by zimbra3.corp.accelance.fr (Postfix) with ESMTP id D7B387EFA2 for ; Wed, 29 Jul 2015 19:47:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra3.corp.accelance.fr Received: from zimbra3.corp.accelance.fr ([127.0.0.1]) by localhost (zimbra3.corp.accelance.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nkyKO97XkTR3; Wed, 29 Jul 2015 19:47:24 +0200 (CEST) Received: from atlas.localdomain (sch74-1-88-184-220-198.fbx.proxad.net [88.184.220.198]) by zimbra3.corp.accelance.fr (Postfix) with ESMTPSA id B186D7EF84; Wed, 29 Jul 2015 19:47:23 +0200 (CEST) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 29 Jul 2015 19:47:15 +0200 Message-Id: <1438192035-20476-1-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 2.4.3 Subject: [Buildroot] [PATCH] package/aircrack-ng: fix musl build 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" Backport an upstream patch [1] and remove sys/cdefs.h from ethernet.h as suggested by the musl wiki [2]. Fixes: http://autobuild.buildroot.net/results/9721496871d104b4cfb68ce133b5f48612cb7e50/ [1] https://github.com/aircrack-ng/aircrack-ng/commit/42de9f800056601443ac12edbba7bd5802740db2 [2] http://wiki.musl-libc.org/wiki/FAQ Signed-off-by: Romain Naour --- ...ide-ng-Use-termios-instead-of-sys-termios.patch | 27 +++++++++++ package/aircrack-ng/0004-fix-musl-build.patch | 53 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch create mode 100644 package/aircrack-ng/0004-fix-musl-build.patch diff --git a/package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch b/package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch new file mode 100644 index 0000000..a10ee45 --- /dev/null +++ b/package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch @@ -0,0 +1,27 @@ +From 42de9f800056601443ac12edbba7bd5802740db2 Mon Sep 17 00:00:00 2001 +From: Thomas d'Otreppe +Date: Wed, 8 Apr 2015 01:25:07 +0000 +Subject: [PATCH] Wesside-ng: Use termios instead of sys/termios. + +git-svn-id: http://svn.aircrack-ng.org/trunk@2533 28c6078b-6c39-48e3-add9-af49d547ecab +Signed-off-by: Romain Naour +--- + src/wesside-ng.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wesside-ng.c b/src/wesside-ng.c +index 711d8b7..f44438a 100644 +--- a/src/wesside-ng.c ++++ b/src/wesside-ng.c +@@ -33,7 +33,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +-- +2.4.3 + diff --git a/package/aircrack-ng/0004-fix-musl-build.patch b/package/aircrack-ng/0004-fix-musl-build.patch new file mode 100644 index 0000000..cc093d3 --- /dev/null +++ b/package/aircrack-ng/0004-fix-musl-build.patch @@ -0,0 +1,53 @@ +From da6e87670ad4639371da056f9e36201a9236dfa2 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 29 Jul 2015 19:38:46 +0200 +Subject: [PATCH] fix musl build + +aircrack-ng doesn't build with a musl toolchain due to +cdefs.h internal glibc header being used in internal +ethernet.h [1]. + +[1] http://wiki.musl-libc.org/wiki/FAQ + +Signed-off-by: Romain Naour +--- + src/include/ethernet.h | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/src/include/ethernet.h b/src/include/ethernet.h +index 72d5e81..e9d9236 100644 +--- a/src/include/ethernet.h ++++ b/src/include/ethernet.h +@@ -389,18 +389,20 @@ void ether_vlan_mtap(struct bpf_if *, struct mbuf *, + + #else /* _KERNEL */ + +-#include +- + /* + * Ethernet address conversion/parsing routines. + */ +-__BEGIN_DECLS +-struct ether_addr *ether_aton(const char *); +-int ether_hostton(const char *, struct ether_addr *); +-int ether_line(const char *, struct ether_addr *, char *); +-char *ether_ntoa(const struct ether_addr *); +-int ether_ntohost(char *, const struct ether_addr *); +-__END_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif ++ struct ether_addr *ether_aton(const char *); ++ int ether_hostton(const char *, struct ether_addr *); ++ int ether_line(const char *, struct ether_addr *, char *); ++ char *ether_ntoa(const struct ether_addr *); ++ int ether_ntohost(char *, const struct ether_addr *); ++#ifdef __cplusplus ++} ++#endif + + #endif /* !_KERNEL */ + +-- +2.4.3 +