first pass at issue #7

rfhs · Sep 17, 2021 · bf63bce · bf63bce
1 parent 86de6fd
commit bf63bce
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/contestant_containers/Dockerfile.blackarch b/contestant_containers/Dockerfile.blackarch
@@ -13,12 +13,12 @@ FROM docker.io/blackarchlinux/blackarch:latest
 
 # hostapd-wpe needs make, but it's not a dep because it's assumed to be installed despite not being a dep
 RUN pacman -Syu --noconfirm make && \
-    # Install packages
+    # Install packages, missing fldigi, qsstv, wsjtx, gr-lora_sdr, nrsc5
     pacman -Syu --noconfirm python-pip openssh vim tmux screen supervisor iw man mlocate pciutils less bash-completion novnc \
     xorg-server-xvfb x11vnc xfce4 xfce4-goodies xfce4-power-manager blackarch-config-xfce blackarch-menus blackarch-wallpaper \
     blackarch-config-cursor blackarch-config-icons blackarch-config-zsh ttf-liberation hostapd freeradius wpa_supplicant bully \
     wireshark-qt wireshark-cli aircrack-ng mdk3 mdk4 asleap hostapd-wpe wifite pixiewps reaver hashcat hashcat-utils hcxtools \
-    hcxdumptool wifi-honey tcpdump nmap && \
+    hcxdumptool wifi-honey tcpdump nmap gnuradio gqrx gnuradio-osmosdr urh && \
     # Uninstall broken package
     pacman -R --noconfirm xfce4-power-manager && \
     # Clean up environment

diff --git a/contestant_containers/Dockerfile.kali b/contestant_containers/Dockerfile.kali
@@ -1,10 +1,11 @@
 FROM docker.io/kalilinux/kali-rolling
 RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get update && \
   DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get dist-upgrade -y && \
-  DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y aircrack-ng asleap freeradius-wpe hostapd-wpe iw kismet mdk3 mdk4 pixiewps reaver wifi-honey wifite tshark wireshark termshark vim mlocate man pciutils hashcat wpasupplicant less bash-completion ssh supervisor novnc xvfb x11vnc kali-desktop-xfce dbus-x11 dialog librsvg2-common tmux tcpdump nmap iproute2 iputils-ping curl && \
-  #dpkg -P --force-depends xfce4-power-manager-plugins && \
-  #rm -f /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml && \
-  #sed -i '/power-manager-plugin/d' /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml && \
+  # missing urh, gr-lora_sdr nrsc5
+  DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y aircrack-ng asleap freeradius-wpe hostapd-wpe iw kismet mdk3 mdk4 pixiewps reaver wifi-honey wifite tshark wireshark termshark vim mlocate man pciutils hashcat wpasupplicant less bash-completion ssh supervisor novnc xvfb x11vnc kali-desktop-xfce dbus-x11 dialog librsvg2-common tmux tcpdump nmap iproute2 iputils-ping gnuradio gqrx-sdr gr-osmosdr fldigi qsstv wsjtx && \
+  # dpkg -P --force-depends xfce4-power-manager-plugins && \
+  # rm -f /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml && \
+  # sed -i '/power-manager-plugin/d' /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml && \
   DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y equivs && \
   equivs-control xfce4-power-manager-plugins && \
   sed -i "s/Package:.*/Package: xfce4-power-manager-plugins/" xfce4-power-manager-plugins && \

diff --git a/contestant_containers/Dockerfile.parrot b/contestant_containers/Dockerfile.parrot
@@ -1,10 +1,11 @@
 FROM docker.io/parrotsec/core
 RUN DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get update && \
   DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get dist-upgrade -y && \
-  DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends aircrack-ng asleap curl freeradius-wpe hostapd-wpe iw kismet mdk3 mdk4 pixiewps reaver wifi-honey wifite tshark wireshark termshark vim mlocate man pciutils hashcat wpasupplicant less bash-completion ssh supervisor novnc xvfb x11vnc parrot-xfce dbus-x11 dialog tmux tcpdump nmap -y && \
-  #dpkg -P --force-depends xfce4-power-manager-plugins && \
-  #rm -f /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml && \
-  #sed -i '/power-manager-plugin/d' /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml && \
+  # missing urh, gr-lora_sdr nrsc5
+  DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends aircrack-ng asleap freeradius-wpe hostapd-wpe iw kismet mdk3 mdk4 pixiewps reaver wifi-honey wifite tshark wireshark termshark vim mlocate man pciutils hashcat wpasupplicant less bash-completion ssh supervisor novnc xvfb x11vnc parrot-xfce dbus-x11 dialog tmux tcpdump nmap gnuradio gqrx-sdr gr-osmosdr fldigi qsstv wsjtx -y && \
+  # dpkg -P --force-depends xfce4-power-manager-plugins && \
+  # rm -f /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml && \
+  # sed -i '/power-manager-plugin/d' /root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml && \
   DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y equivs && \
   equivs-control xfce4-power-manager-plugins && \
   sed -i "s/Package:.*/Package: xfce4-power-manager-plugins/" xfce4-power-manager-plugins && \

diff --git a/contestant_containers/Dockerfile.pentoo b/contestant_containers/Dockerfile.pentoo
@@ -14,10 +14,12 @@ RUN echo 'FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage
   emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --deep --update --newuse pentoo/pentoo-core pentoo/pentoo-desktop && \
   # install the distro wireless metapackage for aircrack-ng, hostapd, freeradius, kismet, mdk3, reaver (and pixiewps), wifite, asleap, hcxtools, hcxdumptool hcxtools
   emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --deep --update --newuse pentoo/pentoo-wireless && \
+  # install the distro radio metapackage for gnuradio, gqrx, and gr-osmosdr
+  emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --deep --update --newuse pentoo/pentoo-radio && \
   # install the distro opencl stuff because gentoo is weird
   emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --deep --update --newuse pentoo/pentoo-opencl && \
-  # install the additional packages we want
-  emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --deep --update --newuse www-apps/novnc x11-misc/x11vnc app-crypt/hashcat net-analyzer/wireshark net-analyzer/termshark app-misc/tmux net-analyzer/tcpdump net-analyzer/nmap && \
+  # install the additional packages we want, missing gr-lora_sdr and nrsc5
+  emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --deep --update --newuse www-apps/novnc x11-misc/x11vnc app-crypt/hashcat net-analyzer/wireshark net-analyzer/termshark app-misc/tmux net-analyzer/tcpdump net-analyzer/nmap media-radio/fldigi media-radio/qsstv media-radio/wsjtx net-wireless/urh && \
   # configure the gui to be nicer
   # magic to autohide panel 2
   magic_number=$(($(sed -n '/<value type="int" value="14"\/>/=' /etc/xdg/xfce4/panel/default.xml)+1)) && \