From 66638f01fe06e5713268dc1308df0be511bfcdeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Garapich?= <michal@garapich.pl>
Date: Thu, 7 Mar 2024 23:19:23 +0100
Subject: [PATCH] fix(tf2-competitive): replace old curl extension with neocurl
 (#140)

---
 README.md                             |  2 ++
 packages/tf2-competitive/Dockerfile   | 16 +++++++---------
 packages/tf2-competitive/checksum.md5 |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4a50e32..3d31fb9 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,8 @@ TF2 server configured to be used in competitive matches. The following plugins,
 - [FixStvSlot](https://github.com/F2/F2s-sourcemod-plugins#fixstvslot-)
 - [AFK](https://github.com/F2/F2s-sourcemod-plugins#afk-)
 - [tf2rue](https://github.com/sapphonie/tf2rue)
+- [neocurl](https://github.com/sapphonie/SM-neocurl-ext)
+- [demos.tf](https://github.com/demostf/plugin)
 - [ETF2L.org configs](https://github.com/ETF2L/gameserver-configs)
 - [RGL.gg configs](https://github.com/RGLgg/server-resources-updater/tree/master/cfg)
 
diff --git a/packages/tf2-competitive/Dockerfile b/packages/tf2-competitive/Dockerfile
index c767dc2..69faa81 100644
--- a/packages/tf2-competitive/Dockerfile
+++ b/packages/tf2-competitive/Dockerfile
@@ -20,10 +20,9 @@ ARG MGEMOD_PLUGIN_FILE_NAME=mge.zip
 ARG MGEMOD_PLUGIN_VERSION=v3.0.3
 ARG MGEMOD_PLUGIN_URL=https://github.com/sapphonie/MGEMod/releases/download/${MGEMOD_PLUGIN_VERSION}/mge.zip
 
-ARG CURL_PLUGIN_FILE_NAME=curl_1.3.0.0.zip
-ARG CURL_PLUGIN_URL=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/sourcemod-curl-extension/${CURL_PLUGIN_FILE_NAME}
-ARG CURL_EXTENSION_FILE_NAME=curl.ext.so
-ARG CURL_EXTENSION_URL=https://raw.githubusercontent.com/spiretf/docker-comp-server/master/${CURL_EXTENSION_FILE_NAME}
+ARG NEOCURL_PLUGIN_FILE_NAME=sm-neocurl-repack.zip
+ARG NEOCURL_PLUGIN_VERSION=v2.0.1-beta1
+ARG NEOCURL_PLUGIN_URL=https://github.com/sapphonie/SM-neocurl-ext/releases/download/${NEOCURL_PLUGIN_VERSION}/${NEOCURL_PLUGIN_FILE_NAME}
 
 ARG ETF2L_CONFIGS_FILE_NAME=etf2l_configs.zip
 ARG ETF2L_CONFIGS_VERSION=1.0.12
@@ -57,8 +56,8 @@ ARG TF2RUE_PLUGIN_URL=https://github.com/sapphonie/tf2rue/releases/download/${TF
 
 RUN \
   # download all the plugins
-  wget -nv "${SOAP_DM_PLUGIN_URL}" "${COMP_FIXES_PLUGIN_URL}" "${UPDATED_PAUSE_PLUGIN_URL}" "${CURL_PLUGIN_URL}" \
-  "${CURL_EXTENSION_URL}" "${ETF2L_CONFIGS_URL}" "${RGL_CONFIGS_URL}" "${DEMOS_TF_PLUGIN_URL}" "${SRCTV_PLUS_SO_URL}" "${SRCTV_PLUS_VDF_URL}" \
+  wget -nv "${SOAP_DM_PLUGIN_URL}" "${COMP_FIXES_PLUGIN_URL}" "${UPDATED_PAUSE_PLUGIN_URL}" "${NEOCURL_PLUGIN_URL}" \
+  "${ETF2L_CONFIGS_URL}" "${RGL_CONFIGS_URL}" "${DEMOS_TF_PLUGIN_URL}" "${SRCTV_PLUS_SO_URL}" "${SRCTV_PLUS_VDF_URL}" \
   "${F2_SOURCEMOD_PLUGINS_URL}" "${TF2RUE_PLUGIN_URL}" "${MGEMOD_PLUGIN_URL}" \
   && wget -nv "${IMPROVED_MATCH_TIMER_PLUGIN_URL}" -O "${IMPROVED_MATCH_TIMER_PLUGIN_FILE_NAME}" \
   # verify md5 checksums
@@ -67,14 +66,13 @@ RUN \
   && unzip -q "${SOAP_DM_PLUGIN_FILE_NAME}" -d "${SERVER_DIR}/tf/" \
   && unzip -q -o "${COMP_FIXES_PLUGIN_FILE_NAME}" -d "${SERVER_DIR}/tf/" \
   && unzip -q -o "${UPDATED_PAUSE_PLUGIN_FILE_NAME}" -d "${SERVER_DIR}/tf/" \
-  && unzip -q -o "${CURL_PLUGIN_FILE_NAME}" -d "${SERVER_DIR}/tf/addons/sourcemod" \
+  && unzip -q -o "${NEOCURL_PLUGIN_FILE_NAME}" -d "${SERVER_DIR}/tf/addons/sourcemod" \
   && unzip -q "${ETF2L_CONFIGS_FILE_NAME}" -d "${SERVER_DIR}/tf/cfg/" \
   && unzip -q "${RGL_CONFIGS_FILE_NAME}" "cfg/*.cfg" && mv "cfg/"* "${SERVER_DIR}/tf/cfg/" \
   && unzip -q "${IMPROVED_MATCH_TIMER_PLUGIN_FILE_NAME}" \
   && unzip -q -n "${MGEMOD_PLUGIN_FILE_NAME}" -d "${SERVER_DIR}/tf" \
   && mv "Improved-Match-Timer-main/addons/sourcemod/plugins/"*.smx "${SERVER_DIR}/tf/addons/sourcemod/plugins/" \
   && mv "Improved-Match-Timer-main/addons/sourcemod/scripting/"*.sp "${SERVER_DIR}/tf/addons/sourcemod/scripting/" \
-  && mv "${CURL_EXTENSION_FILE_NAME}" "${SERVER_DIR}/tf/addons/sourcemod/extensions/${CURL_EXTENSION_FILE_NAME}" \
   && mv "${DEMOS_TF_PLUGIN_FILE_NAME}" "${SERVER_DIR}/tf/addons/sourcemod/plugins/${DEMOS_TF_PLUGIN_FILE_NAME}" \
   && mv "${SRCTV_PLUS_SO_FILE_NAME}" "${SERVER_DIR}/tf/addons/${SRCTV_PLUS_SO_FILE_NAME}" \
   && mv "${SRCTV_PLUS_VDF_FILE_NAME}" "${SERVER_DIR}/tf/addons/${SRCTV_PLUS_VDF_FILE_NAME}" \
@@ -85,7 +83,7 @@ RUN \
   && rm "${COMP_FIXES_PLUGIN_FILE_NAME}" \
   && rm "${UPDATED_PAUSE_PLUGIN_FILE_NAME}" \
   && rm "${MGEMOD_PLUGIN_FILE_NAME}" \
-  && rm "${CURL_PLUGIN_FILE_NAME}" \
+  && rm "${NEOCURL_PLUGIN_FILE_NAME}" \
   && rm "${ETF2L_CONFIGS_FILE_NAME}" \
   && rm -r "${RGL_CONFIGS_FILE_NAME}" "cfg" \
   && rm -r "${IMPROVED_MATCH_TIMER_PLUGIN_FILE_NAME}" "Improved-Match-Timer-main" \
diff --git a/packages/tf2-competitive/checksum.md5 b/packages/tf2-competitive/checksum.md5
index ea0c13a..f7b88bd 100644
--- a/packages/tf2-competitive/checksum.md5
+++ b/packages/tf2-competitive/checksum.md5
@@ -1,5 +1,4 @@
-7083db26e05ffcb1af52928709809f26  curl_1.3.0.0.zip
-011e7a2af1ad1f05b767113ff3709f0c  curl.ext.so
+0cce9627ca1a86eca1ca8f6e478229c2  sm-neocurl-repack.zip
 b1b12f3ff9dfc16db0f3e532eb213ef7  demostf.smx
 ce8db0558582735b89ca95c915c893e6  etf2l_configs.zip
 c99c94133bf7965f69a6b3c19d66a393  mge.zip