From fa4ca614b6a015da42bc991d46717920a782706d Mon Sep 17 00:00:00 2001 From: Jeroen Oudshoorn Date: Wed, 8 Nov 2023 14:54:00 +0100 Subject: [PATCH] v2.5.1 Signed-off-by: Jeroen Oudshoorn --- builder/extras/nexmon.yml | 6 ++-- builder/orangepi.yml | 66 ++++++++++----------------------------- builder/raspberrypi32.yml | 6 ++-- builder/raspberrypi64.yml | 61 ++++++++++-------------------------- 4 files changed, 39 insertions(+), 100 deletions(-) diff --git a/builder/extras/nexmon.yml b/builder/extras/nexmon.yml index cf1f3fad..6cdaafac 100644 --- a/builder/extras/nexmon.yml +++ b/builder/extras/nexmon.yml @@ -10,23 +10,21 @@ executable: /bin/bash chdir: /usr/local/src/nexmon/ -- name: "make firmware patch ({{ item.patch }})" +- name: "make firmware patch ({{ item.name }})" shell: "source ./setup_env.sh && cd /usr/local/src/nexmon/patches/{{ item.patch }}/nexmon/ && make" args: executable: /bin/bash chdir: /usr/local/src/nexmon/ environment: - QEMU_CPU: "{{ item.cpu }}" QEMU_UNAME: "{{ item.kernel }}" ARCHFLAGS: "{{ item.arch_flags }}" -- name: install new firmware +- name: "install new firmware ({{ item.name }})" copy: src: "/usr/local/src/nexmon/patches/{{ item.patch }}/nexmon/{{ item.firmware }}" dest: "/usr/lib/firmware/brcm/{{ item.firmware }}" follow: true environment: - QEMU_CPU: "{{ item.cpu }}" QEMU_UNAME: "{{ item.kernel }}" ARCHFLAGS: "{{ item.arch_flags }}" diff --git a/builder/orangepi.yml b/builder/orangepi.yml index 6c971a4b..e6401047 100644 --- a/builder/orangepi.yml +++ b/builder/orangepi.yml @@ -235,38 +235,6 @@ state: absent path: /usr/local/src/pwnagotchi - ########################################### - # - # 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 /usr/local/share/pwnagotchi/ folder - file: - path: /usr/local/share/pwnagotchi/ - state: directory - - name: Install go-1.21 unarchive: src: https://go.dev/dl/go1.21.3.linux-arm64.tar.gz @@ -417,25 +385,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: diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml index 7363122f..3121557a 100644 --- a/builder/raspberrypi32.yml +++ b/builder/raspberrypi32.yml @@ -18,7 +18,7 @@ name: "PiZero2W", firmware: "brcmfmac43436-sdio.bin", patch: "bcm43436b0/9_88_4_65", - cpu: any, + cpu: any, #cortex-a53 arch_flags: "-arch armv7l" } - { @@ -26,7 +26,7 @@ name: "Pi4b_32", firmware: "brcmfmac43455-sdio.bin", patch: "bcm43455c0/7_45_206", - cpu: any, + cpu: any, #cortex-a72 arch_flags: "-arch armv7l" } kernel: @@ -276,7 +276,7 @@ version: libpcap-1.9 - name: build and install libpcap into /usr/local/lib - shell: "./configure && make && make install" + shell: "./configure && make && make install" args: executable: /bin/bash chdir: /usr/local/src/libpcap diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml index dc7cc2a7..ae6b512f 100644 --- a/builder/raspberrypi64.yml +++ b/builder/raspberrypi64.yml @@ -321,33 +321,6 @@ path: /usr/local/share/pwnagotchi/ state: directory - ########################################### - # - # 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: Install go-1.21 unarchive: src: https://go.dev/dl/go1.21.3.linux-arm64.tar.gz @@ -519,25 +492,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: