diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml index 71dac7aa..2942222d 100644 --- a/builder/raspberrypi64.yml +++ b/builder/raspberrypi64.yml @@ -283,12 +283,16 @@ args: executable: /bin/bash chdir: /usr/local/src/nexmon/ + environment: + QEMU_UNAME: "{{ kernel.full_pi5 }}" - name: make firmware patch (bcm43455c0) 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/ + environment: + QEMU_UNAME: "{{ kernel.full_pi5 }}" - name: install new firmware (bcm43455c0) copy: @@ -301,6 +305,8 @@ args: executable: /bin/bash chdir: /usr/local/src/nexmon/ + environment: + QEMU_UNAME: "{{ kernel.full_pi5 }}" - name: install new firmware (bcm43436b0) copy: @@ -313,6 +319,8 @@ args: executable: /bin/bash chdir: /usr/local/src/nexmon/ + environment: + QEMU_UNAME: "{{ kernel.full_pi5 }}" - name: install new firmware (bcm43430a1) copy: @@ -350,34 +358,25 @@ copy: src: "/usr/local/src/nexmon/patches/driver/brcmfmac_{{ kernel.min }}.y-nexmon/brcmfmac.ko" dest: "/usr/lib/modules/{{ kernel.full }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko" - - - name: clone nexmon repository - git: - repo: https://github.com/DrSchottky/nexmon.git - dest: /usr/local/src/nexmon - - - name: make firmware - shell: "source ./setup_env.sh && make" - args: - executable: /bin/bash - chdir: /usr/local/src/nexmon/ - - - name: make firmware patch (bcm43455c0) - 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/ + environment: + QEMU_UNAME: "{{ kernel.full }}" - name: copy modified driver, RPi5 copy: src: "/usr/local/src/nexmon/patches/driver/brcmfmac_{{ kernel.min }}.y-nexmon/brcmfmac.ko" dest: "/usr/lib/modules/{{ kernel.full_pi5 }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko" + environment: + QEMU_UNAME: "{{ kernel.full_pi5 }}" - name: load brcmfmac drivers command: "/sbin/depmod {{ kernel.full }}" + environment: + QEMU_UNAME: "{{ kernel.full }}" - name: load brcmfmac drivers command: "/sbin/depmod {{ kernel.full_pi5 }}" + environment: + QEMU_UNAME: "{{ kernel.full_pi5 }}" # To shrink the final image, remove the nexmon directory (takes 2.5G of space) post build and installation - name: Delete nexmon content & directory diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py index cfadc529..13179486 100644 --- a/pwnagotchi/_version.py +++ b/pwnagotchi/_version.py @@ -1 +1 @@ -__version__ = '2.7.7' +__version__ = '2.7.8' diff --git a/pwnagotchi/grid.py b/pwnagotchi/grid.py index 6c908dbd..57d459bb 100644 --- a/pwnagotchi/grid.py +++ b/pwnagotchi/grid.py @@ -92,7 +92,7 @@ def update_data(last_session): 'build': "Pwnagotchi-Torch by Jayofelony", 'plugins': enabled, 'language': language, - 'bettercap': subprocess.getoutput("bettercap -version").split(".\n\n")[1], + 'bettercap': subprocess.getoutput("bettercap -version"), 'opwngrid': subprocess.getoutput("pwngrid -version") } diff --git a/pwnagotchi/plugins/cmd.py b/pwnagotchi/plugins/cmd.py index 30e9fb18..6b8e4570 100644 --- a/pwnagotchi/plugins/cmd.py +++ b/pwnagotchi/plugins/cmd.py @@ -199,7 +199,7 @@ def list_plugins(args, config, pattern='*'): available_not_installed = set(available.keys()) - set(installed.keys()) max_len_list = available_and_installed if args.installed else available_not_installed - max_len = max(map(len, max_len_list)) + max_len = max(map(len, max_len_list)) if max_len_list else 0 header = line.format(name='Plugin', width=max_len, version='Version', enabled='Active', status='Status') line_length = max(max_len, len('Plugin')) + len(header) - len('Plugin') - 12 # lol diff --git a/pwnagotchi/plugins/default/aircrackonly.py b/pwnagotchi/plugins/default/aircrackonly.py index 47b83ba9..98b1db52 100644 --- a/pwnagotchi/plugins/default/aircrackonly.py +++ b/pwnagotchi/plugins/default/aircrackonly.py @@ -19,6 +19,10 @@ class AircrackOnly(plugins.Plugin): def __init__(self): self.text_to_set = "" + self.options = dict() + + def on_ready(self): + return def on_loaded(self): logging.info("aircrackonly plugin loaded") diff --git a/pwnagotchi/plugins/default/auto-update.py b/pwnagotchi/plugins/default/auto-update.py index 36c28100..bd279f15 100644 --- a/pwnagotchi/plugins/default/auto-update.py +++ b/pwnagotchi/plugins/default/auto-update.py @@ -130,7 +130,7 @@ def install(display, update): source_path = "%s-%s" % (source_path, update['available']) # setup.py is going to install data files for us - os.system("cd %s && pip3 install . --no-cache-dir --break-system-packages" % source_path) + os.system("cd %s && pip3 install . --break-system-packages" % source_path) return True diff --git a/pwnagotchi/plugins/default/wigle.py b/pwnagotchi/plugins/default/wigle.py index aec3ae0a..a38c81fc 100644 --- a/pwnagotchi/plugins/default/wigle.py +++ b/pwnagotchi/plugins/default/wigle.py @@ -131,6 +131,7 @@ class Wigle(plugins.Plugin): """ Called in manual mode when there's internet connectivity """ + global pcap_filename if not self.ready or self.lock.locked(): return @@ -143,7 +144,7 @@ class Wigle(plugins.Plugin): all_files = os.listdir(handshake_dir) all_gps_files = [os.path.join(handshake_dir, filename) for filename in all_files - if filename.endswith('.gps.json') or filename.endswith('.paw-gps.json') or filename.endswith('.geo.json')] + if filename.endswith('.gps.json') or filename.endswith('.geo.json')] all_gps_files = remove_whitelisted(all_gps_files, config['main']['whitelist']) new_gps_files = set(all_gps_files) - set(reported) - set(self.skip) @@ -154,8 +155,6 @@ class Wigle(plugins.Plugin): for gps_file in new_gps_files: if gps_file.endswith('.gps.json'): pcap_filename = gps_file.replace('.gps.json', '.pcap') - if gps_file.endswith('.paw-gps.json'): - pcap_filename = gps_file.replace('.paw-gps.json', '.pcap') if gps_file.endswith('.geo.json'): pcap_filename = gps_file.replace('.geo.json', '.pcap') if not os.path.exists(pcap_filename):