From 1b40010b3f24c33cad7fba418cb1a126fa4451ee Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Thu, 9 Nov 2023 21:08:32 +0100
Subject: [PATCH] v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
---
 Makefile                    | 10 +---------
 builder/data/usr/bin/pwnlib |  9 +++++++--
 builder/orangepi.yml        |  1 -
 builder/raspberrypi32.yml   |  1 -
 builder/raspberrypi64.yml   |  1 -
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 692acad6..42c7a78b 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ langs:
 		./scripts/language.sh compile $$(basename $$lang); \
 	done
 
+image:
 PACKER := /tmp/pwnagotchi/packer
 PACKER_URL := https://releases.hashicorp.com/packer/$(PACKER_VERSION)/packer_$(PACKER_VERSION)_linux_$(GOARCH).zip
 $(PACKER):
@@ -55,16 +56,7 @@ $(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/raspberrypi
 
 	cd builder && packer init pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" pwnagotchi.json.pkr.hcl
 
-# If any of these files are updated, rebuild the checksums.
-$(PWN_RELEASE).sha256: $(PWN_RELEASE).img
-	sha256sum $^ > $@
-
-# If any of the input files are updated, rebuild the archive.
-$(PWN_RELEASE).zip: $(PWN_RELEASE).img $(PWN_RELEASE).sha256
-	zip $(PWN_RELEASE).zip $^
-
 .PHONY: image
-image: $(PWN_RELEASE).zip
 
 clean:
 	- python3 setup.py clean --all
diff --git a/builder/data/usr/bin/pwnlib b/builder/data/usr/bin/pwnlib
index 4c0dc0c9..99a624f1 100755
--- a/builder/data/usr/bin/pwnlib
+++ b/builder/data/usr/bin/pwnlib
@@ -41,13 +41,18 @@ reload_brcm() {
 start_monitor_interface() {
   rfkill unblock all
   ifconfig wlan0 up
+  sleep 3
   iw dev wlan0 set power_save off
-  airmon-ng start wlan0
+  iw phy "$(iw phy | head -1 | cut -d" " -f2)" interface add wlan0mon type monitor
+  sleep 2
+  rfkill unblock all
+  ifconfig wlan0 down
+  ifconfig wlan0mon up
 }
 
 # stops mon0
 stop_monitor_interface() {
-  airmon-ng stop wlan0mon
+  ifconfig wlan0mon down && iw dev wlan0mon del
   reload_brcm
   ifconfig wlan0 up
 }
diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index fbb019d7..083879e7 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -74,7 +74,6 @@
           - triggerhappy
           - wpasupplicant
         install:
-          - aircrack-ng
           - autoconf
           - bc
           - bison
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index 344d7d3d..692d2dff 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -113,7 +113,6 @@
           - triggerhappy
           - wpasupplicant
         install:
-          - aircrack-ng
           - autoconf
           - bc
           - bison
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 478ef58f..bff302cb 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -70,7 +70,6 @@
           - triggerhappy
           - wpasupplicant
         install:
-          - aircrack-ng
           - autoconf
           - bc
           - bison