From ea4c2253602fe2a4a4c95d516d21c06568cb9d94 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 5 Jun 2024 08:10:45 +0200 Subject: [PATCH 1/2] Upgrade libsodium to 1.0.20 --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 585f26ed..d8ea072c 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -314,7 +314,7 @@ RUN cmake --build . --target install # https://github.com/jedisct1/libsodium/releases # Needed by: # - php -ENV VERSION_LIBSODIUM=1.0.19 +ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 972b55ee..38524587 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -315,7 +315,7 @@ RUN cmake --build . --target install # https://github.com/jedisct1/libsodium/releases # Needed by: # - php -ENV VERSION_LIBSODIUM=1.0.19 +ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index a802825b..7d168d22 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -315,7 +315,7 @@ RUN cmake --build . --target install # https://github.com/jedisct1/libsodium/releases # Needed by: # - php -ENV VERSION_LIBSODIUM=1.0.19 +ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index f19537ef..421a13a8 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -315,7 +315,7 @@ RUN cmake --build . --target install # https://github.com/jedisct1/libsodium/releases # Needed by: # - php -ENV VERSION_LIBSODIUM=1.0.19 +ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ From a702ce48ae3710e0a9502e38350e4ef6855b43f6 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 5 Jun 2024 08:39:23 +0200 Subject: [PATCH 2/2] Fixed libsodium download URL --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index d8ea072c..d956aade 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -318,7 +318,7 @@ ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ - curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \ + curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \ | tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1 WORKDIR ${LIBSODIUM_BUILD_DIR}/ RUN CFLAGS="" \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 38524587..ec0854ce 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -319,7 +319,7 @@ ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ - curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \ + curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \ | tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1 WORKDIR ${LIBSODIUM_BUILD_DIR}/ RUN CFLAGS="" \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 7d168d22..10dfde55 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -319,7 +319,7 @@ ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ - curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \ + curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \ | tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1 WORKDIR ${LIBSODIUM_BUILD_DIR}/ RUN CFLAGS="" \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 421a13a8..f5a33a3a 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -319,7 +319,7 @@ ENV VERSION_LIBSODIUM=1.0.20 ENV LIBSODIUM_BUILD_DIR=${BUILD_DIR}/libsodium RUN set -xe; \ mkdir -p ${LIBSODIUM_BUILD_DIR}; \ - curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}.tar.gz \ + curl -Ls https://github.com/jedisct1/libsodium/archive/${VERSION_LIBSODIUM}-RELEASE.tar.gz \ | tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1 WORKDIR ${LIBSODIUM_BUILD_DIR}/ RUN CFLAGS="" \