1*4882a593SmuzhiyunFrom ba6b8ee5b6dee19493a150c3715b0e202440d206 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Bernd Kuhls <bernd.kuhls@t-online.de> 3*4882a593SmuzhiyunDate: Thu, 24 Jan 2019 18:19:51 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Fix static linking with OpenSSL 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunAdjust link order of libz to solve bug with static linking 7*4882a593Smuzhiyunand remove host paths when looking for openssl. 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun[Vincent: 10*4882a593Smuzhiyun - Adapt the patch to make it apply on the new version.] 11*4882a593Smuzhiyun[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10, 12*4882a593Smuzhiyun 0.3.4.8, 0.3.5.7, 0.4.4.5, 0.4.5.6 & 0.4.6.7] 13*4882a593Smuzhiyun[Fabrice: fix detection of openssl functions in 0.3.5.8] 14*4882a593SmuzhiyunSigned-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 15*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 16*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun configure.ac | 4 ++-- 19*4882a593Smuzhiyun src/test/include.am | 8 ++++---- 20*4882a593Smuzhiyun src/tools/include.am | 4 ++-- 21*4882a593Smuzhiyun 4 files changed, 9 insertions(+), 9 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 24*4882a593Smuzhiyunindex 05e1392cf..580befa6b 100644 25*4882a593Smuzhiyun--- a/configure.ac 26*4882a593Smuzhiyun+++ b/configure.ac 27*4882a593Smuzhiyun@@ -1074,7 +1074,7 @@ AC_ARG_WITH(ssl-dir, 28*4882a593Smuzhiyun ]) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) 31*4882a593Smuzhiyun-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], 32*4882a593Smuzhiyun+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], 33*4882a593Smuzhiyun [#include <openssl/ssl.h> 34*4882a593Smuzhiyun char *getenv(const char *);], 35*4882a593Smuzhiyun [struct ssl_cipher_st; 36*4882a593Smuzhiyun@@ -1104,7 +1104,7 @@ dnl Now check for particular openssl functions. 37*4882a593Smuzhiyun save_LIBS="$LIBS" 38*4882a593Smuzhiyun save_LDFLAGS="$LDFLAGS" 39*4882a593Smuzhiyun save_CPPFLAGS="$CPPFLAGS" 40*4882a593Smuzhiyun-LIBS="$TOR_OPENSSL_LIBS $LIBS" 41*4882a593Smuzhiyun+LIBS="$TOR_OPENSSL_LIBS -lz $LIBS" 42*4882a593Smuzhiyun LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS" 43*4882a593Smuzhiyun CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS" 44*4882a593Smuzhiyun 45*4882a593Smuzhiyundiff --git a/src/test/include.am b/src/test/include.am 46*4882a593Smuzhiyunindex ecb768957..39a622e88 100644 47*4882a593Smuzhiyun--- a/src/test/include.am 48*4882a593Smuzhiyun+++ b/src/test/include.am 49*4882a593Smuzhiyun@@ -399,8 +399,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) 50*4882a593Smuzhiyun src_test_test_ntor_cl_LDADD = \ 51*4882a593Smuzhiyun libtor.a \ 52*4882a593Smuzhiyun $(rust_ldadd) \ 53*4882a593Smuzhiyun- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ 54*4882a593Smuzhiyun- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ 55*4882a593Smuzhiyun+ @TOR_LIB_MATH@ \ 56*4882a593Smuzhiyun+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ 57*4882a593Smuzhiyun @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@ 58*4882a593Smuzhiyun src_test_test_ntor_cl_AM_CPPFLAGS = \ 59*4882a593Smuzhiyun $(AM_CPPFLAGS) 60*4882a593Smuzhiyun@@ -409,8 +409,8 @@ 61*4882a593Smuzhiyun src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) 62*4882a593Smuzhiyun src_test_test_hs_ntor_cl_LDADD = \ 63*4882a593Smuzhiyun libtor.a \ 64*4882a593Smuzhiyun- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ 65*4882a593Smuzhiyun- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ 66*4882a593Smuzhiyun+ @TOR_LIB_MATH@ \ 67*4882a593Smuzhiyun+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ 68*4882a593Smuzhiyun @CURVE25519_LIBS@ @TOR_TRACE_LIBS@ 69*4882a593Smuzhiyun src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ 70*4882a593Smuzhiyun $(AM_CPPFLAGS) 71*4882a593Smuzhiyundiff --git a/src/tools/include.am b/src/tools/include.am 72*4882a593Smuzhiyunindex f7aa7e0d1..4c4e8aa7a 100644 73*4882a593Smuzhiyun--- a/src/tools/include.am 74*4882a593Smuzhiyun+++ b/src/tools/include.am 75*4882a593Smuzhiyun@@ -35,7 +35,7 @@ src_tools_tor_gencert_LDADD = \ 76*4882a593Smuzhiyun $(TOR_CRYPTO_LIBS) \ 77*4882a593Smuzhiyun $(TOR_UTIL_LIBS) \ 78*4882a593Smuzhiyun $(rust_ldadd) \ 79*4882a593Smuzhiyun- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \ 80*4882a593Smuzhiyun+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ 81*4882a593Smuzhiyun @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ 82*4882a593Smuzhiyun endif 83*4882a593Smuzhiyun 84*4882a593Smuzhiyun@@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ 85*4882a593Smuzhiyun src/trunnel/libor-trunnel.a \ 86*4882a593Smuzhiyun $(TOR_CRYPTO_LIBS) \ 87*4882a593Smuzhiyun $(TOR_UTIL_LIBS) \ 88*4882a593Smuzhiyun- @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ 89*4882a593Smuzhiyun+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ 90*4882a593Smuzhiyun @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ 91*4882a593Smuzhiyun 92*4882a593Smuzhiyun if USE_NSS 93*4882a593Smuzhiyun-- 94*4882a593Smuzhiyun2.20.1 95