From c455c1ae52d54507abfcd456436ee683db5b9171 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sat, 28 Aug 2021 17:26:02 +0200
Subject: [PATCH] unrealircd-5-libs -> unrealircd-6-libs [skip ci]

---
 Makefile.windows                     |  8 ++++----
 extras/build-tests/windows/build.bat |  8 ++++----
 src/windows/unrealinst.iss           | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.windows b/Makefile.windows
index bd9e78219..e67aff312 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -25,13 +25,13 @@ MT=mt
 #ARGON2LIB="Argon2RefDll.lib"
 
 ### SODIUM ###
-#SODIUM_LIB_DIR="C:\dev\unrealircd-5-libs\libsodium\......."
-#SODIUM_INC_DIR="C:\dev\unrealircd-5-libs\libsodium\......."
+#SODIUM_LIB_DIR="C:\dev\unrealircd-6-libs\libsodium\......."
+#SODIUM_INC_DIR="C:\dev\unrealircd-6-libs\libsodium\......."
 #SODIUMLIB="libsodium.lib"
 
 ### JANSSON ###
-#JANSSON_LIB_DIR="C:\dev\unrealircd-5-libs\jansson\......."
-#JANSSON_INC_DIR="C:\dev\unrealircd-5-libs\jansson\......."
+#JANSSON_LIB_DIR="C:\dev\unrealircd-6-libs\jansson\......."
+#JANSSON_INC_DIR="C:\dev\unrealircd-6-libs\jansson\......."
 #JANSSONLIB="libjansson.lib"
 
 ### C-ARES ####
diff --git a/extras/build-tests/windows/build.bat b/extras/build-tests/windows/build.bat
index 9f5c41bda..378201df3 100644
--- a/extras/build-tests/windows/build.bat
+++ b/extras/build-tests/windows/build.bat
@@ -16,8 +16,8 @@ rem cinst innosetup -y
 
 rem Installing UnrealIRCd dependencies
 cd \projects
-mkdir unrealircd-5-libs
-cd unrealircd-5-libs
+mkdir unrealircd-6-libs
+cd unrealircd-6-libs
 curl -fsS -o unrealircd-libraries-6-devel.zip https://www.unrealircd.org/files/dev/win/libs/unrealircd-libraries-6-devel.zip
 unzip unrealircd-libraries-6-devel.zip
 copy dlltool.exe \users\user\worker\unreal6-w10\build /y
@@ -42,9 +42,9 @@ curl -fsS -o src\modules\third\fakereputation.c https://raw.githubusercontent.co
 call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat CUSTOMMODULE MODULEFILE=fakereputation
 if %ERRORLEVEL% NEQ 0 EXIT /B 1
 
-rem Convert c:\dev to c:\projects\unrealircd-5-libs
+rem Convert c:\dev to c:\projects\unrealircd-6-libs
 rem TODO: should use environment variable in innosetup script?
-sed -i "s/c:\\dev\\unrealircd-5-libs/c:\\projects\\unrealircd-5-libs/gi" src\windows\unrealinst.iss
+sed -i "s/c:\\dev\\unrealircd-6-libs/c:\\projects\\unrealircd-6-libs/gi" src\windows\unrealinst.iss
 
 rem Build installer file
 "c:\Program Files (x86)\Inno Setup 5\iscc.exe" /Q- src\windows\unrealinst.iss
diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss
index f0a28443b..1668767cd 100644
--- a/src/windows/unrealinst.iss
+++ b/src/windows/unrealinst.iss
@@ -70,16 +70,16 @@ Source: "src\modules\snomasks\*.dll"; DestDir: "{app}\modules\snomasks"; Flags:
 Source: "src\modules\extbans\*.dll"; DestDir: "{app}\modules\extbans"; Flags: ignoreversion
 Source: "src\modules\third\*.dll"; DestDir: "{app}\modules\third"; Flags: ignoreversion skipifsourcedoesntexist
 
-Source: "c:\dev\unrealircd-5-libs\pcre2\bin\pcre*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "c:\dev\unrealircd-5-libs\argon2\vs2015\build\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "c:\dev\unrealircd-5-libs\libsodium\bin\x64\Release\v142\dynamic\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "c:\dev\unrealircd-5-libs\c-ares\msvc\cares\dll-release\cares.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "c:\dev\unrealircd-5-libs\libressl\bin\openssl.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "c:\dev\unrealircd-5-libs\libressl\bin\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source: "c:\dev\unrealircd-5-libs\setacl.exe"; DestDir: "{app}\tmp"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\pcre2\bin\pcre*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\argon2\vs2015\build\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\libsodium\bin\x64\Release\v142\dynamic\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\c-ares\msvc\cares\dll-release\cares.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\libressl\bin\openssl.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\libressl\bin\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\setacl.exe"; DestDir: "{app}\tmp"; Flags: ignoreversion
 
 #ifdef USE_CURL
-Source: "c:\dev\unrealircd-5-libs\curl\builds\libcurl-vc-x64-release-dll-ssl-dll-cares-dll-ipv6-obj-lib\libcurl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\curl\builds\libcurl-vc-x64-release-dll-ssl-dll-cares-dll-ipv6-obj-lib\libcurl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "doc\conf\tls\curl-ca-bundle.crt"; DestDir: "{app}\conf\tls"; Flags: ignoreversion
 #endif