Merge branch 'RC_2_0'

.github/workflows/cibuildwheel.yml

@@ -104,7 +104,7 @@ jobs:
     - uses: docker/setup-qemu-action@v3
       if: steps.cache-wheel.outputs.cache-hit != 'true' && runner.os == 'Linux'
 
-    - uses: pypa/cibuildwheel@v2.16.5
+    - uses: pypa/cibuildwheel@v2.17.0
       if: steps.cache-wheel.outputs.cache-hit != 'true'
 
     - uses: actions/upload-artifact@v3

.github/workflows/macos.yml

@@ -43,7 +43,7 @@ jobs:
       - name: install boost
         run: |
           brew install boost-build boost [email protected]
-          pip3 install websockets
+          pip3 install websockets --break-system-packages
           echo "using darwin ;" >>~/user-config.jam
 
       - name: build and run tests

.github/workflows/windows.yml

@@ -146,14 +146,6 @@ jobs:
           cd boost
           bootstrap.bat
 
-      - name: install openssl (64 bit)
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          retry_wait_seconds: 4
-          max_attempts: 3
-          command: choco install openssl --limitoutput --no-progress
-
       - name: boost headers
         run: |
           cd boost
@@ -197,14 +189,6 @@ jobs:
         with:
            submodules: true
 
-      - name: install openssl (64 bit)
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          retry_wait_seconds: 4
-          max_attempts: 3
-          command: choco install openssl --limitoutput --no-progress
-
       - name: install boost
         run: |
           git clone --depth=1 --recurse-submodules -j10 --branch=boost-1.78.0 https://github.com/boostorg/boost.git

ChangeLog

@@ -15,6 +15,7 @@
 
 2.0.11 not released
 
+	* 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

Jamfile

@@ -972,6 +972,9 @@ local usage-requirements =
 	<define>BOOST_ASIO_HAS_STD_CHRONO
 	<define>BOOST_ASIO_NO_DEPRECATED
 	<define>BOOST_SYSTEM_USE_UTF8
+	# C++17 removed std::unary_function which is used by boost/container_hash/hash.hpp
+	# in old versions of boost, without this define
+	<define>_HAS_AUTO_PTR_ETC=0
 	<conditional>@linking
 # msvc optimizations
 	<toolset>msvc,<variant>release:<linkflags>"/OPT:ICF=5"

bindings/python/setup.py

@@ -97,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
@@ -150,9 +153,6 @@ def write_b2_python_config(
     # other words we apply debian's override everywhere, and hope no other
     # overrides ever disagree with us.
 
-    ext_suffix = 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 for this.
     for plat_suffix in (".pyd", ".dll", ".so", ".sl"):
@@ -428,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("")),
                     )
                 )
 

include/libtorrent/aux_/heterogeneous_queue.hpp

@@ -16,6 +16,7 @@ see LICENSE file.
 #include <cstdlib> // for malloc
 #include <type_traits>
 #include <memory>
+#include <algorithm>
 
 #include "libtorrent/assert.hpp"
 #include "libtorrent/aux_/throw.hpp"

include/libtorrent/config.hpp

@@ -156,7 +156,11 @@ see LICENSE file.
 #define TORRENT_HAVE_MMAP 1
 #endif
 
-#if defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 27))
+#if defined __GLIBC__ && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 27))
+#define TORRENT_HAS_COPY_FILE_RANGE 0
+#elif defined __ANDROID__
+#define TORRENT_HAS_COPY_FILE_RANGE 0
+#else
 #define TORRENT_HAS_COPY_FILE_RANGE 1
 #endif
 

pyproject.toml

@@ -74,15 +74,13 @@ PATH = "/usr/lib/ccache/bin:/tmp/boost:$PATH"
 
 [[tool.cibuildwheel.overrides]]
 before-all = [
-  "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'",
-  "bash -c 'choco install --no-progress --x86 openssl'" # choco only allows EITHER 32 OR 64-bit version of a package
+  "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'"
 ]
 select = "*-win32"
 
 [[tool.cibuildwheel.overrides]]
 before-all = [
-  "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'",
-  "bash -c 'choco install --no-progress openssl'" # choco only allows EITHER 32 OR 64-bit version of a package
+  "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'"
 ]
 select = "*-win_amd64"