From 07aaba42d44e2327a358461e9c2e9698f92f3d43 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Thu, 26 Nov 2015 11:28:10 +0100 Subject: [PATCH 1/4] Fix missing openssl library on android 6.0 --- Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 628d9fd..cd8db97 100644 --- a/Android.mk +++ b/Android.mk @@ -91,11 +91,11 @@ LOCAL_STATIC_LIBRARIES := \ libapr-1 \ libaprutil-1 \ libiconv\ - libneon + libneon\ + libcrypto_static\ + libssl_static LOCAL_SHARED_LIBRARIES := \ - libcrypto\ - libssl\ libsqlite\ libexpat From 6c4d3c8fc4b28935f4129d3d3857e5de39bb7fef Mon Sep 17 00:00:00 2001 From: tux-mind Date: Thu, 26 Nov 2015 12:52:41 +0100 Subject: [PATCH 2/4] fixed wrong library name --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index cd8db97..618f813 100644 --- a/Android.mk +++ b/Android.mk @@ -93,7 +93,7 @@ LOCAL_STATIC_LIBRARIES := \ libiconv\ libneon\ libcrypto_static\ - libssl_static + libssl LOCAL_SHARED_LIBRARIES := \ libsqlite\ From d6270f9d53474caf2edd350bc0553a0a67e8ab22 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Thu, 26 Nov 2015 13:12:27 +0100 Subject: [PATCH 3/4] removed libmysqlclient it symbols clashes with openssl ones --- Android.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 618f813..45607d8 100644 --- a/Android.mk +++ b/Android.mk @@ -2,8 +2,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_CFLAGS:= -O3 -DLIBOPENSSL -DLIBFIREBIRD -DLIBIDN -DHAVE_PR29_H -DHAVE_PCRE \ - -DLIBMYSQLCLIENT -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \ - -DHAVE_MATH_H -DHAVE_MYSQL_H -DOPENSSL_NO_DEPRECATED -DNO_RSA_LEGACY \ + -DLIBNCP -DLIBPOSTGRES -DLIBSVN -DLIBSSH -DNO_RINDEX \ + -DHAVE_MATH_H -DOPENSSL_NO_DEPRECATED -DNO_RSA_LEGACY \ -fdata-sections -ffunction-sections LOCAL_LDFLAGS:=-Wl,--gc-sections @@ -13,7 +13,6 @@ LOCAL_C_INCLUDES:= \ external/openssl/include\ external/libssh/include\ external/libidn/lib\ - external/libmysqlclient/include\ external/subversion/subversion/include\ external/apr/include\ external/firebird/include\ @@ -80,7 +79,6 @@ LOCAL_SRC_FILES:= \ LOCAL_STATIC_LIBRARIES := \ libfbclient \ libidn \ - libmysqlclient \ libncp \ libpcre \ libpcrecpp \ From ae5e0b7510847a98202d7dbe75a3b8e2afc2a2a3 Mon Sep 17 00:00:00 2001 From: tux-mind Date: Fri, 27 Nov 2015 01:04:52 +0100 Subject: [PATCH 4/4] added missing source file --- Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.mk b/Android.mk index 45607d8..cf057dd 100644 --- a/Android.mk +++ b/Android.mk @@ -57,6 +57,7 @@ LOCAL_SRC_FILES:= \ hydra-rexec.c\ hydra-rlogin.c\ hydra-rsh.c\ + hydra-rtsp.c\ hydra-s7-300.c\ hydra-sapr3.c\ hydra-sip.c\