diff --git a/CMakeLists.txt b/CMakeLists.txt index 42bee0428..bc02c21b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ option(PYZMQ_LIBZMQ_RPATH "Add $ZMQ_PREFIX/lib to $RPATH (true by default). Set # anything new should start with PYZMQ_ option(PYZMQ_LIBZMQ_NO_BUNDLE "Prohibit building bundled libzmq. Useful for repackaging, to allow default search for libzmq and requiring it to succeed." OFF) set(PYZMQ_LIBZMQ_VERSION "4.3.5" CACHE STRING "libzmq version when bundling") -set(PYZMQ_LIBSODIUM_VERSION "1.0.19" CACHE STRING "libsodium version when bundling") +set(PYZMQ_LIBSODIUM_VERSION "1.0.20" CACHE STRING "libsodium version when bundling") set(PYZMQ_LIBZMQ_URL "" CACHE STRING "full URL to download bundled libzmq") set(PYZMQ_LIBSODIUM_URL "" CACHE STRING "full URL to download bundled libsodium") set(PYZMQ_LIBSODIUM_CONFIGURE_ARGS "" CACHE STRING "semicolon-separated list of arguments to pass to ./configure for bundled libsodium") diff --git a/buildutils/bundle.py b/buildutils/bundle.py index cfafe221e..ac9ae112d 100644 --- a/buildutils/bundle.py +++ b/buildutils/bundle.py @@ -12,7 +12,7 @@ repo_root = buildutils.parent.resolve() licenses = repo_root / "licenses" -bundled_libsodium_version = "1.0.19" +bundled_libsodium_version = "1.0.20" bundled_version = "4.3.5" @@ -28,7 +28,7 @@ def report_version(library="libzmq"): def fetch_licenses(): """Download license files for bundled dependencies""" licenses.mkdir(exist_ok=True) - libsodium_license_url = f"https://raw.githubusercontent.com/jedisct1/libsodium/{bundled_libsodium_version}/LICENSE" + libsodium_license_url = f"https://raw.githubusercontent.com/jedisct1/libsodium/{bundled_libsodium_version}-RELEASE/LICENSE" libzmq_license_url = ( f"https://raw.githubusercontent.com/zeromq/libzmq/v{bundled_version}/LICENSE" ) diff --git a/docs/source/howto/build.md b/docs/source/howto/build.md index 8a13c099d..91927ec64 100644 --- a/docs/source/howto/build.md +++ b/docs/source/howto/build.md @@ -172,14 +172,14 @@ You can specify which version of libsodium/libzmq to bundle with: ``` -DPYZMQ_LIBZMQ_VERSION=4.3.5 --DPYZMQ_LIBSODIUM_VERSION=1.0.19 +-DPYZMQ_LIBSODIUM_VERSION=1.0.20 ``` or the specify the full URL to download (e.g. to test bundling an unreleased version): ``` -DPYZMQ_LIBZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz" --DPYZMQ_LIBSODIUM_URL="https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz" +-DPYZMQ_LIBSODIUM_URL="https://download.libsodium.org/libsodium/releases/libsodium-1.0.20.tar.gz" ``` ```{warning} @@ -246,7 +246,7 @@ PYZMQ_LIBSODIUM_MSBUILD_ARGS:STRING= PYZMQ_LIBSODIUM_URL:STRING= # libsodium version when bundling -PYZMQ_LIBSODIUM_VERSION:STRING=1.0.19 +PYZMQ_LIBSODIUM_VERSION:STRING=1.0.20 # Visual studio solution version for bundled libsodium (default: detect from MSVC_VERSION) PYZMQ_LIBSODIUM_VS_VERSION:STRING= diff --git a/docs/source/howto/cross-android.Dockerfile b/docs/source/howto/cross-android.Dockerfile index 7584d2969..80f0158c6 100644 --- a/docs/source/howto/cross-android.Dockerfile +++ b/docs/source/howto/cross-android.Dockerfile @@ -54,7 +54,7 @@ RUN make install # (optional) cross-compile libsodium, libzmq WORKDIR /src -ENV LIBSODIUM_VERSION=1.0.19 +ENV LIBSODIUM_VERSION=1.0.20 RUN curl -L -O "https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz" \ && tar -xzf libsodium-${LIBSODIUM_VERSION}.tar.gz \ && mv libsodium-stable libsodium \ diff --git a/docs/source/howto/cross.Dockerfile b/docs/source/howto/cross.Dockerfile index 90dc16368..9094453b6 100644 --- a/docs/source/howto/cross.Dockerfile +++ b/docs/source/howto/cross.Dockerfile @@ -52,7 +52,7 @@ WORKDIR /src # # (optional) cross-compile libsodium, libzmq # WORKDIR /src -# ENV LIBSODIUM_VERSION=1.0.19 +# ENV LIBSODIUM_VERSION=1.0.20 # RUN curl -L -O "https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz" \ # && tar -xzf libsodium-${LIBSODIUM_VERSION}.tar.gz \ # && mv libsodium-stable libsodium \