From 496fedf78091adf99b66813970bddb2e98e41077 Mon Sep 17 00:00:00 2001
From: SkyperTHC <skyper@thc.org>
Date: Tue, 28 Mar 2023 20:24:58 +0100
Subject: [PATCH 1/3] lftp

---
 .gitignore                          | 2 +-
 guest/Dockerfile                    | 3 +++
 guest/fs-root/sf/bin/pkg-install.sh | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0435b2c..1db8bbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@ segfault-*.tar.gz
 segfault-0*/
 data/
 .env
-.DS_Store
+**/.DS_Store
 info.txt
 host/dev/open*
diff --git a/guest/Dockerfile b/guest/Dockerfile
index 6d639d7..f872b6d 100644
--- a/guest/Dockerfile
+++ b/guest/Dockerfile
@@ -599,6 +599,9 @@ RUN /pkg-install.sh WEB apt-get install -y --no-install-recommends \
 		libnginx-mod-stream-geoip2 \
 		libnginx-mod-stream-js \
 		njs
+RUN /pkg-install.sh LARGE apt-get install -y --no-install-recommends \
+		lftp
+RUN /pkg-install.sh NET bin https://github.com/hackerschoice/binary/raw/main/gsocket/latest/gsocket_latest_all.deb
 RUN sed 's/deb-src.*//' -i /etc/apt/sources.list \
 	&& apt-get update
 
diff --git a/guest/fs-root/sf/bin/pkg-install.sh b/guest/fs-root/sf/bin/pkg-install.sh
index d8df225..3f13fa4 100755
--- a/guest/fs-root/sf/bin/pkg-install.sh
+++ b/guest/fs-root/sf/bin/pkg-install.sh
@@ -25,7 +25,7 @@ dlx()
 			;;
 		*.deb)
 			curl -SsfL -o /tmp/pkg.deb "$url" \
-			&& dpkg -i /tmp/pkg.deb \
+			&& dpkg -i --ignore-depends=sshfs /tmp/pkg.deb \
 			&& rm -rf /tmp/pkg.deb \
 			&& return 0
 			;;

From c3a806df784d06100c8a5694ba07b7df48c78e8c Mon Sep 17 00:00:00 2001
From: SkyperTHC <skyper@thc.org>
Date: Wed, 29 Mar 2023 00:09:31 +0100
Subject: [PATCH 2/3] tmpfs exec

---
 guest/Dockerfile            | 8 ++++----
 host/fs-root/bin/segfaultsh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/guest/Dockerfile b/guest/Dockerfile
index f872b6d..859fd89 100644
--- a/guest/Dockerfile
+++ b/guest/Dockerfile
@@ -46,6 +46,7 @@ RUN /pkg-install.sh BASE apt-get install -y --no-install-recommends \
 		python3-pip \
 		screen \
 		sharutils \
+		sshfs \
 		supervisor \
 		tmux \
 		unrar \
@@ -95,7 +96,6 @@ RUN /pkg-install.sh NET apt-get install -y --no-install-recommends \
 		iperf \
 		iperf3 \
 		iputils-tracepath \
-		gsocket \
 		man-db \
 		manpages-dev \
 		mosh \
@@ -392,8 +392,8 @@ RUN	/pkg-install.sh GUI bash -c '{ `### only Beta has no conflict with python 3.
 		&& wget -O "/usr/share/keyrings/xpra-2022.gpg" https://xpra.org/xpra-2022.gpg \
 		&& wget -O "/etc/apt/sources.list.d/xpra-beta.list" https://xpra.org/repos/bookworm/xpra-beta.list \
 		&& apt-get update \
-		&& apt-get install -y xpra xpra-html5; \
-		rm -f /var/lib/apt/lists/xpra*; }' \
+		&& apt-get install -y xpra xpra-html5 \
+		&& rm -f /var/lib/apt/lists/xpra*; }'
 RUN /pkg-install.sh GUI bash -c '{ cd /usr/lib \
 		&& curl -sf https://download-installer.cdn.mozilla.net/pub/firefox/releases/108.0.1/linux-x86_64/en-US/firefox-108.0.1.tar.bz2 | tar xfvj - \
 		&& ln -s /usr/lib/firefox/firefox /usr/bin/firefox; }'
