From ae66074cd359dd26ccfc86bf2064f3ed30c84337 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sat, 11 May 2024 11:15:06 +0200
Subject: [PATCH 1/4] bump cibuildwheel action to v2.17.0

---
 .github/workflows/cibuildwheel.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
index 1f9390eec3c..3404982b9e2 100644
--- a/.github/workflows/cibuildwheel.yml
+++ b/.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

From 54b55dc3f8ab568d31101f547b909036e7ac14bc Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sat, 11 May 2024 18:27:28 +0200
Subject: [PATCH 2/4] fixup pyproject.toml

---
 pyproject.toml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a3b0b8c6955..9f245f3ab77 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,15 +62,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"
 

From f2d7f1936cdd8485a9d3ecefb18ab12bcd42e0f7 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sat, 8 Jun 2024 10:32:02 +0200
Subject: [PATCH 3/4] fix EXT_SUFFIX issue

---
 bindings/python/setup.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index d720c475beb..7880f9fd50e 100644
--- a/bindings/python/setup.py
+++ b/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("")),
                     )
                 )
 

From 3b3e1dd4d1eb4cbc4e839ac1dda7c825865d71cd Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Thu, 13 Jun 2024 00:23:30 +0200
Subject: [PATCH 4/4] rely on installed openssl on windows runners

---
 .github/workflows/python.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 6072e41e496..99aa5aa7213 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -68,16 +68,6 @@ jobs:
         cd boost
         .\b2 headers
 
-    - name: install openssl (windows)
-      if: runner.os == 'Windows'
-      uses: nick-fields/retry@v3
-      with:
-        shell: cmd
-        timeout_minutes: 5
-        retry_wait_seconds: 4
-        max_attempts: 3
-        command: choco install openssl --limitoutput --no-progress
-
     - name: build/install (windows)
       if: runner.os == 'Windows'
       shell: cmd