v2.5.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>

builder/data/etc/systemd/system/pwngrid-peer.service

@@ -6,7 +6,7 @@ After=bettercap.service
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface wlan0mon
+ExecStart=/usr/bin/pwngrid-launcher -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface wlan0mon
 Restart=always
 RestartSec=30
 

builder/data/usr/bin/pwngrid-launcher

@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+
+source /usr/bin/pwnlib
+
+/usr/local/bin/pwngrid -keys /etc/pwnagotchi -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface mon0

builder/orangepi.yml

@@ -52,6 +52,7 @@
       apt:
         downgrade:
           - libpcap-dev_1.9.1-4_arm64.deb
+          - libpcap0.8-dbg_1.9.1-4_arm64.deb
           - libpcap0.8-dev_1.9.1-4_arm64.deb
           - libpcap0.8_1.9.1-4_arm64.deb
         hold:
@@ -414,25 +415,25 @@
         line: "\nalias pwnver='python3 -c \"import pwnagotchi as p; print(p.__version__)\"'"
         insertafter: EOF
 
-    - name: download old libpcap packages
-      get_url:
-        url: "https://old.kali.org/kali/pool/main/libp/libpcap/{{ item }}"
-        dest: /usr/local/src/
-      with_items: "{{ packages.apt.downgrade }}"
+    #- name: download old libpcap packages
+    #  get_url:
+    #    url: "https://old.kali.org/kali/pool/main/libp/libpcap/{{ item }}"
+    #    dest: /usr/local/src/
+    #  with_items: "{{ packages.apt.downgrade }}"
 
-    - name: install old libpcap packages
-      apt:
-        force: True
-        state: present
-        deb: "/usr/local/src/{{ item }}"
-      with_items: "{{ packages.apt.downgrade }}"
-      register: libpcap
+    #- name: install old libpcap packages
+    #  apt:
+    #    force: True
+    #    state: present
+    #    deb: "/usr/local/src/{{ item }}"
+    #  with_items: "{{ packages.apt.downgrade }}"
+    #  register: libpcap
 
-    - name: remove old libpcap files
-      file:
-        path: "/usr/local/src/{{ item }}"
-        state: absent
-      with_items: "{{ packages.apt.downgrade }}"
+    #- name: remove old libpcap files
+    #  file:
+    #    path: "/usr/local/src/{{ item }}"
+    #    state: absent
+    #  with_items: "{{ packages.apt.downgrade }}"
 
     - name: add firmware packages to hold
       dpkg_selections:

builder/pwnagotchi.json.pkr.hcl

