From ea219b08484fd0e8167ecf8bf4c2c7d7fb73596c Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeakde>
Date: Thu, 9 Aug 2018 17:43:18 +0000
Subject: [PATCH] several fixes

---
 TeaSpeak                     | 2 +-
 build_teaspeak.sh            | 2 +-
 libraries/Thread-Pool        | 2 +-
 libraries/build_boringssl.sh | 4 ++--
 libraries/build_ed25519.sh   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TeaSpeak b/TeaSpeak
index b8d0712..58d3e75 160000
--- a/TeaSpeak
+++ b/TeaSpeak
@@ -1 +1 @@
-Subproject commit b8d071276ac0be01ff93f30a347c1f5371f04d78
+Subproject commit 58d3e758b5f83c6724b5ece24b5fc672b1205ab8
diff --git a/build_teaspeak.sh b/build_teaspeak.sh
index 13f9dc2..34f7195 100755
--- a/build_teaspeak.sh
+++ b/build_teaspeak.sh
@@ -4,7 +4,7 @@ if [ -d build ]; then
 fi
 mkdir build && cd build
 
-cmake .. -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON
+cmake .. -DCMAKE_CXX_FLAGS="-I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON
 cmake --build `pwd` --target ProviderFFMpeg -- -j 12
 cmake --build `pwd` --target ProviderYT -- -j 12
 cmake --build `pwd` --target TeaSpeakServer -- -j 12
diff --git a/libraries/Thread-Pool b/libraries/Thread-Pool
index 5362de1..635c1e2 160000
--- a/libraries/Thread-Pool
+++ b/libraries/Thread-Pool
@@ -1 +1 @@
-Subproject commit 5362de13ea91fb272437e3f761fcd3419bc7c821
+Subproject commit 635c1e222e8761fed6636c9c7c794f8142b06eb8
diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh
index f703a9f..ca81d0a 100755
--- a/libraries/build_boringssl.sh
+++ b/libraries/build_boringssl.sh
@@ -5,7 +5,7 @@ if [ ! -d lib ]; then
 	ln -s ../build/crypto/libcrypto.so .
 	cd ..
 fi
-cat /include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null
+cat include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null
 if [ $? -ne 0 ]; then
 	echo "#if false
 # define OPENSSL_VERSION_NUMBER  0x1010008fL
@@ -13,6 +13,6 @@ if [ $? -ne 0 ]; then
 fi
 cd build
 sudo apt-get install golang-go
-cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
+cmake .. -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS}
 make ${CMAKE_MAKE_OPTIONS}
 #sudo make install
diff --git a/libraries/build_ed25519.sh b/libraries/build_ed25519.sh
index 3e787b7..5c96d10 100755
--- a/libraries/build_ed25519.sh
+++ b/libraries/build_ed25519.sh
@@ -1,4 +1,4 @@
 cd ed25519/build/
-cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS}
+cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS}
 make ${CMAKE_MAKE_OPTIONS}
 sudo make install