From e9ab8a565e69c8311a546224b6c116d5a8cb1db8 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Mon, 2 Mar 2020 18:43:38 +0100
Subject: [PATCH] Updated library refs

---
 .gitmodules                  | 3 +++
 libraries/DataPipes          | 2 +-
 libraries/boringssl          | 1 -
 libraries/build.sh           | 1 -
 libraries/build_breakpad.sh  | 2 +-
 libraries/build_datapipes.sh | 3 ++-
 libraries/build_ed25519.sh   | 3 ++-
 libraries/build_event.sh     | 3 ++-
 libraries/libnice            | 2 +-
 libraries/openssl-prebuild   | 1 +
 10 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 160000 libraries/boringssl
 create mode 160000 libraries/openssl-prebuild

diff --git a/.gitmodules b/.gitmodules
index fcc6bfd..885c9d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -69,3 +69,6 @@
 [submodule "libraries/glibc"]
 	path = libraries/glibc
 	url = https://git.did.science/WolverinDEV/glibc-prebuild.git
+[submodule "libraries/openssl-prebuild"]
+	path = libraries/openssl-prebuild
+	url = https://git.did.science/WolverinDEV/openssl-prebuild.git
diff --git a/libraries/DataPipes b/libraries/DataPipes
index 978e688..eb59bcf 160000
--- a/libraries/DataPipes
+++ b/libraries/DataPipes
@@ -1 +1 @@
-Subproject commit 978e688b7b0a3a4eebf17c9f72f9c22f14b605b7
+Subproject commit eb59bcfc53a23287da7ee0b4427cc26531d1a040
diff --git a/libraries/boringssl b/libraries/boringssl
deleted file mode 160000
index 1cc95ac..0000000
--- a/libraries/boringssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1cc95ac07c17d61bea601832bbdc1f8d13d313db
diff --git a/libraries/build.sh b/libraries/build.sh
index 6a75b19..058c452 100755
--- a/libraries/build.sh
+++ b/libraries/build.sh
@@ -60,7 +60,6 @@ function exec_script_external() {
 }
 
 exec_script_external build_libevent.sh event
-exec_script_external build_boringssl.sh boringssl
 exec_script_external build_breakpad.sh breakpad
 exec_script_external build_cxxterminal.sh CXXTerminal "libevent_path=event"
 exec_script build_datapipes.sh DataPipes
diff --git a/libraries/build_breakpad.sh b/libraries/build_breakpad.sh
index 74155a9..7490965 100755
--- a/libraries/build_breakpad.sh
+++ b/libraries/build_breakpad.sh
@@ -11,5 +11,5 @@ fi
 
 cd build
 ../configure
-make CXXFLAGS="-std=c++11 -I../../boringssl/include/ ${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
+make CXXFLAGS="-std=c++11 ${CXX_FLAGS}" CFLAGS="${C_FLAGS}" ${MAKE_OPTIONS}
 sudo make install
diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh
index 1296a5f..ed3cc25 100755
--- a/libraries/build_datapipes.sh
+++ b/libraries/build_datapipes.sh
@@ -57,7 +57,8 @@ _cxx_options=""
 [[ ${build_os_type} == "win32" ]] && _cxx_options="-DWIN32"
 
 general_options="-DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_CXX_FLAGS=\"$_cxx_options\" -DBUILD_TESTS=OFF -DBUILD_STATIC=0 -DBUILD_SHARED=1 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
-crypto_options="-DCrypto_ROOT_DIR=\"$(pwd)/boringssl/lib/\" -DCRYPTO_TYPE=\"boringssl\""
+#crypto_options="-DCrypto_ROOT_DIR=\"$(pwd)/boringssl/lib/\" -DCRYPTO_TYPE=\"boringssl\""
+crypto_options="-DCRYPTO_TYPE=\"openssl\" -DCrypto_ROOT_DIR=\"$(pwd)/openssl-prebuild/${build_os_type}_${build_os_arch}/\""
 
 command="cmake_build ${library_path} ${general_options} ${crypto_options} ${web_cmake_flags} ${CMAKE_OPTIONS}"
 eval "$command"
diff --git a/libraries/build_ed25519.sh b/libraries/build_ed25519.sh
index aa05adc..ba0024b 100755
--- a/libraries/build_ed25519.sh
+++ b/libraries/build_ed25519.sh
@@ -1,4 +1,5 @@
 cd ed25519/build/
-cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
+#cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
+cmake .. -DCMAKE_C_FLAGS="-fPIC ${C_FLAGS}" -DCMAKE_CXX_FLAGS="-fPIC ${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
 make ${CMAKE_MAKE_OPTIONS}
 sudo make install
diff --git a/libraries/build_event.sh b/libraries/build_event.sh
index b72decd..cdc0a0e 100755
--- a/libraries/build_event.sh
+++ b/libraries/build_event.sh
@@ -1,4 +1,5 @@
 cd event/build/
-cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} 
+#cmake .. -DCMAKE_C_FLAGS="-fPIC -I../../boringssl/include/ ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} 
+cmake .. -DCMAKE_C_FLAGS="-fPIC ${C_FLAGS}" -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_OPENSSL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS}
 make ${CMAKE_MAKE_OPTIONS}
 sudo make install
diff --git a/libraries/libnice b/libraries/libnice
index 6ca5739..f33e814 160000
--- a/libraries/libnice
+++ b/libraries/libnice
@@ -1 +1 @@
-Subproject commit 6ca5739b634a60f80ba64d5fe4d3e56371494fc9
+Subproject commit f33e8148d387c98babb5cdd62615e95e7c25ebe1
diff --git a/libraries/openssl-prebuild b/libraries/openssl-prebuild
new file mode 160000
index 0000000..8171e85
--- /dev/null
+++ b/libraries/openssl-prebuild
@@ -0,0 +1 @@
+Subproject commit 8171e857544d604abdf980f27239884d9f102523