| Adjust link order of libz to solve bug with static linking |
| and remove host paths when looking for openssl. |
| |
| [Vincent: |
| - Adapt the patch to make it apply on the new version.] |
| [Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10 & |
| 0.3.4.8] |
| Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> |
| Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> |
| |
| diff -uNr tor-0.3.1.7.org/configure.ac tor-0.3.1.7/configure.ac |
| --- tor-0.3.1.7.org/configure.ac 2017-09-15 15:34:06.000000000 +0200 |
| +++ tor-0.3.1.7/configure.ac 2017-09-19 19:40:17.090538467 +0200 |
| @@ -735,7 +735,7 @@ |
| ]) |
| |
| AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) |
| -TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32], |
| +TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32], |
| [#include <openssl/ssl.h> |
| char *getenv(const char *);], |
| [struct ssl_cipher_st; |
| diff -uNr tor-0.3.1.7.org/src/or/include.am tor-0.3.1.7/src/or/include.am |
| --- tor-0.3.1.7.org/src/or/include.am 2017-06-19 17:56:51.000000000 +0200 |
| +++ tor-0.3.1.7/src/or/include.am 2017-09-19 19:41:02.015861546 +0200 |
| @@ -135,7 +135,7 @@ |
| src/common/libor-event.a src/trunnel/libor-trunnel.a \ |
| src/trace/libor-trace.a \ |
| $(rust_ldadd) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ |
| + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ |
| @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ |
| @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ |
| @@ -149,7 +149,7 @@ |
| src/common/libor-ctime-testing.a \ |
| src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ |
| src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ |
| + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ |
| @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ |
| @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ |
| endif |
| diff -uNr tor-0.3.1.7.org/src/test/include.am tor-0.3.1.7/src/test/include.am |
| --- tor-0.3.1.7.org/src/test/include.am 2017-08-29 17:01:19.000000000 +0200 |
| +++ tor-0.3.1.7/src/test/include.am 2017-09-19 19:42:39.103903406 +0200 |
| @@ -222,8 +222,8 @@ |
| src/trunnel/libor-trunnel-testing.a \ |
| src/trace/libor-trace.a \ |
| $(rust_ldadd) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| + @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| @CURVE25519_LIBS@ \ |
| @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ |
| |
| @@ -248,8 +248,8 @@ |
| src/common/libor-event.a src/trunnel/libor-trunnel.a \ |
| src/trace/libor-trace.a \ |
| $(rust_ldadd) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| + @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| @CURVE25519_LIBS@ \ |
| @TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ |
| |
| @@ -262,8 +262,8 @@ |
| src/common/libor-event-testing.a \ |
| src/trace/libor-trace.a \ |
| $(rust_ldadd) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| + @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| @CURVE25519_LIBS@ \ |
| @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ |
| |
| @@ -275,8 +275,8 @@ |
| src/common/libor-event-testing.a \ |
| src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ |
| $(rust_ldadd) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| + @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ |
| + @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| @CURVE25519_LIBS@ \ |
| @TOR_LZMA_LIBS@ |
| src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS) |
| @@ -307,8 +307,8 @@ |
| src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ |
| src/trace/libor-trace.a \ |
| $(rust_ldadd) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ |
| - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| + @TOR_LIB_MATH@ \ |
| + @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ |
| @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ |
| src_test_test_ntor_cl_AM_CPPFLAGS = \ |
| -I"$(top_srcdir)/src/or" |
| @@ -318,8 +318,8 @@ |
| src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ |
| src/common/libor-ctime.a \ |
| src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ |
| - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ |
| - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ |
| + @TOR_LIB_MATH@ \ |
| + @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ |
| src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ |
| -I"$(top_srcdir)/src/or" |
| |
| diff -uNr tor-0.3.1.7.org/src/tools/include.am tor-0.3.1.7/src/tools/include.am |
| --- tor-0.3.1.7.org/src/tools/include.am 2017-06-19 17:56:51.000000000 +0200 |
| +++ tor-0.3.1.7/src/tools/include.am 2017-09-19 19:43:08.880223260 +0200 |
| @@ -27,7 +27,7 @@ |
| $(LIBKECCAK_TINY) \ |
| $(LIBDONNA) \ |
| $(rust_ldadd) \ |
| - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ |
| + @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ |
| @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ |
| |
| if COVERAGE_ENABLED |
| @@ -40,7 +40,7 @@ |
| src/common/libor-ctime-testing.a \ |
| $(LIBKECCAK_TINY) \ |
| $(LIBDONNA) \ |
| - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ |
| + @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ |
| @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ |
| endif |
| |
