Merge branch 'master' of http://git.mcgalaxy.de:8090/WolverinDEV/TeaSpeak-Parent

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

libraries/build_mysqlconnector.sh

@@ -1,4 +1,16 @@
-cd mysqlconnector/build
-cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/"-DWITH_JDBC=ON 
+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 0xFFEEDDCC
+#endif
+#if !defined(SSL_ERROR_WANT_ASYNC_JOB)
+	#define SSL_ERROR_WANT_ASYNC_JOB 0xFFEECCDD
+#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

libraries/build_protobuf.sh

@@ -3,6 +3,6 @@ cd protobuf
 cd build
 ../configure
 make
-make check
+#make check
 sudo make install
 sudo ldconfig