cirros-testvm/src-cirros/buildroot-2015.05/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 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
   5
   6 diff -uNr tor-0.2.5.11.org/configure.ac tor-0.2.5.11/configure.ac
   7 --- tor-0.2.5.11.org/configure.ac       2015-03-12 17:49:50.000000000 +0100
   8 +++ tor-0.2.5.11/configure.ac   2015-03-29 14:32:05.058142751 +0200
   9 @@ -559,11 +559,11 @@
  10        fi
  11    ])
  12
  13 -TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
  14 +TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI],
  15      [#include <openssl/rand.h>],
  16      [void RAND_add(const void *buf, int num, double entropy);],
  17      [RAND_add((void*)0,0,0); exit(0);], [],
  18 -    [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
  19 +    [])
  20
  21  dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
  22
  23 diff -uNr tor-0.2.5.11.org/src/or/include.am tor-0.2.5.11/src/or/include.am
  24 --- tor-0.2.5.11.org/src/or/include.am  2015-03-12 17:49:50.000000000 +0100
  25 +++ tor-0.2.5.11/src/or/include.am      2015-03-29 14:37:35.409997674 +0200
  26 @@ -115,7 +115,7 @@
  27  src_or_tor_LDADD = src/or/libtor.a src/common/libor.a \
  28         src/common/libor-crypto.a $(LIBDONNA) \
  29         src/common/libor-event.a \
  30 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
  31 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
  32         @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  33
  34  if COVERAGE_ENABLED
  35 diff -uNr tor-0.2.5.11.org/src/test/include.am tor-0.2.5.11/src/test/include.am
  36 --- tor-0.2.5.11.org/src/test/include.am        2015-03-12 17:49:50.000000000 +0100
  37 +++ tor-0.2.5.11/src/test/include.am    2015-03-29 14:39:53.264265077 +0200
  38 @@ -59,16 +59,16 @@
  39  src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
  40         src/common/libor-crypto-testing.a $(LIBDONNA) \
  41         src/common/libor-event-testing.a \
  42 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  43 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  44 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  45 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  46
  47  src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
  48          @TOR_LDFLAGS_libevent@
  49  src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
  50         src/common/libor-crypto.a $(LIBDONNA) \
  51         src/common/libor-event.a \
  52 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  53 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  54 +       @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
  55 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  56
  57  noinst_HEADERS+= \
  58         src/test/test.h
  59 @@ -79,8 +79,8 @@
  60  src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
  61  src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
  62         src/common/libor-crypto.a $(LIBDONNA) \
  63 -       @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
  64 -       @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  65 +       @TOR_LIB_MATH@ \
  66 +       @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  67  src_test_test_ntor_cl_AM_CPPFLAGS =           \
  68         -I"$(top_srcdir)/src/or"
  69  NTOR_TEST_DEPS=src/test/test-ntor-cl
  70 diff -uNr tor-0.2.5.11.org/src/tools/include.am tor-0.2.5.11/src/tools/include.am
  71 --- tor-0.2.5.11.org/src/tools/include.am       2014-06-18 21:11:45.000000000 +0200
  72 +++ tor-0.2.5.11/src/tools/include.am   2015-03-29 14:41:29.143058949 +0200
  73 @@ -9,14 +9,14 @@
  74  src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
  75  src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \
  76         $(LIBDONNA) \
  77 -        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
  78 +        @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
  79          @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  80
  81  src_tools_tor_checkkey_SOURCES = src/tools/tor-checkkey.c
  82  src_tools_tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
  83  src_tools_tor_checkkey_LDADD = src/common/libor.a src/common/libor-crypto.a \
  84         $(LIBDONNA) \
  85 -        @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
  86 +        @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
  87          @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  88
  89  include src/tools/tor-fw-helper/include.am