Merge pull request #1980 from minrk/libsodium-url

download libsodium from github release
zeromq · Apr 19, 2024 · 7390fbf · 7390fbf
2 parents 928f4cb + 469d307
commit 7390fbf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,7 +75,7 @@ if(ZMQ_DRAFT_API)
 endif()
 
 if (PYZMQ_LIBSODIUM_VERSION AND NOT PYZMQ_LIBSODIUM_URL)
-  set(PYZMQ_LIBSODIUM_URL "https://download.libsodium.org/libsodium/releases/libsodium-${PYZMQ_LIBSODIUM_VERSION}.tar.gz")
+  set(PYZMQ_LIBSODIUM_URL "https://github.com/jedisct1/libsodium/releases/download/${PYZMQ_LIBSODIUM_VERSION}-RELEASE/libsodium-${PYZMQ_LIBSODIUM_VERSION}.tar.gz")
 endif()
 
 if (PYZMQ_LIBZMQ_VERSION AND NOT PYZMQ_LIBZMQ_URL)

diff --git a/docs/source/changelog.md b/docs/source/changelog.md
@@ -7,6 +7,11 @@ For a full changelog, consult the [git log](https://github.com/zeromq/pyzmq/comm
 
 ## 26
 
+### 26.0.2
+
+- When bundling libsodium, download from libsodium's releases on GitHub instead of download.libsodium.org,
+  which appears to error frequently.
+
 ### 26.0.1
 
 - Fix install from source with cmake \< 3.21

diff --git a/tools/install_libzmq.sh b/tools/install_libzmq.sh
@@ -42,7 +42,7 @@ fi
 
 PREFIX="${ZMQ_PREFIX:-/usr/local}"
 
-curl -L -O "https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz"
+curl -L -O "https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz"
 
 curl -L -O "https://github.com/zeromq/libzmq/releases/download/v${LIBZMQ_VERSION}/zeromq-${LIBZMQ_VERSION}.tar.gz"