@@ -412,7 +412,7 @@ RUN /pkg-install.sh    HUGE ghbin SagerNet/sing-box 'linux-amd64.' sing-box \
 	&& /pkg-install.sh HACK ghbin projectdiscovery/proxify 'linux_amd64.zip$' proxify \
 	&& /pkg-install.sh HACK ghbin projectdiscovery/katana 'linux_amd64.zip$' katana \
 	&& /pkg-install.sh HACK ghbin projectdiscovery/tlsx 'linux_amd64.zip$' tlsx \
-	&& /pkg-install.sh HACK ghbin s0md3v/smap 'linux_amd64.tar.xz$' smap \
+	&& /pkg-install.sh HACK ghbin s0md3v/smap 'linux_amd64.tar.xz$' smap
 RUN /pkg-install.sh    LARGE ghbin Peltoche/lsd 'lsd_.*_amd64.deb$' \
 	&& /pkg-install.sh LARGE ghbin cloudflare/cloudflared 'linux-amd64.deb$' \
 	&& /pkg-install.sh LARGE ghbin filebrowser/filebrowser '^linux-amd64-filebrowser.tar.gz$' filebrowser \
diff --git a/host/fs-root/bin/segfaultsh b/host/fs-root/bin/segfaultsh
index 19e6f22..1302788 100755
--- a/host/fs-root/bin/segfaultsh
+++ b/host/fs-root/bin/segfaultsh
@@ -1044,7 +1044,7 @@ exec_devnull docker run \
 	--env SF_IS_LOGINSHELL=1 \
 	-e SF_IS_GOLD_PROMPT \
 	--log-driver "${SF_DOCKER_LOG}" \
-	--mount type=tmpfs,destination=/tmp,tmpfs-mode=1777 \
+	--tmpfs /tmp:exec                                       `# GoLang needs /tmp to be executeable` \
 	--sysctl net.ipv6.conf.all.disable_ipv6=0               `# Allow IPv6 (used by WireGuard FOBs)` \
 	-v "${SF_CFG_GUEST_DIR:?}/:/config/guest:ro" \
 	-v "${SF_GUEST_SELFDIR:?}/lg-${LID}:/config/self:ro,slave" \

From b309afe7a8c5178ad227ac85aabbc9d71764edec Mon Sep 17 00:00:00 2001
From: SkyperTHC <skyper@thc.org>
Date: Wed, 29 Mar 2023 00:16:24 +0100
Subject: [PATCH 3/3] go-path

---
 guest/fs-root/etc/shellrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guest/fs-root/etc/shellrc b/guest/fs-root/etc/shellrc
index 3ed322a..1cde932 100644
--- a/guest/fs-root/etc/shellrc
+++ b/guest/fs-root/etc/shellrc
@@ -179,7 +179,7 @@ tty -s && [[ -n $TERM ]] && [[ "$TERM" != dumb ]] && {
 	PROMPT= PROMPT=$'%F{%(#.blue.green)}┌──${debian_chroot:+($debian_chroot)─}${VIRTUAL_ENV:+($(basename $VIRTUAL_ENV))─}(%F{%(#.yellow.blue)}%n'$prompt_symbol$'%m%b%F{%(#.blue.green)})-[%B%F{reset}%(6~.%-1~/…/%4~.%5~)%b%F{%(#.blue.green)}]\n%{%G└%}%{%G─%}%B%(#.%F{yellow}#.%F{blue}$)%b%F{reset} '
 }
 
-PATH="/sec/root/.local/bin:/sec/usr/sbin:/sec/usr/bin:/sf/bin:$PATH"
+PATH="${HOME:-/sec/root}/go/bin:/sec/root/.local/bin:/sec/usr/sbin:/sec/usr/bin:/sf/bin:$PATH"
 #[[ -d /sec/usr/bin ]] && PATH="/sec/usr/bin:$PATH"
 #[[ -d /sec/usr/sbin ]] && PATH="/sec/usr/sbin:$PATH"