Merge branch 'develop'

Author: setvisible

3rd/libtorrent-rasterbar/CMakeLists.txt

@@ -192,7 +192,6 @@ set(libtorrent_extensions_include_files
 
 set(libtorrent_aux_include_files
 	alert_manager.hpp
-	aligned_storage.hpp
 	aligned_union.hpp
 	alloca.hpp
 	allocating_handler.hpp
@@ -620,7 +619,7 @@ if (WIN32)
 			debug dbghelp crypt32
 	)
 
-	add_definitions(-D_WIN32_WINNT=0x0601) # target Windows 7 or later
+	add_definitions(-D_WIN32_WINNT=0x0A00) # target Windows 10 or later
 
 	target_compile_definitions(torrent-rasterbar
 		PUBLIC WIN32_LEAN_AND_MEAN # prevent winsock1 to be included

3rd/libtorrent-rasterbar/ChangeLog

@@ -1,3 +1,26 @@
+
+2.0.11 released
+
+	* validate add_torrent_params::save_path at run-time
+	* use stricter rules for what filenames are valid on Android
+	* fix applying IP filter to DHT traffic (HanabishiRecca)
+	* fix race condition when cancelling requests after becoming a seed
+	* fix performance bug in the file pool, evicting MRU instead of LRU (HanabishiRecca)
+	* fix bug where file_progress could sometimes be reported as >100%
+	* don't hint FADV_RANDOM on posix systems. May improve seeding performance
+	* allow boost connect while checking resume data if no_verify_files flag is set
+	* fix BEP-40 peer priority for IPv6
+	* limit piece size in torrent creator
+	* fix file pre-allocation when changing file priority (HanabishiRecca)
+	* fix uTP issue where closing the connection could corrupt the payload
+	* apply DSCP/TOS to sockets before initiating the TCP connection
+	* assume copy_file_range() exists on linux (unless old glibc)
+	* fix issue where set_piece_deadline() did not correctly post read_piece_alert
+	* fix integer overflow in piece picker
+	* torrent_status::num_pieces counts pieces passed hash check, as documented
+	* check settings_pack::max_out_request_queue before performance alert
+	* add announce_port setting to override the port announced to trackers
+
 2.0.10 released
 
 	* allow on_unknown_torrent method in the absence of active torrents (new plugin feature added)
@@ -159,7 +182,7 @@
 2.0 released
 
 	* dropped dependency on iconv
-	* deprecate set_file_hash() in torrent creator, as it's superceded by v2 torrents
+	* deprecate set_file_hash() in torrent creator, as it's superseded by v2 torrents
 	* deprecate mutable access to info_section in torrent_info
 	* removed deprecated lazy_entry/lazy_bdecode
 	* stats_alert deprecated

3rd/libtorrent-rasterbar/Jamfile

@@ -12,7 +12,7 @@ import cast ;
 
 # we need version numbers in the form X.Y.Z in order to trigger the built-in
 # support for generating symlinks to the installed library
-VERSION = 2.0.10 ;
+VERSION = 2.0.11 ;
 
 BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
 CXXFLAGS = [ modules.peek : CXXFLAGS ] ;
@@ -43,11 +43,7 @@ else
 		<include>/opt/homebrew/include
 	;
 
-	# the names are decorated in MacPorts.
-	lib boost_system : : <target-os>darwin <name>boost_system-mt $(boost-lib-search-path)
-		: : $(boost-include-path) ;
-
-	lib boost_system : : <name>boost_system ;
+	lib boost_system : : <name>boost_system $(boost-lib-search-path) : : $(boost-include-path) ;
 }
 
 use-project /try_signal : ./deps/try_signal ;
@@ -68,6 +64,17 @@ rule linking ( properties * )
 		result += <library>dbghelp ;
 	}
 
+	if <target-os>windows in $(properties)
+	{
+		switch [ feature.get-values <windows-version> : $(properties) ]
+		{
+			case xp : result += <define>_WIN32_WINNT=0x0501 ;
+			case vista : result += <define>_WIN32_WINNT=0x0600 ;
+			case win7 : result += <define>_WIN32_WINNT=0x0601 ;
+			case win10 : result += <define>_WIN32_WINNT=0x0A00 ;
+		}
+	}
+
 	# gcrypt libraries, if enabled
 	if <crypto>gcrypt in $(properties)
 	{
@@ -176,7 +183,7 @@ rule linking ( properties * )
 	else if [ version.version-less $(jam-version) : 1990 0 ]
 	{
 		# the visibility feature was introduced in boost-1.69. This was close to
-		# when the verisoning scheme changed from year to (low) version numbers.
+		# when the versioning scheme changed from year to (low) version numbers.
 		# in boost-1.70
 		result += <visibility>hidden ;
 	}
@@ -346,7 +353,6 @@ rule building ( properties * )
 		}
 	}
 
