a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From f6f1396807607f5649d20631db517cfca3a1f5c4 Mon Sep 17 00:00:00 2001
|
|
From: Joseph Benden <joe@benden.us>
|
|
Date: Tue, 7 Jul 2020 11:44:40 -0700
|
|
Subject: [PATCH] Fix duplicated symbols.
|
|
|
|
Signed-off-by: Joseph Benden <joe@benden.us>
|
|
[Retrieved from:
|
|
https://github.com/aircrack-ng/aircrack-ng/commit/f6f1396807607f5649d20631db517cfca3a1f5c4]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
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;
|