Merge pull request #157 from GrahamCampbell/curl-8-6-0

curl 8.6.0
brefphp · Jan 31, 2024 · 267db43 · 267db43
2 parents e055311 + 896d41f
commit 267db43
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 4 deletions.
diff --git a/php-80/Dockerfile b/php-80/Dockerfile
@@ -222,6 +222,27 @@ RUN CFLAGS="" \
 RUN make install
 
 
+###############################################################################
+# LIBPSL
+# This adds support for the public suffix list in curl.
+# https://github.com/rockdaboot/libpsl/releases
+# Needed by:
+#   - curl
+ENV VERSION_LIBPSL=0.21.5
+ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
+RUN set -xe; \
+    mkdir -p ${LIBPSL_BUILD_DIR}; \
+    curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN CFLAGS="" \
+    CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
+    LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
+    ./configure \
+    --prefix=${INSTALL_DIR}
+RUN make -j $(nproc) && make install
+
+
 ###############################################################################
 # CURL
 # # https://github.com/curl/curl/releases
@@ -232,7 +253,7 @@ RUN make install
 # #   - libnghttp2
 # # Needed by:
 # #   - php
-ENV VERSION_CURL=8.5.0
+ENV VERSION_CURL=8.6.0
 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
 RUN set -xe; \
     mkdir -p ${CURL_BUILD_DIR}/bin; \

diff --git a/php-81/Dockerfile b/php-81/Dockerfile
@@ -223,6 +223,27 @@ RUN CFLAGS="" \
 RUN make install
 
 
+###############################################################################
+# LIBPSL
+# This adds support for the public suffix list in curl.
+# https://github.com/rockdaboot/libpsl/releases
+# Needed by:
+#   - curl
+ENV VERSION_LIBPSL=0.21.5
+ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
+RUN set -xe; \
+    mkdir -p ${LIBPSL_BUILD_DIR}; \
+    curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN CFLAGS="" \
+    CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
+    LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
+    ./configure \
+    --prefix=${INSTALL_DIR}
+RUN make -j $(nproc) && make install
+
+
 ###############################################################################
 # CURL
 # # https://github.com/curl/curl/releases
@@ -233,7 +254,7 @@ RUN make install
 # #   - libnghttp2
 # # Needed by:
 # #   - php
-ENV VERSION_CURL=8.5.0
+ENV VERSION_CURL=8.6.0
 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
 RUN set -xe; \
     mkdir -p ${CURL_BUILD_DIR}/bin; \

diff --git a/php-82/Dockerfile b/php-82/Dockerfile
@@ -223,6 +223,27 @@ RUN CFLAGS="" \
 RUN make install
 
 
+###############################################################################
+# LIBPSL
+# This adds support for the public suffix list in curl.
+# https://github.com/rockdaboot/libpsl/releases
+# Needed by:
+#   - curl
+ENV VERSION_LIBPSL=0.21.5
+ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
+RUN set -xe; \
+    mkdir -p ${LIBPSL_BUILD_DIR}; \
+    curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN CFLAGS="" \
+    CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
+    LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
+    ./configure \
+    --prefix=${INSTALL_DIR}
+RUN make -j $(nproc) && make install
+
+
 ###############################################################################
 # CURL
 # # https://github.com/curl/curl/releases
@@ -233,7 +254,7 @@ RUN make install
 # #   - libnghttp2
 # # Needed by:
 # #   - php
-ENV VERSION_CURL=8.5.0
+ENV VERSION_CURL=8.6.0
 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
 RUN set -xe; \
     mkdir -p ${CURL_BUILD_DIR}/bin; \

diff --git a/php-83/Dockerfile b/php-83/Dockerfile
@@ -223,6 +223,27 @@ RUN CFLAGS="" \
 RUN make install
 
 
+###############################################################################
+# LIBPSL
+# This adds support for the public suffix list in curl.
+# https://github.com/rockdaboot/libpsl/releases
+# Needed by:
+#   - curl
+ENV VERSION_LIBPSL=0.21.5
+ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
+RUN set -xe; \
+    mkdir -p ${LIBPSL_BUILD_DIR}; \
+    curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN CFLAGS="" \
+    CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
+    LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
+    ./configure \
+    --prefix=${INSTALL_DIR}
+RUN make -j $(nproc) && make install
+
+
 ###############################################################################
 # CURL
 # # https://github.com/curl/curl/releases
@@ -233,7 +254,7 @@ RUN make install
 # #   - libnghttp2
 # # Needed by:
 # #   - php
-ENV VERSION_CURL=8.5.0
+ENV VERSION_CURL=8.6.0
 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
 RUN set -xe; \
     mkdir -p ${CURL_BUILD_DIR}/bin; \