-
 	if <toolset>gcc in $(properties) && <target-os>windows in $(properties)
 	{
 		# allow larger .obj files (with more sections)
@@ -578,11 +584,7 @@ feature.compose <asserts>on : <define>TORRENT_USE_ASSERTS=1 ;
 feature.compose <asserts>production : <define>TORRENT_USE_ASSERTS=1 <define>TORRENT_PRODUCTION_ASSERTS=1 ;
 feature.compose <asserts>system : <define>TORRENT_USE_ASSERTS=1 <define>TORRENT_USE_SYSTEM_ASSERTS=1 ;
 
-feature windows-version : win7 win10 vista xp : composite propagated ;
-feature.compose <windows-version>vista : <define>_WIN32_WINNT=0x0600 ;
-feature.compose <windows-version>win7 : <define>_WIN32_WINNT=0x0601 ;
-feature.compose <windows-version>win10 : <define>_WIN32_WINNT=0x0A00 ;
-feature.compose <windows-version>xp : <define>_WIN32_WINNT=0x0501 ;
+feature windows-version : win10 vista xp win7 : composite propagated ;
 
 feature extensions : on off : composite propagated link-incompatible ;
 feature.compose <extensions>off : <define>TORRENT_DISABLE_EXTENSIONS ;
@@ -679,6 +681,10 @@ feature export-extra : off on : composite propagated ;
 # symbol table reasonably small
 feature.compose <export-extra>on : <define>TORRENT_EXPORT_EXTRA ;
 
+feature msvc-version-macro : off on : composite propagated link-incompatible ;
+# ask the compiler to correctly set __cplusplus version
+feature.compose <msvc-version-macro>on : <cxxflags>/Zc\:__cplusplus ;
+
 lib advapi32 : : <name>advapi32 ;
 lib user32 : : <name>user32 ;
 lib shell32 : : <name>shell32 ;

3rd/libtorrent-rasterbar/Makefile

@@ -1,4 +1,4 @@
-VERSION=2.0.10
+VERSION=2.0.11
 
 BUILD_CONFIG=release link=shared crypto=openssl warnings=off address-model=64
 
@@ -569,7 +569,6 @@ HEADERS = \
   xml_parse.hpp                \
   \
   aux_/alert_manager.hpp            \
-  aux_/aligned_storage.hpp          \
   aux_/aligned_union.hpp            \
   aux_/alloca.hpp                   \
   aux_/allocating_handler.hpp       \

3rd/libtorrent-rasterbar/bindings/python/Jamfile

@@ -28,7 +28,7 @@ feature.compose <libtorrent-python-pic>on : <cxxflags>-fPIC ;
 feature python-install-path : : free path ;
 
 # when not specifying a custom install path, this controls whether to install
-# the python module in the system directory or user-specifc directory
+# the python module in the system directory or user-specific directory
 feature python-install-scope : user system : ;
 
 # copied from boost 1.63's boost python jamfile
@@ -79,6 +79,7 @@ else
 
 	local boost-include-path =
 		<include>/opt/local/include
+		<include>/opt/homebrew/include
 		<include>/usr/local/include
 		<include>/usr/sfw/include
 	;

3rd/libtorrent-rasterbar/bindings/python/setup.py

@@ -1,14 +1,9 @@
 #!/usr/bin/env python3
 
 import contextlib
-from distutils import log
-import distutils.cmd
-import distutils.command.install_data as install_data_lib
-import distutils.debug
-import distutils.errors
-import distutils.sysconfig
 import functools
 import itertools
+import logging as log
 import os
 import pathlib
 import re
@@ -75,11 +70,11 @@ def b2_version() -> Tuple[int, ...]:
 class B2Distribution(setuptools.Distribution):
     def reinitialize_command(
         self, command: str, reinit_subcommands: int = 0
-    ) -> distutils.cmd.Command:
+    ) -> setuptools.Command:
         if command == "build_ext":
