From 1c35c5cdb8e074f00f5b0485e903b85bf238054e Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 05:28:41 +0200 Subject: [PATCH 1/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.yml | 106 ----------------------------------------- 1 file changed, 106 deletions(-) diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index 2e597106..1b52d3d7 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -283,104 +283,6 @@ remote_src: yes mode: 0755 -# Install nexmon to fix wireless scanning (takes 2.5G of space) - - name: clone nexmon repository - git: - repo: https://github.com/jayofelony/nexmon.git - dest: /usr/local/src/nexmon - register: nexmongit - - - name: make firmware - shell: "source ./setup_env.sh && make" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - -# Raspberry Pi Zero 2w (chipset 43436b0) - - - name: make firmware patch (bcm43436b0) - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43436b0/9_88_4_65/nexmon/ && make" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: backup original firmware - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43436b0/9_88_4_65/nexmon/ && make backup-firmware" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: install new firmware - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43436b0/9_88_4_65/nexmon/ && make install-firmware" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - -# Raspberry Pi zero 2w (chipset 43430a1) - - - name: make firmware patch (bcm43430a1) - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43430a1/7_45_41_46/nexmon/ && make" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: backup original firmware - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43430a1/7_45_41_46/nexmon/ && make backup-firmware" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: install new firmware - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43430a1/7_45_41_46/nexmon/ && make install-firmware" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - -# Raspberry Pi 4 - - - name: make firmware patch (bcm43455c0) - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43455c0/7_45_206/nexmon/ && make" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: backup original firmware - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43455c0/7_45_206/nexmon/ && make backup-firmware" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: install new firmware - become_user: root - shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/bcm43455c0/7_45_206/nexmon/ && make install-firmware" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: copy modified driver - become_user: root - copy: - src: /usr/local/src/nexmon/patches/driver/brcmfmac_6.1.y-nexmon/brcmfmac.ko - dest: "/lib/modules/{{ ansible_kernel }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko" - - - name: "Update kernel modules" - become_user: root - command: /sbin/depmod -a - - # To shrink the final image, remove the nexmon directory (takes 2.5G of space) post build and installation - - name: Delete nexmon content & directory - file: - state: absent - path: /usr/local/src/nexmon/ - - name: add HDMI powersave to rc.local blockinfile: path: /etc/rc.local @@ -519,14 +421,6 @@ with_items: "{{ packages.apt.hold }}" when: libpcap.changed - - name: enable services - become_user: root - systemd: - name: "{{ item }}" - state: started - enabled: yes - with_items: "{{ services.enable }}" - - name: disable unecessary services become_user: root systemd: From 86ef926bf7b1c57acd7fff67898b973d9ae9f635 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 05:29:43 +0200 Subject: [PATCH 2/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index 1b52d3d7..8a2c335d 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -441,4 +441,4 @@ - name: reload systemd services become_user: root systemd: - daemon_reload: yes + daemon_reload: yes \ No newline at end of file From 4939cfa50adcc9207b556e8e7df787a710ce8042 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 06:09:24 +0200 Subject: [PATCH 3/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.json | 7 ++----- pwnagotchi/plugins/default/auto-update.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json index 117514f2..017139b9 100644 --- a/builder/pwnagotchi.json +++ b/builder/pwnagotchi.json @@ -3,13 +3,10 @@ { "name": "pwnagotchi", "type": "arm-image", - "iso_urls": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz", + "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz", "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256", "target_image_size": 9368709120, - "qemu_binary": "qemu-aarch64-static", - "qemu_args": [ - "-cpu", "cortex-a72" - ] + "qemu_binary": "qemu-aarch64-static" } ], "provisioners": [ diff --git a/pwnagotchi/plugins/default/auto-update.py b/pwnagotchi/plugins/default/auto-update.py index 3b2f9a4f..b1afdc04 100644 --- a/pwnagotchi/plugins/default/auto-update.py +++ b/pwnagotchi/plugins/default/auto-update.py @@ -35,11 +35,11 @@ def check(version, repo, native=True): if not native: info['url'] = "https://github.com/%s/archive/%s.zip" % (repo, latest['tag_name']) else: - # check if this release is compatible with arm6 + # check if this release is compatible with armv8+ for asset in latest['assets']: download_url = asset['browser_download_url'] if download_url.endswith('.zip') and ( - info['arch'] in download_url or (is_arm and 'armhf' in download_url)): + info['arch'] in download_url or (is_arm and 'arm64' in download_url)): info['url'] = download_url break From b2c348874d67e350b226df13a5ec767d9708a730 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 06:09:42 +0200 Subject: [PATCH 4/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- .idea/misc.xml | 2 +- .idea/pwnagotchi.iml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index a971a2c9..6178365c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/pwnagotchi.iml b/.idea/pwnagotchi.iml index 8d3ec578..7e680cfc 100644 --- a/.idea/pwnagotchi.iml +++ b/.idea/pwnagotchi.iml @@ -4,7 +4,7 @@ - + From 2526ec00172521304da7dde62addef43ce334ce9 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 06:25:22 +0200 Subject: [PATCH 5/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index 8a2c335d..25379fa9 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -402,7 +402,7 @@ url: "http://ports.ubuntu.com/pool/main/libp/libpcap/{{ item }}" dest: /usr/local/src/ with_items: - - libpcap0.8-dev_1.9.1-_arm64.deb + - libpcap0.8-dev_1.9.1-3_arm64.deb - libpcap0.8_1.9.1-3_arm64.deb - libpcap-dev_1.9.1-3_arm64.deb From 5feb0b70730cd5a480e9c7e50812fbfcbb711a09 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 06:39:31 +0200 Subject: [PATCH 6/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json index 017139b9..c518f20e 100644 --- a/builder/pwnagotchi.json +++ b/builder/pwnagotchi.json @@ -6,7 +6,16 @@ "iso_url": "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz", "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256", "target_image_size": 9368709120, - "qemu_binary": "qemu-aarch64-static" + "qemu_binary": "qemu-aarch64-static", + "output_filename": "images/pwnagotchi-{{user `pwn_version`}}-arm64.img", + "chroot_mounts": [ + ["proc", "proc", "/proc"], + ["sysfs", "sysfs", "/sys"], + ["bind", "/dev", "/dev"], + ["devpts", "devpts", "/dev/pts"], + ["binfmt_misc", "binfmt_misc", "/proc/sys/fs/binfmt_misc"], + ["bind", "/run/systemd", "/run/systemd"] + ] } ], "provisioners": [ From bd25f32f77cf2f6b5d64cc2f9072ba392e3c6c28 Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 07:24:52 +0200 Subject: [PATCH 7/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index 25379fa9..e5f13003 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -399,12 +399,12 @@ - name: download old libpcap packages get_url: - url: "http://ports.ubuntu.com/pool/main/libp/libpcap/{{ item }}" + url: "{{ item }}" dest: /usr/local/src/ - with_items: - - libpcap0.8-dev_1.9.1-3_arm64.deb - - libpcap0.8_1.9.1-3_arm64.deb - - libpcap-dev_1.9.1-3_arm64.deb + loop: + - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8-dev_1.9.1-3_arm64.deb + - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8_1.9.1-3_arm64.deb + - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap-dev_1.9.1-3_arm64.deb - name: install old libpcap packages become_user: root From 3a09ab8977758835a42893fe944da51ee67aa90b Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Thu, 31 Aug 2023 09:09:43 +0200 Subject: [PATCH 8/8] Version 2.1.1 Signed-off-by: Jeroen Oudshoorn --- builder/pwnagotchi.json | 10 +--------- builder/pwnagotchi.yml | 29 +---------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/builder/pwnagotchi.json b/builder/pwnagotchi.json index c518f20e..28766b6e 100644 --- a/builder/pwnagotchi.json +++ b/builder/pwnagotchi.json @@ -7,15 +7,7 @@ "iso_checksum": "file:https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz.sha256", "target_image_size": 9368709120, "qemu_binary": "qemu-aarch64-static", - "output_filename": "images/pwnagotchi-{{user `pwn_version`}}-arm64.img", - "chroot_mounts": [ - ["proc", "proc", "/proc"], - ["sysfs", "sysfs", "/sys"], - ["bind", "/dev", "/dev"], - ["devpts", "devpts", "/dev/pts"], - ["binfmt_misc", "binfmt_misc", "/proc/sys/fs/binfmt_misc"], - ["bind", "/run/systemd", "/run/systemd"] - ] + "output_filename": "images/pwnagotchi-{{user `pwn_version`}}-arm64.img" } ], "provisioners": [ diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml index e5f13003..4387bb01 100644 --- a/builder/pwnagotchi.yml +++ b/builder/pwnagotchi.yml @@ -29,11 +29,8 @@ - apt-daily.service - apt-daily-upgrade.timer - apt-daily-upgrade.service - - wpa_supplicant.service - bluetooth.service - - triggerhappy.service - ifup@wlan0.service - - dnsmasq.service packages: bettercap: # We will install bettercap from source @@ -50,7 +47,7 @@ - raspberrypi-net-mods - dhcpcd5 - triggerhappy - - wpa_supplicant + - wpasupplicant - nfs-common - libraspberrypi0 - libraspberrypi-dev @@ -397,30 +394,6 @@ apt: autoremove: yes - - name: download old libpcap packages - get_url: - url: "{{ item }}" - dest: /usr/local/src/ - loop: - - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8-dev_1.9.1-3_arm64.deb - - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8_1.9.1-3_arm64.deb - - http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap-dev_1.9.1-3_arm64.deb - - - name: install old libpcap packages - become_user: root - apt: - deb: /usr/local/src/libpcap* - args: allow-downgrades - register: libpcap - - - name: add firmware packages to hold - become_user: root - dpkg_selections: - name: "{{ item }}" - selection: hold - with_items: "{{ packages.apt.hold }}" - when: libpcap.changed - - name: disable unecessary services become_user: root systemd: