package/tor/0001-openssl-libz.patch

   1 Adjust link order of libz to solve bug with static linking
   2 and remove host paths when looking for openssl.
   3
   4 [Vincent:
   5  - Adapt the patch to make it apply on the new version.]
   6 [Bernd: rebased for tor-0.2.7.6 & 0.2.8.10]
   7
   8 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
   9 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  10
  11 diff -uNr tor-0.2.7.6.org/configure.ac tor-0.2.7.6/configure.ac
  12 --- tor-0.2.7.6.org/configure.ac        2015-12-10 16:15:25.000000000 +0100
  13 +++ tor-0.2.7.6/configure.ac    2016-01-31 20:21:34.850408145 +0100
  14 @@ -607,11 +607,11 @@
  15        fi
  16    ])
  17
  18 -TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
  19 +TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI],
  20      [#include <openssl/rand.h>],
  21      [void RAND_add(const void *buf, int num, double entropy);],
  22      [RAND_add((void*)0,0,0);], [],
  23 -    [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
  24 +    [])
  25
  26  dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
  27
  28 diff -uNr tor-0.2.7.6.org/src/or/include.am tor-0.2.7.6/src/or/include.am
  29 --- tor-0.2.7.6.org/src/or/include.am   2015-12-08 18:35:17.000000000 +0100
  30 +++ tor-0.2.7.6/src/or/include.am       2016-01-31 20:22:09.322777527 +0100
  31 @@ -110,7 +110,7 @@
  32  src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \
  33         src/common/libor-crypto.a $(LIBDONNA) \
  34         src/common/libor-event.a src/trunnel/libor-trunnel.a \
  35 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
  36 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
  37         @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
  38
  39  if COVERAGE_ENABLED
  40 diff -uNr tor-0.2.7.6.org/src/test/include.am tor-0.2.7.6/src/test/include.am
  41 --- tor-0.2.7.6.org/src/test/include.am 2015-12-08 18:35:17.000000000 +0100
  42 +++ tor-0.2.7.6/src/test/include.am     2016-01-31 20:25:59.673127854 +0100
  43 @@ -127,8 +127,8 @@
  44         src/common/libor-testing.a \
  45         src/common/libor-event-testing.a \
  46         src/trunnel/libor-trunnel-testing.a \
  47 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  48 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
  49 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  50 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
  51         @TOR_SYSTEMD_LIBS@
  52
  53  src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS)
  54 @@ -146,8 +146,8 @@
  55  src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
  56         src/common/libor-crypto.a $(LIBDONNA) \
  57         src/common/libor-event.a src/trunnel/libor-trunnel.a \
  58 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  59 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
  60 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  61 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
  62         @TOR_SYSTEMD_LIBS@
  63
  64  src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
  65 @@ -156,8 +156,8 @@
  66         src/common/libor-testing.a \
  67         src/common/libor-crypto-testing.a $(LIBDONNA) \
  68         src/common/libor-event-testing.a \
  69 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  70 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  71 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  72 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  73
  74  noinst_HEADERS+= \
  75         src/test/fakechans.h \
  76 @@ -174,8 +174,8 @@
  77  src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
  78  src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
  79         src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
  80 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
  81 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  82 +       @TOR_LIB_MATH@ \
  83 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  84  src_test_test_ntor_cl_AM_CPPFLAGS =           \
  85         -I"$(top_srcdir)/src/or"
  86
  87 diff -uNr tor-0.2.7.6.org/src/tools/include.am tor-0.2.7.6/src/tools/include.am
  88 --- tor-0.2.7.6.org/src/tools/include.am        2015-11-13 14:33:26.000000000 +0100
  89 +++ tor-0.2.7.6/src/tools/include.am    2016-01-31 20:27:29.954004495 +0100
  90 @@ -21,7 +21,7 @@
  91  src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
  92  src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \
  93      $(LIBDONNA) \
  94 -        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
  95 +        @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
  96          @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  97
  98  if COVERAGE_ENABLED
  99 @@ -32,7 +32,7 @@
 100  src_tools_tor_cov_gencert_LDADD = src/common/libor-testing.a \
 101      src/common/libor-crypto-testing.a \
 102      $(LIBDONNA) \
 103 -        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
 104 +        @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
 105          @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 106  endif
 107
 108 @@ -40,7 +40,7 @@
 109  src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
 110  src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \
 111      $(LIBDONNA) \
 112 -        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
 113 +        @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
 114          @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 115
 116  EXTRA_DIST += src/tools/tor-fw-helper/README