diff --git a/CMakeLists.txt b/CMakeLists.txt index 9be3059..42bcb7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ resolve_library(LIBRARY_PATH_JSON OFF "${LIBRARY_PATH}/jsoncpp/bui resolve_library(LIBRARY_PATH_ED255 OFF "${LIBRARY_PATH}/ed25519/build/libed25519.a") resolve_library(LIBRARY_PATH_DATA_PIPES OFF "${LIBRARY_PATH}/DataPipes/build/libDataPipes.so" "${LIBRARY_PATH}/DataPipes/cmake-build-release/libDataPipes.so" "${LIBRARY_PATH}/DataPipes/cmake-build-debug/libDataPipes.so") resolve_library(LIBRARY_PATH_OPUS OFF "${LIBRARY_PATH}/opus/build/.libs/libopus.a") -resolve_library(LIBRARY_PATH_NICE OFF "${LIBRARY_PATH}/libnice/linux_${BUILD_OS_ARCH}/lib/libnice.so.10") +resolve_library(LIBRARY_PATH_NICE OFF "${LIBRARY_PATH}/libnice/linux_${BUILD_OS_ARCH}/lib/libnice.a") message("Found libnice at ${LIBRARY_PATH_NICE}") if (EXISTS "${LIBRARY_PATH}/glibc/linux_${BUILD_OS_ARCH}/lib/i386-linux-gnu/") @@ -67,7 +67,7 @@ else() message(FATAL_ERROR "Failed to find glibc") endif () message("Found GLIBC lib dir at ${GLIBC_LIB_DIR}") -#set(LIBRARY_PATH_GLIBC "${GLIBC_LIB_DIR}/libglib-2.0.a;${GLIBC_LIB_DIR}/libgobject-2.0.a;${GLIBC_LIB_DIR}/libffi.a") +set(LIBRARY_PATH_GLIBC "${GLIBC_LIB_DIR}/libgio-2.0.a;${GLIBC_LIB_DIR}/libgmodule-2.0.a;${GLIBC_LIB_DIR}/libglib-2.0.a;${GLIBC_LIB_DIR}/libgobject-2.0.a;${GLIBC_LIB_DIR}/libffi.a;resolv") add_definitions(-DINET -DINET6) add_subdirectory(shared/) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 5f6271b..7260969 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -38,6 +38,9 @@ set(COMPILE_WEB_CLIENT "ON") set(CMAKE_VERBOSE_MAKEFILE ON) set(SERVER_SOURCE_FILES main.cpp + tomcryptTest.cpp + MySQLLibSSLFix.c + src/client/ConnectedClient.cpp src/client/voice/PrecomputedPuzzles.cpp src/client/voice/VoiceClient.cpp @@ -87,8 +90,6 @@ set(SERVER_SOURCE_FILES src/manager/LetterManager.cpp src/manager/PermissionNameManager.cpp - tomcryptTest.cpp - src/pinteraction/ApplicationInteraction.cpp src/ServerManagerSnapshot.cpp src/ServerManagerSnapshotDeploy.cpp @@ -282,9 +283,11 @@ if(${COMPILE_WEB_CLIENT}) find_package(UsrSCTP REQUIRED) target_link_libraries(TeaSpeakServer ${LIBRARY_PATH_DATA_PIPES} + ${LIBRARY_PATH_NICE} + ${LIBRARY_PATH_GLIBC} ) - target_link_options(TeaSpeakServer PUBLIC "-Wl,--no-as-needed" "${LIBRARY_PATH_DATA_PIPES}" "${LIBRARY_PATH_NICE}" "-Wl,--as-needed") + #target_link_options(TeaSpeakServer PUBLIC "-Wl,--no-as-needed" "${LIBRARY_PATH_DATA_PIPES}" "${LIBRARY_PATH_NICE}" "-Wl,--as-needed") endif() include_directories(${LIBRARY_PATH}/boringssl/include/) target_link_libraries(TeaSpeakServer @@ -297,7 +300,7 @@ target_link_libraries(TeaSpeakServer set(DISABLE_JEMALLOC ON) if(NOT DISABLE_JEMALLOC) target_link_libraries(TeaSpeakServer - jemalloc + jemalloc ) add_definitions(-DHAVE_JEMALLOC) endif() diff --git a/server/MySQLLibSSLFix.c b/server/MySQLLibSSLFix.c new file mode 100644 index 0000000..6473a77 --- /dev/null +++ b/server/MySQLLibSSLFix.c @@ -0,0 +1,21 @@ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +const EVP_CIPHER *EVP_aes_128_cfb1(void){ return 0; } +const EVP_CIPHER *EVP_aes_192_cfb1(void){ return 0; } +const EVP_CIPHER *EVP_aes_256_cfb1(void){ return 0; } + +const EVP_CIPHER *EVP_aes_128_cfb8(void){ return 0; } +const EVP_CIPHER *EVP_aes_192_cfb8(void){ return 0; } +const EVP_CIPHER *EVP_aes_256_cfb8(void){ return 0; } + +const EVP_CIPHER *EVP_aes_128_cfb128(void){ return 0; } +const EVP_CIPHER *EVP_aes_192_cfb128(void){ return 0; } +const EVP_CIPHER *EVP_aes_256_cfb128(void){ return 0; } + +#ifdef __cplusplus +}; +#endif \ No newline at end of file