@@ -107,13 +107,14 @@ build {
   provisioner "file" {
     destination = "/usr/bin/"
     sources     = [
-      "data/usr/bin/pwnlib",
       "data/usr/bin/bettercap-launcher",
-      "data/usr/bin/pwnagotchi-launcher",
-      "data/usr/bin/monstop",
-      "data/usr/bin/monstart",
-      "data/usr/bin/hdmion",
       "data/usr/bin/hdmioff",
+      "data/usr/bin/hdmion",
+      "data/usr/bin/monstart",
+      "data/usr/bin/monstop",
+      "data/usr/bin/pwnagotchi-launcher",
+      "data/usr/bin/pwngrid-launcher",
+      "data/usr/bin/pwnlib",
     ]
   }
   provisioner "shell" {
@@ -123,9 +124,9 @@ build {
   provisioner "file" {
     destination = "/etc/systemd/system/"
     sources     = [
-      "data/etc/systemd/system/pwngrid-peer.service",
-      "data/etc/systemd/system/pwnagotchi.service",
       "data/etc/systemd/system/bettercap.service",
+      "data/etc/systemd/system/pwnagotchi.service",
+      "data/etc/systemd/system/pwngrid-peer.service",
     ]
   }
   provisioner "file" {
@@ -151,13 +152,14 @@ build {
   provisioner "file" {
     destination = "/usr/bin/"
     sources     = [
-      "data/usr/bin/pwnlib",
       "data/usr/bin/bettercap-launcher",
-      "data/usr/bin/pwnagotchi-launcher",
-      "data/usr/bin/monstop",
-      "data/usr/bin/monstart",
-      "data/usr/bin/hdmion",
       "data/usr/bin/hdmioff",
+      "data/usr/bin/hdmion",
+      "data/usr/bin/monstart",
+      "data/usr/bin/monstop",
+      "data/usr/bin/pwnagotchi-launcher",
+      "data/usr/bin/pwngrid-launcher",
+      "data/usr/bin/pwnlib",
     ]
   }
   provisioner "shell" {
@@ -167,9 +169,9 @@ build {
   provisioner "file" {
     destination = "/etc/systemd/system/"
     sources     = [
-      "data/etc/systemd/system/pwngrid-peer.service",
-      "data/etc/systemd/system/pwnagotchi.service",
       "data/etc/systemd/system/bettercap.service",
+      "data/etc/systemd/system/pwnagotchi.service",
+      "data/etc/systemd/system/pwngrid-peer.service",
     ]
   }
   provisioner "file" {
@@ -197,13 +199,14 @@ build {
   provisioner "file" {
     destination = "/usr/bin/"
     sources     = [
-      "data/usr/bin/pwnlib",
       "data/usr/bin/bettercap-launcher",
-      "data/usr/bin/pwnagotchi-launcher",
-      "data/usr/bin/monstop",
-      "data/usr/bin/monstart",
-      "data/usr/bin/hdmion",
       "data/usr/bin/hdmioff",
+      "data/usr/bin/hdmion",
+      "data/usr/bin/monstart",
+      "data/usr/bin/monstop",
+      "data/usr/bin/pwnagotchi-launcher",
+      "data/usr/bin/pwngrid-launcher",
+      "data/usr/bin/pwnlib",
     ]
   }
   provisioner "shell" {
@@ -213,9 +216,9 @@ build {
   provisioner "file" {
     destination = "/etc/systemd/system/"
     sources     = [
-      "data/etc/systemd/system/pwngrid-peer.service",
-      "data/etc/systemd/system/pwnagotchi.service",
       "data/etc/systemd/system/bettercap.service",
+      "data/etc/systemd/system/pwnagotchi.service",
+      "data/etc/systemd/system/pwngrid-peer.service",
     ]
   }
   provisioner "file" {

builder/raspberrypi32.yml

@@ -80,7 +80,7 @@
         source: "https://github.com/jayofelony/caplets.git"
       bettercap:
         source: "https://github.com/jayofelony/bettercap.git"
-        url: "https://github.com/bettercap/bettercap/releases/download/v2.31.0/bettercap_linux_armhf_v2.31.0.zip"
+        url: "https://github.com/jayofelony/bettercap/releases/download/2.32.1/bettercap-2.32.1-armhf.zip"
         ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
       opwngrid:
         source: "https://github.com/jayofelony/pwngrid.git"
@@ -93,11 +93,10 @@
         url: "https://github.com/Sniffleupagus/Torch4Pizero/releases/download/v1.0.0/torchvision-0.16.0a0-cp39-cp39-linux_armv6l.whl"
       apt:
         downgrade:
-          # the kali .debs do not work on raspberry pi zero on raspiOS
-          # so install from source later. probably good idea on all platforms
-          #- libpcap-dev_1.9.1-4_armel.deb
-          #- libpcap0.8-dev_1.9.1-4_armel.deb
-          #- libpcap0.8_1.9.1-4_armel.deb
+          - libpcap-dev_1.9.1-4_armhf.deb
+          - libpcap0.8-dbg_1.9.1-4_armhf.deb
+          - libpcap0.8-dev_1.9.1-4_armhf.deb
+          - libpcap0.8_1.9.1-4_armhf.deb
         hold:
           - firmware-atheros
           - firmware-brcm80211

builder/raspberrypi64.yml

@@ -51,6 +51,7 @@
       apt:
         downgrade:
           - libpcap-dev_1.9.1-4_arm64.deb
+          - libpcap0.8-dbg_1.9.1-4_arm64.deb
           - libpcap0.8-dev_1.9.1-4_arm64.deb
           - libpcap0.8_1.9.1-4_arm64.deb
         hold:
@@ -518,25 +519,25 @@
         line: "\nalias pwnver='python3 -c \"import pwnagotchi as p; print(p.__version__)\"'"
         insertafter: EOF
 
-    - name: download old libpcap packages
-      get_url:
-        url: "https://old.kali.org/kali/pool/main/libp/libpcap/{{ item }}"
-        dest: /usr/local/src/
-      with_items: "{{ packages.apt.downgrade }}"
+    #- name: download old libpcap packages
+    #  get_url:
+    #    url: "https://old.kali.org/kali/pool/main/libp/libpcap/{{ item }}"
+    #    dest: /usr/local/src/
+    #  with_items: "{{ packages.apt.downgrade }}"
 
-    - name: install old libpcap packages
-      apt:
-        force: True
-        state: present
-        deb: "/usr/local/src/{{ item }}"
-      with_items: "{{ packages.apt.downgrade }}"
-      register: libpcap
+    #- name: install old libpcap packages
+    #  apt:
+    #    force: True
+    #    state: present
+    #    deb: "/usr/local/src/{{ item }}"
+    #  with_items: "{{ packages.apt.downgrade }}"
+    #  register: libpcap
 
-    - name: remove old libpcap files
-      file:
-        path: "/usr/local/src/{{ item }}"
-        state: absent
-      with_items: "{{ packages.apt.downgrade }}"
+    #- name: remove old libpcap files
+    #  file:
+    #    path: "/usr/local/src/{{ item }}"
+    #    state: absent
+    #  with_items: "{{ packages.apt.downgrade }}"
 
     - name: add firmware packages to hold
       dpkg_selections: