Update libtorrent

zyrill · Nov 4, 2019 · 919eafa · 919eafa
1 parent bc33ca2
commit 919eafa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/cmake/libtorrent.cmake b/cmake/libtorrent.cmake
@@ -1,10 +1,4 @@
 
-add_library(
-    try_signal
-    STATIC
-    vendor/libtorrent/deps/try_signal/signal_error_code
-    vendor/libtorrent/deps/try_signal/try_signal)
-
 add_library(
     libtorrent-rasterbar
     STATIC
@@ -87,7 +81,6 @@ add_library(
     vendor/libtorrent/src/http_connection
     vendor/libtorrent/src/http_parser
     vendor/libtorrent/src/http_seed_connection
-    vendor/libtorrent/src/http_stream
     vendor/libtorrent/src/http_tracker_connection
     vendor/libtorrent/src/i2p_stream
     vendor/libtorrent/src/identify_client
@@ -169,6 +162,10 @@ add_library(
     vendor/libtorrent/src/web_peer_connection
     vendor/libtorrent/src/write_resume_data
     vendor/libtorrent/src/xml_parse
+
+    # try_signal
+    vendor/libtorrent/deps/try_signal/signal_error_code
+    vendor/libtorrent/deps/try_signal/try_signal
 )
 
 target_compile_definitions(
@@ -232,8 +229,9 @@ target_include_directories(
 
 target_link_libraries(
     libtorrent-rasterbar
+
+    # Boost
     ${Boost_LIBRARIES}
-    try_signal
 
     # OpenSSL
     OpenSSL::Crypto

diff --git a/vendor/libtorrent b/vendor/libtorrent
+4 −4		.travis.yml
+2 −1		CMakeLists.txt
+3 −0		ChangeLog
+8 −1		Jamfile
+0 −1		Makefile
+6 −2		docs/gen_settings_doc.py
+17 −21		examples/client_test.cpp
+88 −44		include/libtorrent/aux_/allocating_handler.hpp
+5 −0		include/libtorrent/aux_/hasher512.hpp
+14 −0		include/libtorrent/aux_/noexcept_movable.hpp
+1 −0		include/libtorrent/aux_/packet_pool.hpp
+1 −0		include/libtorrent/aux_/sha512.hpp
+2 −0		include/libtorrent/aux_/torrent_list.hpp
+0 −1		include/libtorrent/aux_/utp_stream.hpp
+207 −0		include/libtorrent/aux_/win_cng.hpp
+5 −1		include/libtorrent/aux_/win_crypto_provider.hpp
+32 −0		include/libtorrent/config.hpp
+3 −5		include/libtorrent/disk_buffer_pool.hpp
+12 −1		include/libtorrent/hasher.hpp
+1 −0		include/libtorrent/http_connection.hpp
+122 −11		include/libtorrent/http_stream.hpp
+427 −43		include/libtorrent/i2p_stream.hpp
+1 −0		include/libtorrent/kademlia/rpc_manager.hpp
+58 −28		include/libtorrent/peer_connection.hpp
+61 −9		include/libtorrent/proxy_base.hpp
+69 −88		include/libtorrent/settings_pack.hpp
+1 −0		include/libtorrent/sha1.hpp
+2 −1		include/libtorrent/sha256.hpp
+1 −0		include/libtorrent/sliding_average.hpp
+380 −24		include/libtorrent/socks5_stream.hpp
+1 −0		include/libtorrent/span.hpp
+20 −21		include/libtorrent/ssl_stream.hpp
+1 −0		include/libtorrent/time.hpp
+2 −3		include/libtorrent/torrent.hpp
+2 −1		simulation/test_error_handling.cpp
+12 −9		src/choker.cpp
+9 −9		src/cpuid.cpp
+1 −6		src/disk_buffer_pool.cpp
+7 −0		src/ed25519/hasher512.cpp
+1 −0		src/ed25519/sha512.cpp
+18 −4		src/hasher.cpp
+9 −8		src/http_connection.cpp
+0 −148		src/http_stream.cpp
+2 −364		src/i2p_stream.cpp
+0 −1		src/kademlia/rpc_manager.cpp
+79 −59		src/peer_connection.cpp
+2 −8		src/proxy_base.cpp
+6 −1		src/random.cpp
+1 −1		src/session_impl.cpp
+1 −0		src/sha1.cpp
+2 −1		src/sha256.cpp
+0 −341		src/socks5_stream.cpp
+14 −6		src/torrent.cpp
+4 −0		src/torrent_info.cpp
+22 −8		test/main.cpp
+6 −6		test/ssl/dhparams.pem
+60 −60		test/ssl/peer_certificate.pem
+28 −28		test/ssl/peer_private_key.pem
+59 −59		test/ssl/root_ca_cert.pem
+28 −28		test/ssl/root_ca_private.pem