v2.5.1

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

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

@@ -5,6 +5,8 @@ Wants=network.target
 After=bettercap.service
 
 [Service]
+Environment=LD_PRELOAD=/usr/local/lib/libpcap.so.1
+Environment=LD_LIBRARY_PATH=/usr/local/lib
 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
 Restart=always

builder/data/usr/bin/pwnlib

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-
+export LD_PRELOAD=/usr/local/lib/libpcap.so.1
+export LD_LIBRARY_PATH=/usr/local/lib
 # well ... it blinks the led
 blink_led() {
   # shellcheck disable=SC2034

builder/orangepi.yml

@@ -201,6 +201,39 @@
         update_cache: yes
         install_recommends: false
 
+    ###########################################
+    #
+    # libpcap v1.9 - build from source
+    #
+    ###########################################
+
+    # check for presence, then it can re-run in later parts if needed
+    # use the "make" built in
+
+    # install libpcap before bettercap and pwngrid, so they use it
+    - name: clone libpcap v1.9 from github
+      git:
+        repo: 'https://github.com/the-tcpdump-group/libpcap.git'
+        dest: /usr/local/src/libpcap
+        version: libpcap-1.9
+
+    - name: build and install libpcap into /usr/local/lib
+      shell: "./configure && make && make install"
+      args:
+        executable: /bin/bash
+        chdir: /usr/local/src/libpcap
+
+    - name: remove libpcap build folder
+      file:
+        state: absent
+        path: /usr/local/src/libpcap
+
+    - name: create symlink /usr/local/lib/libpcap.so.1.9.1
+      file:
+        src: /usr/local/lib/libpcap.so.1.9.1
+        dest: /usr/local/lib/libpcap.so.0.8
+        state: link
+
     - name: Create custom plugin directory
       file:
         path: /usr/local/share/pwnagotchi/custom-plugins/
@@ -390,26 +423,6 @@
         line: "\nalias pwnkill='sudo killall -USR1 pwnagotchi'"
         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: 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: add firmware packages to hold
       dpkg_selections:
         name: "{{ item }}"

builder/raspberrypi32.yml

@@ -288,20 +288,6 @@
         dest: /usr/local/lib/libpcap.so.0.8
         state: link
 
-    - name: preload libpcap
-      lineinfile:
-        dest: /usr/bin/pwnlib
-        insertbefore: "# well ... it blinks the led"
-        line: export LD_LIBRARY_PATH=/usr/local/lib
-              export LD_PRELOAD=/usr/local/lib/libpcap.so.1
-
-    - name: preload libpcap in pwngrid-peer.service
-      lineinfile:
-        dest: /usr/bin/pwnlib
-        insertafter: "Type=simple"
-        line: Environment=LD_PRELOAD=/usr/local/lib/libpcap.so.1
-              Environment=LD_LIBRARY_PATH=/usr/local/lib
-
     ###############################################################
     # Install nexmon to fix wireless scanning (takes 2.5G of space)
     ###############################################################

builder/raspberrypi64.yml

@@ -197,6 +197,39 @@
         update_cache: yes
         install_recommends: false
 
+    ###########################################
+    #
+    # libpcap v1.9 - build from source
+    #
+    ###########################################
+
+    # check for presence, then it can re-run in later parts if needed
+    # use the "make" built in
+
+    # install libpcap before bettercap and pwngrid, so they use it
+    - name: clone libpcap v1.9 from github
+      git:
+        repo: 'https://github.com/the-tcpdump-group/libpcap.git'
+        dest: /usr/local/src/libpcap
+        version: libpcap-1.9
+
+    - name: build and install libpcap into /usr/local/lib
+      shell: "./configure && make && make install"
+      args:
+        executable: /bin/bash
+        chdir: /usr/local/src/libpcap
+
+    - name: remove libpcap build folder
+      file:
+        state: absent
+        path: /usr/local/src/libpcap
+
+    - name: create symlink /usr/local/lib/libpcap.so.1.9.1
+      file:
+        src: /usr/local/lib/libpcap.so.1.9.1
+        dest: /usr/local/lib/libpcap.so.0.8
+        state: link
+
     # Install nexmon to fix wireless scanning (takes 2.5G of space)
     - name: clone nexmon repository
       git:
@@ -497,26 +530,6 @@
         line: "\nalias pwnkill='sudo killall -USR1 pwnagotchi'"
         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: 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: add firmware packages to hold
       dpkg_selections:
         name: "{{ item }}"