From f302504dea117f1b82d2fa28b4b92c58b5bee949 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 21:18:57 +0000 Subject: [PATCH 1/6] updated buildfiles --- libraries/DataPipes | 2 +- libraries/boringssl | 2 +- libraries/breakpad | 2 +- libraries/build_boringssl.sh | 15 ++++++++++++++- libraries/build_mysqlconnector.sh | 2 +- libraries/event | 2 +- libraries/protobuf | 2 +- libraries/tomcrypt | 2 +- 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/libraries/DataPipes b/libraries/DataPipes index 43c9764..f8b8024 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 43c97648631c22d2ac9439944c7214175eda7605 +Subproject commit f8b8024caacbef279cd8951a14afe8fd464cc32a diff --git a/libraries/boringssl b/libraries/boringssl index e7b7877..ad8e29b 160000 --- a/libraries/boringssl +++ b/libraries/boringssl @@ -1 +1 @@ -Subproject commit e7b78770eca9724a7af2f344588693dcf8b327df +Subproject commit ad8e29b00d2b9c35ce5794bd92da38bb6a304728 diff --git a/libraries/breakpad b/libraries/breakpad index 948ce04..7b98eda 160000 --- a/libraries/breakpad +++ b/libraries/breakpad @@ -1 +1 @@ -Subproject commit 948ce04ed74397331c158c13209fd2370c2dbd5a +Subproject commit 7b98edabb61c6f06199fc22ffc9ebff580dfefc3 diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh index c9f4a86..b654186 100755 --- a/libraries/build_boringssl.sh +++ b/libraries/build_boringssl.sh @@ -1,4 +1,17 @@ -cd boringssl/build/ +cd boringssl/ +if [ ! -d lib ]; then + mkdir lib && cd lib + ln -s ../build/ssl/libssl.so . + ln -s ../build/crypto/libcrypto.so . + cd .. +fi +cat /include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null +if [ $? -ne 0 ]; then + echo "#if false + # define OPENSSL_VERSION_NUMBER 0x1010008fL + #endif" > include/openssl/opensslv.h +fi +cd build sudo apt-get install golang-go cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" make -j 12 diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index c3cbbd4..fb1f199 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -1,4 +1,4 @@ cd mysqlconnector/build -cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/"-DWITH_JDBC=ON +cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" make -j 12 sudo make install diff --git a/libraries/event b/libraries/event index c3a6fe7..ee12c51 160000 --- a/libraries/event +++ b/libraries/event @@ -1 +1 @@ -Subproject commit c3a6fe75e1511a4c7a7a6ef0a5954b1918902933 +Subproject commit ee12c516cf5766b2c32203dcc20c32b8691a8ebb diff --git a/libraries/protobuf b/libraries/protobuf index 3d62db3..9bbc4b1 160000 --- a/libraries/protobuf +++ b/libraries/protobuf @@ -1 +1 @@ -Subproject commit 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 +Subproject commit 9bbc4b1fab8262958c172f2d8e87b486c950a051 diff --git a/libraries/tomcrypt b/libraries/tomcrypt index 0f7fd3c..2c202ee 160000 --- a/libraries/tomcrypt +++ b/libraries/tomcrypt @@ -1 +1 @@ -Subproject commit 0f7fd3c606c204cf13b39ca35722782d3d05e319 +Subproject commit 2c202ee7c530b84c6387e0dd71be04ac254a1d17 From 7e7642d5e62be451451aaaaf3bea9e265d167429 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 21:28:19 +0000 Subject: [PATCH 2/6] updates --- TeaSpeak | 2 +- libraries/boringssl | 2 +- libraries/build_boringssl.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TeaSpeak b/TeaSpeak index b8d0712..756dbb3 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit b8d071276ac0be01ff93f30a347c1f5371f04d78 +Subproject commit 756dbb300a8de12440eb0b7394dde62056303fc4 diff --git a/libraries/boringssl b/libraries/boringssl index ad8e29b..e3ffaae 160000 --- a/libraries/boringssl +++ b/libraries/boringssl @@ -1 +1 @@ -Subproject commit ad8e29b00d2b9c35ce5794bd92da38bb6a304728 +Subproject commit e3ffaae0a31eded54fafed141bafd74222aa31aa diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh index b654186..c16a897 100755 --- a/libraries/build_boringssl.sh +++ b/libraries/build_boringssl.sh @@ -8,8 +8,8 @@ fi cat /include/openssl/opensslv.h | grep "OPENSSL_VERSION_NUMBER" &> /dev/null if [ $? -ne 0 ]; then echo "#if false - # define OPENSSL_VERSION_NUMBER 0x1010008fL - #endif" > include/openssl/opensslv.h +# define OPENSSL_VERSION_NUMBER 0x1010008fL +#endif" > include/openssl/opensslv.h fi cd build sudo apt-get install golang-go From 16c07d8d5bd182bc91a8bc254c5c09f61241082c Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 21:42:18 +0000 Subject: [PATCH 3/6] fixed build script --- libraries/build_mysqlconnector.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index fb1f199..dd9fea1 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -1,4 +1,16 @@ -cd mysqlconnector/build +cd mysqlconnector +HEADER=$(cat cdk/foundation/connection_openssl.cc) +if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then + echo "Creating new one!" + echo "#if !defined(SSL_ERROR_WANT_ASYNC) + #define SSL_ERROR_WANT_ASYNC 0x100000000 +#endif +#if !defined(SSL_ERROR_WANT_ASYNC_JOB) + #define SSL_ERROR_WANT_ASYNC_JOB 0x100000000 +#endif +`cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc +fi +cd build cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" make -j 12 sudo make install From de70339734fa0e86ad1ef57a63f780d1f21b27ce Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 21:43:27 +0000 Subject: [PATCH 4/6] fixed build script --- libraries/build_mysqlconnector.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index dd9fea1..25315a8 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -6,7 +6,7 @@ if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then #define SSL_ERROR_WANT_ASYNC 0x100000000 #endif #if !defined(SSL_ERROR_WANT_ASYNC_JOB) - #define SSL_ERROR_WANT_ASYNC_JOB 0x100000000 + #define SSL_ERROR_WANT_ASYNC_JOB 0x100000001 #endif `cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc fi From 5dc15b47a022fc05d7547a4a803d6e11b2e36f40 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 21:46:22 +0000 Subject: [PATCH 5/6] update --- libraries/build_mysqlconnector.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index 25315a8..8f0dc41 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -3,10 +3,10 @@ HEADER=$(cat cdk/foundation/connection_openssl.cc) if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then echo "Creating new one!" echo "#if !defined(SSL_ERROR_WANT_ASYNC) - #define SSL_ERROR_WANT_ASYNC 0x100000000 + #define SSL_ERROR_WANT_ASYNC 0xFFEEDDCC #endif #if !defined(SSL_ERROR_WANT_ASYNC_JOB) - #define SSL_ERROR_WANT_ASYNC_JOB 0x100000001 + #define SSL_ERROR_WANT_ASYNC_JOB 0xFFEECCDD #endif `cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc fi From 867d3f30b4ced914e5c13604a939b57c54d29a42 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Aug 2018 22:23:24 +0000 Subject: [PATCH 6/6] updates --- libraries/build_protobuf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/build_protobuf.sh b/libraries/build_protobuf.sh index 85f4fee..ee7c7e9 100755 --- a/libraries/build_protobuf.sh +++ b/libraries/build_protobuf.sh @@ -3,6 +3,6 @@ cd protobuf cd build ../configure make -make check +#make check sudo make install sudo ldconfig