From 53b79e9f5663aadd906a256f3e4020cf3e58a5ad Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Wed, 31 Jan 2024 11:22:37 +0000
Subject: [PATCH] Add libpsl

---
 php-80/Dockerfile | 22 ++++++++++++++++++++++
 php-81/Dockerfile | 22 ++++++++++++++++++++++
 php-82/Dockerfile | 22 ++++++++++++++++++++++
 php-83/Dockerfile | 22 ++++++++++++++++++++++
 4 files changed, 88 insertions(+)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index 8e8e394f..ec55d6bc 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -222,6 +222,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN ./autogen.sh && autoconf
+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
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index aa056f22..0ef804d6 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -223,6 +223,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN ./autogen.sh && autoconf
+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
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 0ba25bad..e1478059 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -223,6 +223,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN ./autogen.sh && autoconf
+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
diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index 3d1b0430..92ce50a5 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -223,6 +223,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \
+    | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
+WORKDIR  ${LIBPSL_BUILD_DIR}/
+RUN ./autogen.sh && autoconf
+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