From patchwork Tue Aug 11 08:42:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1343207 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=lrTUIfoK; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BQmY53nJRz9sTN for ; Tue, 11 Aug 2020 18:42:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 70A5E857E2; Tue, 11 Aug 2020 08:42:14 +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 32E5mh7hjh7P; Tue, 11 Aug 2020 08:42:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BB80285773; Tue, 11 Aug 2020 08:42:13 +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 1DAA31BF30B for ; Tue, 11 Aug 2020 08:42:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 09DAD20435 for ; Tue, 11 Aug 2020 08:42:12 +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 9B7x3yAPUFxD for ; Tue, 11 Aug 2020 08:42:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by silver.osuosl.org (Postfix) with ESMTPS id C34D62048F for ; Tue, 11 Aug 2020 08:42:09 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id 3so2041138wmi.1 for ; Tue, 11 Aug 2020 01:42:09 -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:mime-version :content-transfer-encoding; bh=0Np+w90ttAUBMNFdmsmgvd3QTc4xqiuu4KbN0Mqd9fA=; b=lrTUIfoKDbpRV2y8GpYtleRrFaJFWrNORLuiijldvc0Wfi3Jz71SdSM+D2sINRIjzG O5UqPeQvJ/tTO8O6mbtRCVwiNxYZ2J5TSb6wIEUDNasfKWJENBD9Dg3FjG012eHzRQuU ZP0kAMJWuWt5WvHfqQmOgCx9hivo6vV2pWYvNZOPl0CIK5x5E0hzWDA6CmCLylOagvO5 OLtZwDIMbc1Dpuo7lnVWmXdpRjyfjSeA/w/ecQKJFgu/XdP3JRZzb4tcgMT0pMUOIBX/ EKBoTy4XjmplaGDMSWWjHfzlOWDTZFp+mxAEt49IFKYv2bf4Lfs7pKwWLo4Ss0YjWJzA bDhQ== 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:mime-version :content-transfer-encoding; bh=0Np+w90ttAUBMNFdmsmgvd3QTc4xqiuu4KbN0Mqd9fA=; b=ICKRPRUUikNlqm2cBVxIAckXeOo43z84BCQ6fMtALDPQuphmIeNWasqvcFqAZsQ9De eZ66Ma3Bf//t4PM0xpTr7iZxxYZf8tpFpPR08oLKEHVAcsAsepBcgurMpyxQaLGaT8DP bOiB54inQBVd5JrjLzfxw+oMhoBC6lwqF5chAWrK5pNRvdTrw7X+RkrJFZba6IxW7kUK YWOOr7PK2ayozx/U2wZCs0IARE6hYjMTQbc05K+yPzpnqDDn46AivZmz1GKJ7qX0cgiE Yswcadl+EYJCCeFMCubtDWn6nHPn307iJdMs8EWvYk5PBGe+xFEs0dZGf55Okmd8O+Qj KP/Q== X-Gm-Message-State: AOAM531yUBi8Qq7b79ZMi1Icnmww3K5b2xr1r5jet8Gb7pCJo2M0uO0h RbN6jtzJvrXgjnO4dFw48LtK+y/2 X-Google-Smtp-Source: ABdhPJw7yqzO63wGjvq41YQsHorMFHmg1Zr4zRNaMfCq46yl79xOq9lcxDxSJWvQgRIyYa1p6PqQ9A== X-Received: by 2002:a1c:7405:: with SMTP id p5mr2926059wmc.130.1597135327696; Tue, 11 Aug 2020 01:42:07 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id t25sm3744726wmj.18.2020.08.11.01.42.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 01:42:06 -0700 (PDT) To: buildroot@buildroot.org Date: Tue, 11 Aug 2020 10:42:07 +0200 Message-Id: <20200811084207.1355635-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/aircrack-ng: fix build with gcc 10 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: , From: Fabrice Fontaine via buildroot Reply-To: Fabrice Fontaine Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/98ab591a88e06a985b0a7aac5abbf665289134b4 Signed-off-by: Fabrice Fontaine --- .../0001-Expand-packed-definition.patch | 26 +++++++ .../0002-Fix-duplicated-symbols.patch | 74 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 package/aircrack-ng/0001-Expand-packed-definition.patch create mode 100644 package/aircrack-ng/0002-Fix-duplicated-symbols.patch diff --git a/package/aircrack-ng/0001-Expand-packed-definition.patch b/package/aircrack-ng/0001-Expand-packed-definition.patch new file mode 100644 index 0000000000..f0c033a1aa --- /dev/null +++ b/package/aircrack-ng/0001-Expand-packed-definition.patch @@ -0,0 +1,26 @@ +From d4496006ac1e0c99908108b998ae39afb0658733 Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Tue, 7 Jul 2020 11:42:40 -0700 +Subject: [PATCH] Expand __packed definition. + +Signed-off-by: Joseph Benden +[Retrieved from: +https://github.com/aircrack-ng/aircrack-ng/commit/d4496006ac1e0c99908108b998ae39afb0658733] +Signed-off-by: Fabrice Fontaine +--- + lib/radiotap/radiotap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/radiotap/radiotap.h b/lib/radiotap/radiotap.h +index 57f784b8d..bb5a41dfc 100644 +--- a/lib/radiotap/radiotap.h ++++ b/lib/radiotap/radiotap.h +@@ -56,7 +56,7 @@ struct ieee80211_radiotap_header { + * @it_present: (first) present word + */ + uint32_t it_present; +-} __packed; ++} __attribute__((__packed__)); + + /* version is always 0 */ + #define PKTHDR_RADIOTAP_VERSION 0 diff --git a/package/aircrack-ng/0002-Fix-duplicated-symbols.patch b/package/aircrack-ng/0002-Fix-duplicated-symbols.patch new file mode 100644 index 0000000000..f181580808 --- /dev/null +++ b/package/aircrack-ng/0002-Fix-duplicated-symbols.patch @@ -0,0 +1,74 @@ +From f6f1396807607f5649d20631db517cfca3a1f5c4 Mon Sep 17 00:00:00 2001 +From: Joseph Benden +Date: Tue, 7 Jul 2020 11:44:40 -0700 +Subject: [PATCH] Fix duplicated symbols. + +Signed-off-by: Joseph Benden +[Retrieved from: +https://github.com/aircrack-ng/aircrack-ng/commit/f6f1396807607f5649d20631db517cfca3a1f5c4] +Signed-off-by: Fabrice Fontaine +--- + src/airodump-ng/airodump-ng.c | 2 -- + src/airventriloquist-ng/airventriloquist-ng.c | 6 +++--- + src/tkiptun-ng/tkiptun-ng.c | 4 ++-- + 3 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c +index 3ae6994dd..e72bc88e2 100644 +--- a/src/airodump-ng/airodump-ng.c ++++ b/src/airodump-ng/airodump-ng.c +@@ -92,8 +92,6 @@ + #include "radiotap/radiotap_iter.h" + + struct devices dev; +-uint8_t h80211[4096] __attribute__((aligned(16))); +-uint8_t tmpbuf[4096] __attribute__((aligned(16))); + + static const unsigned char llcnull[] = {0, 0, 0, 0}; + +diff --git a/src/airventriloquist-ng/airventriloquist-ng.c b/src/airventriloquist-ng/airventriloquist-ng.c +index ac6b7647e..267d95540 100644 +--- a/src/airventriloquist-ng/airventriloquist-ng.c ++++ b/src/airventriloquist-ng/airventriloquist-ng.c +@@ -173,7 +173,7 @@ static struct local_options + } lopt; + + struct devices dev; +-struct wif *_wi_in, *_wi_out; ++extern struct wif *_wi_in, *_wi_out; + + struct ARP_req + { +@@ -195,8 +195,8 @@ struct APt + }; + + unsigned long nb_pkt_sent; +-u_int8_t h80211[4096]; +-static u_int8_t tmpbuf[4096]; ++extern u_int8_t h80211[4096]; ++extern u_int8_t tmpbuf[4096]; + + static int tcp_test(const char * ip_str, const short port) + { +diff --git a/src/tkiptun-ng/tkiptun-ng.c b/src/tkiptun-ng/tkiptun-ng.c +index dc67f5d58..43db0bc23 100644 +--- a/src/tkiptun-ng/tkiptun-ng.c ++++ b/src/tkiptun-ng/tkiptun-ng.c +@@ -267,7 +267,7 @@ static struct local_options + + // unused, but needed for link + struct devices dev; +-struct wif *_wi_in, *_wi_out; ++extern struct wif *_wi_in, *_wi_out; + + struct ARP_req + { +@@ -289,7 +289,7 @@ struct APt + }; + + unsigned long nb_pkt_sent; +-unsigned char h80211[4096]; ++extern unsigned char h80211[4096]; + static unsigned char srcbuf[4096]; + static char strbuf[512]; + static int alarmed;