From b1449b76b9b4e0dfe01db4cee452e224dfc26442 Mon Sep 17 00:00:00 2001
From: Oleksii Shevchuk <alxchk@gmail.com>
Date: Sun, 21 Jun 2020 12:12:54 +0300
Subject: [PATCH] git: remove unnecessary submodules

---
 .gitmodules                              | 9 ---------
 client/sources-linux/build-docker.sh     | 5 +----
 client/sources/build-docker.sh           | 4 +---
 client/toolchain/docker-old-tc           | 1 -
 client/toolchain/docker-old-tc-bootstrap | 1 -
 pupy/conf/Dockerfile.env                 | 1 -
 pupy/external/pykcp                      | 1 -
 pupy/requirements.txt                    | 2 +-
 8 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 160000 client/toolchain/docker-old-tc
 delete mode 160000 client/toolchain/docker-old-tc-bootstrap
 delete mode 160000 pupy/external/pykcp

diff --git a/.gitmodules b/.gitmodules
index 1b8b3e06..0552c82e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,18 +22,9 @@
 [submodule "pupy/external/Inveigh"]
 	path = pupy/external/Inveigh
 	url = https://github.com/Kevin-Robertson/Inveigh.git
-[submodule "pupy/external/pykcp"]
-	path = pupy/external/pykcp
-	url = https://github.com/alxchk/pykcp
 [submodule "pupy/pupy/external/BeRoot"]
 	path = pupy/external/BeRoot
 	url = https://github.com/AlessandroZ/BeRoot
-[submodule "client/toolchain/docker-old-tc-bootstrap"]
-	path = client/toolchain/docker-old-tc-bootstrap
-	url = https://github.com/alxchk/docker-old-tc-bootstrap
-[submodule "client/toolchain/docker-old-tc"]
-	path = client/toolchain/docker-old-tc
-	url = https://github.com/alxchk/docker-old-tc
 [submodule "pupy/external/pyopus"]
 	path = pupy/external/pyopus
 	url = https://github.com/alxchk/pyopus
diff --git a/client/sources-linux/build-docker.sh b/client/sources-linux/build-docker.sh
index b50839e7..88e34885 100755
--- a/client/sources-linux/build-docker.sh
+++ b/client/sources-linux/build-docker.sh
@@ -10,7 +10,6 @@ PUPY=$(readlink -f ../../pupy/)
 TEMPLATES=$PUPY/payload_templates
 
 EXTERNAL=../../pupy/external
-PYKCP=$EXTERNAL/pykcp
 PYOPUS=$EXTERNAL/pyopus/src
 PIP_INSTALL="python -m pip install --upgrade"
 
@@ -46,6 +45,7 @@ $PIP_INSTALL \
     https://github.com/alxchk/tinyec/archive/master.zip \
     https://github.com/warner/python-ed25519/archive/master.zip \
     https://github.com/alxchk/urllib-auth/archive/master.zip \
+    https://github.com/alxchk/pykcp/archive/master.zip \
     zeroconf==0.19.1 pyodbc \
     watchdog pulsectl pycryptodomex==3.7.0 --no-binary :all:
 
@@ -73,9 +73,6 @@ LDFLAGS="$LDFLAGS -lasound -lm -lrt" $PIP_INSTALL pyaudio
 
 $PIP_INSTALL --force-reinstall pycparser==2.17
 
-echo "[+] Compile pykcp"
-rm -rf $PYKCP/{kcp.so,kcp.pyd,kcp.dll,build,KCP.egg-info}
-$PIP_INSTALL --force $PYKCP
 python -c 'import kcp' || exit 1
 
 echo "[+] Compile opus"
diff --git a/client/sources/build-docker.sh b/client/sources/build-docker.sh
index cdeaff76..c5bc761f 100755
--- a/client/sources/build-docker.sh
+++ b/client/sources/build-docker.sh
@@ -10,6 +10,7 @@ PACKAGES="$PACKAGES https://github.com/warner/python-ed25519/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/alxchk/tinyec/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/alxchk/urllib-auth/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/alxchk/winkerberos/archive/master.zip"
+PACKAGES="$PACKAGES https://github.com/alxchk/pykcp/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/alxchk/pyuv/archive/v1.x.zip"
 PACKAGES="$PACKAGES adodbapi idna http_parser pyodbc wmi==1.4.9"
 
@@ -23,7 +24,6 @@ cd $SRC
 EXTERNAL=$(readlink -f ../../pupy/external)
 TEMPLATES=$(readlink -f ../../pupy/payload_templates)
 WINPTY=$EXTERNAL/winpty
-PYKCP=$EXTERNAL/pykcp
 PYOPUS=$EXTERNAL/pyopus/src
 
 echo "[+] Install python packages"
@@ -51,8 +51,6 @@ for PYTHON in $PYTHON32 $PYTHON64; do
         exit 1
     fi
 
-    rm -rf $PYKCP/{kcp.so,kcp.pyd,kcp.dll,build,KCP.egg-info}
-    $PYTHON -m pip install --upgrade --force $PYKCP
     $PYTHON -c 'import kcp' || exit 1
 done
 
diff --git a/client/toolchain/docker-old-tc b/client/toolchain/docker-old-tc
deleted file mode 160000
index 64d7e10e..00000000
--- a/client/toolchain/docker-old-tc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 64d7e10eb591e1f19bd9a407a4daaf130cf11526
diff --git a/client/toolchain/docker-old-tc-bootstrap b/client/toolchain/docker-old-tc-bootstrap
deleted file mode 160000
index 1db3f806..00000000
--- a/client/toolchain/docker-old-tc-bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1db3f806509bed7d1132831d970d772053f37b8a
diff --git a/pupy/conf/Dockerfile.env b/pupy/conf/Dockerfile.env
index 3cfdab6f..1d01a0c6 100644
--- a/pupy/conf/Dockerfile.env
+++ b/pupy/conf/Dockerfile.env
@@ -23,7 +23,6 @@ RUN \
 	mkdir -p /build
 
 COPY requirements.txt /build/
-COPY external/pykcp /build/external/pykcp
 
 RUN \
 	python -m pip install --no-cache-dir --upgrade pip six setuptools wheel && \
diff --git a/pupy/external/pykcp b/pupy/external/pykcp
deleted file mode 160000
index e1ddec58..00000000
--- a/pupy/external/pykcp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e1ddec5808d7f8778a316280218e8df23429dab6
diff --git a/pupy/requirements.txt b/pupy/requirements.txt
index a6935cce..fdae9a75 100644
--- a/pupy/requirements.txt
+++ b/pupy/requirements.txt
@@ -43,7 +43,7 @@ dukpy
 pyaes
 chardet
 https://github.com/alxchk/urllib-auth/archive/master.zip
+https://github.com/alxchk/pykcp/archive/master.zip
 http_request
--e external/pykcp
 flake8
 flake8-per-file-ignores