-            return cast(distutils.cmd.Command, self.get_command_obj("build_ext"))
+            return cast(setuptools.Command, self.get_command_obj("build_ext"))
         return cast(
-            distutils.cmd.Command,
+            setuptools.Command,
             super().reinitialize_command(
                 command, reinit_subcommands=reinit_subcommands
             ),
@@ -102,7 +97,10 @@ def b2_escape(value: str) -> str:
 
 
 def write_b2_python_config(
-    include_dirs: Sequence[str], library_dirs: Sequence[str], config: IO[str]
+    include_dirs: Sequence[str],
+    library_dirs: Sequence[str],
+    ext_suffix: str,
+    config: IO[str],
 ) -> None:
     write = config.write
     # b2 keys python environments by X.Y version, breaking ties by matching
@@ -155,13 +153,8 @@ def write_b2_python_config(
     # other words we apply debian's override everywhere, and hope no other
     # overrides ever disagree with us.
 
-    # Note that sysconfig and distutils.sysconfig disagree here, especially on
-    # windows.
-    ext_suffix = distutils.sysconfig.get_config_var("EXT_SUFFIX")
-    ext_suffix = str(ext_suffix or "")
-
     # python.jam appends the platform-specific final suffix on its own. I can't
-    # find a consistent value from sysconfig or distutils.sysconfig for this.
+    # find a consistent value from sysconfig for this.
     for plat_suffix in (".pyd", ".dll", ".so", ".sl"):
         if ext_suffix.endswith(plat_suffix):
             ext_suffix = ext_suffix[: -len(plat_suffix)]
@@ -271,7 +264,7 @@ def finalize_options(self) -> None:
         super().finalize_options()
 
         if self.config_mode not in self.CONFIG_MODES:
-            raise distutils.errors.DistutilsOptionError(
+            raise setuptools.errors.DistutilsOptionError(
                 f"--config-mode must be one of {self.CONFIG_MODES}"
             )
 
@@ -382,10 +375,10 @@ def _configure_b2_with_distutils(self) -> Iterator[None]:
         if os.name == "nt":
             self._maybe_add_arg("--abbreviate-paths")
 
-        if distutils.debug.DEBUG:
-            self._maybe_add_arg("--debug-configuration")
-            self._maybe_add_arg("--debug-building")
-            self._maybe_add_arg("--debug-generators")
+        # if distutils.debug.DEBUG:
+        #    self._maybe_add_arg("--debug-configuration")
+        #    self._maybe_add_arg("--debug-building")
+        #    self._maybe_add_arg("--debug-generators")
 
         if sys.platform == "darwin":
             # boost.build defaults to toolset=clang on mac. However python.jam
@@ -411,7 +404,7 @@ def _configure_b2_with_distutils(self) -> Iterator[None]:
             # macOS uses multi-arch binaries. Attempt to match the
             # configuration of the running python by translating distutils
             # platform modes to b2 architecture modes
-            machine = distutils.util.get_platform().split("-")[-1]
+            machine = sysconfig.get_platform().split("-")[-1]
             if machine == "arm64":
                 self._maybe_add_arg("architecture=arm")
             elif machine in ("ppc", "ppc64"):
@@ -435,7 +428,10 @@ def _configure_b2_with_distutils(self) -> Iterator[None]:
             if self._maybe_add_arg(f"python={sysconfig.get_python_version()}"):
                 config_writers.append(
                     functools.partial(
-                        write_b2_python_config, self.include_dirs, self.library_dirs
+                        write_b2_python_config,
+                        self.include_dirs,
+                        self.library_dirs,
+                        os.path.basename(self.get_ext_fullpath("")),
                     )
                 )
 
@@ -500,21 +496,6 @@ def _find_project_config(self) -> Optional[pathlib.Path]:
         return None
 
 
-class InstallDataToLibDir(install_data_lib.install_data):
-    def finalize_options(self) -> None:
-        # install_data installs to the *base* directory, which is useless.
-        # Nothing ever gets installed there, no tools search there. You could
-        # only make use of it by manually picking the right install paths.
-        # This instead defaults the "install_dir" option to be "install_lib",
-        # which is "where packages are normally installed".
-        self.set_undefined_options(
-            "install",
-            ("install_lib", "install_dir"),  # note "install_lib"
-            ("root", "root"),
-            ("force", "force"),
-        )
-
-
 def find_all_files(path: str) -> Iterator[str]:
     for dirpath, _, filenames in os.walk(path):
         for filename in filenames:
@@ -532,7 +513,6 @@ def find_all_files(path: str) -> Iterator[str]:
     ext_modules=[StubExtension("libtorrent.__init__")],
     cmdclass={
         "build_ext": LibtorrentBuildExt,
-        "install_data": InstallDataToLibDir,
     },
     distclass=B2Distribution,
     data_files=[

3rd/libtorrent-rasterbar/bindings/python/src/alert.cpp

@@ -658,7 +658,7 @@ void bind_alert()
         ;
 
 #if TORRENT_ABI_VERSION == 1
-    enum_<listen_succeeded_alert::socket_type_t>("listen_succeded_alert_socket_type_t")
+    enum_<listen_succeeded_alert::socket_type_t>("listen_succeeded_alert_socket_type_t")
        .value("tcp", listen_succeeded_alert::socket_type_t::tcp)
        .value("tcp_ssl", listen_succeeded_alert::socket_type_t::tcp_ssl)
        .value("udp", listen_succeeded_alert::socket_type_t::udp)

3rd/libtorrent-rasterbar/bindings/python/src/torrent_handle.cpp

@@ -177,12 +177,12 @@ list file_priorities(torrent_handle& handle)
     return ret;
 }
 
-download_priority_t file_prioritity0(torrent_handle& h, file_index_t index)
+download_priority_t file_priority0(torrent_handle& h, file_index_t index)
 {
    return h.file_priority(index);
 }
 
-void file_prioritity1(torrent_handle& h, file_index_t index, download_priority_t prio)
+void file_priority1(torrent_handle& h, file_index_t index, download_priority_t prio)
 {
    return h.file_priority(index, prio);
 }
@@ -532,8 +532,8 @@ void bind_torrent_handle()
         .def("get_piece_priorities", &piece_priorities)
         .def("prioritize_files", &prioritize_files)
         .def("get_file_priorities", &file_priorities)
-        .def("file_priority", &file_prioritity0)
-        .def("file_priority", &file_prioritity1)
+        .def("file_priority", &file_priority0)
+        .def("file_priority", &file_priority1)
         .def("file_status", _(file_status0))
         .def("save_resume_data", _(&torrent_handle::save_resume_data), arg("flags") = 0)
         .def("need_save_resume_data", _(need_save_resume_data0))

3rd/libtorrent-rasterbar/cmake/Modules/GeneratePkgConfig.cmake

@@ -9,10 +9,10 @@ set(_GeneratePkGConfigDir "${CMAKE_CURRENT_LIST_DIR}/GeneratePkgConfig")
 
 include(GNUInstallDirs)
 
-function(_get_target_property_merging_configs _var_name _target_name _propert_name)
-	get_property(prop_set TARGET ${_target_name} PROPERTY ${_propert_name} SET)
+function(_get_target_property_merging_configs _var_name _target_name _property_name)
+	get_property(prop_set TARGET ${_target_name} PROPERTY ${_property_name} SET)
 	if (prop_set)
-		get_property(vals TARGET ${_target_name} PROPERTY ${_propert_name})
+		get_property(vals TARGET ${_target_name} PROPERTY ${_property_name})
 	else()
 		if (CMAKE_BUILD_TYPE)
 			list(APPEND configs ${CMAKE_BUILD_TYPE})
@@ -27,9 +27,9 @@ function(_get_target_property_merging_configs _var_name _target_name _propert_na
 			else()
 				set(target_cfg "${UPPERCFG}")
 			endif()
-			get_property(prop_set TARGET ${_target_name} PROPERTY ${_propert_name}_${target_cfg} SET)
+			get_property(prop_set TARGET ${_target_name} PROPERTY ${_property_name}_${target_cfg} SET)
 			if (prop_set)
-				get_property(val_for_cfg TARGET ${_target_name} PROPERTY ${_propert_name}_${target_cfg})
+				get_property(val_for_cfg TARGET ${_target_name} PROPERTY ${_property_name}_${target_cfg})
 				list(APPEND vals "$<$<CONFIG:${cfg}>:${val_for_cfg}>")
 				break()
 			endif()
@@ -38,7 +38,7 @@ function(_get_target_property_merging_configs _var_name _target_name _propert_na
 			get_property(imported_cfgs TARGET ${_target_name} PROPERTY IMPORTED_CONFIGURATIONS)
 			# CMake docs say we can use any of the imported configs
 			list(GET imported_cfgs 0 imported_config)
-			get_property(vals TARGET ${_target_name} PROPERTY ${_propert_name}_${imported_config})
+			get_property(vals TARGET ${_target_name} PROPERTY ${_property_name}_${imported_config})
 			# remove config generator expression. Only in this case! Notice we use such expression
 			# ourselves in the loop above
 			string(REPLACE "$<$<CONFIG:${imported_config}>:" "$<1:" vals "${vals}")

3rd/libtorrent-rasterbar/cmake/Modules/LibtorrentMacros.cmake

@@ -15,7 +15,7 @@ endmacro()
 # target_optional_compile_definitions(<target> [FEATURE]
 #   NAME <name> DESCRIPTION <description> DEFAULT <default_value>
 #   [ENABLED [enabled_compile_definitions...]]
-#   [DISABLED [disabled_compile_defnitions...]]
+#   [DISABLED [disabled_compile_definitions...]]
 # )
 # NAME, DESCRIPTION and DEFAULT are passed to option() call
 # if FEATURE is given, they are passed to add_feature_info()