diff --git a/depends/packages/tor.mk b/depends/packages/tor.mk index 5f6f5ec21e..85dded3eaa 100644 --- a/depends/packages/tor.mk +++ b/depends/packages/tor.mk @@ -1,8 +1,8 @@ PACKAGE=tor -$(package)_version=0.4.3.5 +$(package)_version=0.4.7.7 $(package)_download_path=https://archive.torproject.org/tor-package-archive $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=616a0e4ae688d0e151d46e3e4258565da4d443d1ddbd316db0b90910e2d5d868 +$(package)_sha256_hash=3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44 $(package)_dependencies=zlib openssl libevent $(package)_patches = configure.patch $(package)_lib_files = \ @@ -40,6 +40,9 @@ $(package)_lib_files = \ src/lib/libtor-version.a \ src/lib/libtor-intmath.a \ src/lib/libtor-ctime.a \ + src/lib/libtor-llharden.a \ + src/lib/libtor-metrics.a \ + src/lib/libtor-trace.a \ src/trunnel/libor-trunnel.a \ src/lib/libcurve25519_donna.a \ src/ext/ed25519/donna/libed25519_donna.a \ diff --git a/depends/patches/tor/configure.patch b/depends/patches/tor/configure.patch index 181775aa05..0c00a76e6f 100644 --- a/depends/patches/tor/configure.patch +++ b/depends/patches/tor/configure.patch @@ -1,8 +1,8 @@ -diff --git a/tor-0.4.3.5/configure b/tor-0.4.3.5/configure -index b71cc3ec8..d6706420f 100755 ---- tor-0.4.3.5/configure -+++ tor-0.4.3.5/configure -@@ -8770,7 +8606,6 @@ for ac_func in _NSGetEnviron \ +diff --git a/tor-0.4.7.7/configure b/tor-0.4.7.7/configure +index 9ffb69e..5e8c248 100755 +--- tor-0.4.7.7/configure ++++ tor-0.4.7.7/configure +@@ -9769,7 +9769,6 @@ for ac_func in _NSGetEnviron \ backtrace \ backtrace_symbols_fd \ eventfd \ @@ -10,29 +10,29 @@ index b71cc3ec8..d6706420f 100755 timingsafe_memcmp \ flock \ fsync \ -@@ -9842,7 +9677,7 @@ else +@@ -10858,7 +10857,7 @@ else for tor_trydir in "$tryopenssldir" "(system)" "$prefix" /usr/local /usr/pkg /usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /opt/openssl; do LDFLAGS="$tor_saved_LDFLAGS" -- LIBS="$tor_saved_LIBS -lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32" -+ LIBS="$tor_saved_LIBS -lssl -lcrypto $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT -pthread" +- LIBS="-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $tor_saved_LIBS" ++ LIBS="-lssl -lcrypto $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT -pthread $tor_saved_LIBS" CPPFLAGS="$tor_saved_CPPFLAGS" if test -z "$tor_trydir" ; then -@@ -10004,7 +9839,7 @@ fi +@@ -11020,7 +11019,7 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tor_cv_library_openssl_dir" >&5 $as_echo "$tor_cv_library_openssl_dir" >&6; } --LIBS="$LIBS -lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32" -+LIBS="$LIBS -lssl -lcrypto $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT -pthread" +-LIBS="-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $LIBS" ++LIBS="-lssl -lcrypto $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT -pthread $LIBS" if test "$tor_cv_library_openssl_dir" != "(system)"; then if test -d "$tor_cv_library_openssl_dir/lib"; then -@@ -10136,10 +9971,10 @@ if test "$enable_static_openssl" = "yes"; then +@@ -11151,10 +11150,10 @@ if test "$enable_static_openssl" = "yes"; then if test "$tor_cv_library_openssl_dir" = "(system)"; then as_fn_error $? "\"You must specify an explicit --with-openssl-dir=x option when using --enable-static-openssl\"" "$LINENO" 5 else -- TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libssl.a $TOR_LIBDIR_openssl/libcrypto.a" +- TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libssl.a $TOR_LIBDIR_openssl/libcrypto.a $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT" + TOR_OPENSSL_LIBS="$TOR_LIBDIR_openssl/libssl.a $TOR_LIBDIR_openssl/libcrypto.a $TOR_LIB_WS32 $TOR_LIB_CRYPT32 $TOR_LIB_BCRYPT -pthread" fi else