From dfbfd7f891629fa262cd52fafc074fe6900afefe Mon Sep 17 00:00:00 2001
From: ck <clkerins@gmail.com>
Date: Mon, 5 Feb 2024 12:34:09 -0500
Subject: [PATCH] Update pwngrid to version 1.11.1

---
 builder/pwnagotchi.json.pkr.hcl | 99 +--------------------------------
 builder/raspberrypi64.yml       |  2 +-
 2 files changed, 3 insertions(+), 98 deletions(-)

diff --git a/builder/pwnagotchi.json.pkr.hcl b/builder/pwnagotchi.json.pkr.hcl
index 39d0a7a2..3e5181e7 100644
--- a/builder/pwnagotchi.json.pkr.hcl
+++ b/builder/pwnagotchi.json.pkr.hcl
@@ -51,56 +51,7 @@ source "arm" "rpi64-pwnagotchi" {
   }
 }
 
-source "arm" "rpi32-pwnagotchi" {
-  file_checksum_url             = "https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2023-05-03/2023-05-03-raspios-bullseye-armhf-lite.img.xz.sha256"
-  file_urls                     = ["https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2023-05-03/2023-05-03-raspios-bullseye-armhf-lite.img.xz"]
-  file_checksum_type            = "sha256"
-  file_target_extension         = "xz"
-  file_unarchive_cmd            = ["unxz", "$ARCHIVE_PATH"]
-  image_path                    = "../../pwnagotchi-rpi-bullseye-${var.pwn_version}-armhf.img"
-  qemu_binary_source_path       = "/usr/libexec/qemu-binfmt/arm-binfmt-P"
-  qemu_binary_destination_path  = "/usr/libexec/qemu-binfmt/arm-binfmt-P"
-  image_build_method            = "resize"
-  image_size                    = "9G"
-  image_type                    = "dos"
-  image_partitions {
-    name         = "boot"
-    type         = "c"
-    start_sector = "8192"
-    filesystem   = "fat"
-    size         = "256M"
-    mountpoint   = "/boot"
-  }
-  image_partitions {
-    name         = "root"
-    type         = "83"
-    start_sector = "532480"
-    filesystem   = "ext4"
-    size         = "0"
-    mountpoint   = "/"
-  }
-}
-source "arm" "opi-pwnagotchi" {
-  file_checksum_url             = "https://github.com/jayofelony/orangepi/releases/download/v1.0/orangepi-raspios.img.xz.sha256"
-  file_urls                     = ["https://github.com/jayofelony/orangepi/releases/download/v1.0/orangepi-raspios.img.xz"]
-  file_checksum_type            = "sha256"
-  file_target_extension         = "xz"
-  file_unarchive_cmd            = ["unxz", "$ARCHIVE_PATH"]
-  image_path                    = "../../pwnagotchi-opi-bullseye-${var.pwn_version}-arm64.img"
-  qemu_binary_source_path       = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
-  qemu_binary_destination_path  = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
-  image_build_method            = "resize"
-  image_size                    = "9G"
-  image_type                    = "dos"
-  image_partitions {
-    name         = "root"
-    type         = "83"
-    start_sector = "8192"
-    filesystem   = "ext4"
-    size         = "0"
-    mountpoint   = "/"
-  }
-}
+
 
 # a build block invokes sources and runs provisioning steps on them. The
 # documentation for build blocks can be found here:
@@ -148,50 +99,4 @@ build {
     extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""]
     playbook_file   = "raspberrypi64.yml"
   }
-}
-
-
-#build {
-#  name = "Orange Pi Pwnagotchi"
-#  sources = ["source.arm.opi-pwnagotchi"]
-
-#  provisioner "file" {
-#    destination = "/usr/bin/"
-#    sources     = [
-#      "data/usr/bin/bettercap-launcher",
-#      "data/usr/bin/hdmioff",
-#      "data/usr/bin/hdmion",
-#      "data/usr/bin/monstart",
-#      "data/usr/bin/monstop",
-#      "data/usr/bin/pwnagotchi-launcher",
-#      "data/usr/bin/pwnlib",
-#    ]
-#  }
-#  provisioner "shell" {
-#    inline = ["chmod +x /usr/bin/*"]
-#  }
-
-#  provisioner "file" {
-#    destination = "/etc/systemd/system/"
-#    sources     = [
-#      "data/etc/systemd/system/bettercap.service",
-#      "data/etc/systemd/system/pwnagotchi.service",
-#      "data/etc/systemd/system/pwngrid-peer.service",
-#    ]
-#  }
-#  provisioner "file" {
-#    destination = "/etc/update-motd.d/01-motd"
-#    source      = "data/etc/update-motd.d/01-motd"
-#  }
-#  provisioner "shell" {
-#    inline = ["chmod +x /etc/update-motd.d/*"]
-#  }
-#  provisioner "shell" {
-#    inline = ["apt-get -y --allow-releaseinfo-change update", "apt-get -y dist-upgrade", "apt-get install -y --no-install-recommends ansible"]
-#  }
-#  provisioner "ansible-local" {
-#    command         = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook"
-#    extra_arguments = ["--extra-vars \"ansible_python_interpreter=/usr/bin/python3\""]
-#    playbook_file   = "orangepi.yml"
-#  }
-#}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index ec2115b6..985aacd3 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -44,7 +44,7 @@
         ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
       pwngrid:
         source: "https://github.com/jayofelony/pwngrid.git"
-        url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.5/pwngrid-1.10.5-aarch64.zip"
+        url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.5/pwngrid-1.11.1-aarch64.zip"
       apt:
         downgrade:
           - libpcap-dev_1.9.1-4_arm64.deb