From 805cd72ade67cf3baec20a4626d86e90f350db86 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:15:06 +0200
Subject: [PATCH 01/10] Document why we compile zlib

---
 php-80/Dockerfile | 4 ++++
 php-81/Dockerfile | 4 ++++
 php-82/Dockerfile | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index 858f5a2..458b76f 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -71,6 +71,10 @@ RUN mkdir -p ${BUILD_DIR}  \
 
 ###############################################################################
 # ZLIB Build
+# We compile a newer version because Lambda uses an old version (1.2.7) that
+# has a security vulnerability (CVE-2022-37434).
+# See https://github.com/brefphp/aws-lambda-layers/pull/110
+# Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
 # Needed for:
 #   - openssl
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 27e07a5..57517ca 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -71,6 +71,10 @@ RUN mkdir -p ${BUILD_DIR}  \
 
 ###############################################################################
 # ZLIB Build
+# We compile a newer version because Lambda uses an old version (1.2.7) that
+# has a security vulnerability (CVE-2022-37434).
+# See https://github.com/brefphp/aws-lambda-layers/pull/110
+# Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
 # Needed for:
 #   - openssl
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 091f8ba..6733b7f 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -71,6 +71,10 @@ RUN mkdir -p ${BUILD_DIR}  \
 
 ###############################################################################
 # ZLIB Build
+# We compile a newer version because Lambda uses an old version (1.2.7) that
+# has a security vulnerability (CVE-2022-37434).
+# See https://github.com/brefphp/aws-lambda-layers/pull/110
+# Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
 # Needed for:
 #   - openssl

From e1a20300cb3043d3898d54c0e00a177af3458677 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:16:14 +0200
Subject: [PATCH 02/10] Switch to HTTPS URL

---
 php-80/Dockerfile | 2 +-
 php-81/Dockerfile | 2 +-
 php-82/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index 458b76f..2c2d404 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -88,7 +88,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
 # Download and upack the source code
-    curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 
 # Move into the unpackaged code directory
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 57517ca..8280930 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -88,7 +88,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
 # Download and upack the source code
-    curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 
 # Move into the unpackaged code directory
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 6733b7f..56bdf50 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -88,7 +88,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
 # Download and upack the source code
-    curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 
 # Move into the unpackaged code directory

From c3e44c7be391e280de02692f0e31a8709e3001d8 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:17:29 +0200
Subject: [PATCH 03/10] Fix zlib build dir

---
 php-80/Dockerfile | 2 +-
 php-81/Dockerfile | 2 +-
 php-82/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index 2c2d404..5e7ed5e 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -83,7 +83,7 @@ RUN mkdir -p ${BUILD_DIR}  \
 # Used By:
 #   - xml2
 ENV VERSION_ZLIB=1.3
-ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
+ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 8280930..3a77855 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -83,7 +83,7 @@ RUN mkdir -p ${BUILD_DIR}  \
 # Used By:
 #   - xml2
 ENV VERSION_ZLIB=1.3
-ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
+ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 56bdf50..c800548 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -83,7 +83,7 @@ RUN mkdir -p ${BUILD_DIR}  \
 # Used By:
 #   - xml2
 ENV VERSION_ZLIB=1.3
-ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
+ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \

From b2c6214fa321cfb4406fa916d4d4f4c8e2bde252 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:18:48 +0200
Subject: [PATCH 04/10] Format the zlib install code like other sections

---
 php-80/Dockerfile | 7 -------
 php-81/Dockerfile | 7 -------
 php-82/Dockerfile | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index 5e7ed5e..e64af57 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -84,17 +84,11 @@ RUN mkdir -p ${BUILD_DIR}  \
 #   - xml2
 ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
-
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-# Download and upack the source code
     curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
-
-# Move into the unpackaged code directory
 WORKDIR ${ZLIB_BUILD_DIR}/
-
-# Configure the build
 RUN set -xe; \
     make distclean \
  && CFLAGS="" \
@@ -103,7 +97,6 @@ RUN set -xe; \
     ./configure \
     --prefix=${INSTALL_DIR} \
     --64
-
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 3a77855..fd52f49 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -84,17 +84,11 @@ RUN mkdir -p ${BUILD_DIR}  \
 #   - xml2
 ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
-
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-# Download and upack the source code
     curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
-
-# Move into the unpackaged code directory
 WORKDIR ${ZLIB_BUILD_DIR}/
-
-# Configure the build
 RUN set -xe; \
     make distclean \
  && CFLAGS="" \
@@ -103,7 +97,6 @@ RUN set -xe; \
     ./configure \
     --prefix=${INSTALL_DIR} \
     --64
-
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index c800548..de6ed22 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -84,17 +84,11 @@ RUN mkdir -p ${BUILD_DIR}  \
 #   - xml2
 ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
-
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-# Download and upack the source code
     curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
-
-# Move into the unpackaged code directory
 WORKDIR ${ZLIB_BUILD_DIR}/
-
-# Configure the build
 RUN set -xe; \
     make distclean \
  && CFLAGS="" \
@@ -103,7 +97,6 @@ RUN set -xe; \
     ./configure \
     --prefix=${INSTALL_DIR} \
     --64
-
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a

From 5735acf8e1d7ce01f10ef8f4420bdcaa92d7230a Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:19:23 +0200
Subject: [PATCH 05/10] Clarify comment on why we install zlib

---
 php-80/Dockerfile | 6 ------
 php-81/Dockerfile | 6 ------
 php-82/Dockerfile | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index e64af57..da139e3 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -76,12 +76,6 @@ RUN mkdir -p ${BUILD_DIR}  \
 # See https://github.com/brefphp/aws-lambda-layers/pull/110
 # Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
-# Needed for:
-#   - openssl
-#   - curl
-#   - php
-# Used By:
-#   - xml2
 ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index fd52f49..159c805 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -76,12 +76,6 @@ RUN mkdir -p ${BUILD_DIR}  \
 # See https://github.com/brefphp/aws-lambda-layers/pull/110
 # Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
-# Needed for:
-#   - openssl
-#   - curl
-#   - php
-# Used By:
-#   - xml2
 ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index de6ed22..6bc6e10 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -76,12 +76,6 @@ RUN mkdir -p ${BUILD_DIR}  \
 # See https://github.com/brefphp/aws-lambda-layers/pull/110
 # Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
-# Needed for:
-#   - openssl
-#   - curl
-#   - php
-# Used By:
-#   - xml2
 ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \

From 74a618940e31ae98c4577971db07d2bfb20ee1f2 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:20:14 +0200
Subject: [PATCH 06/10] Update the PHP 8.3 config following changes in the zlib
 install instructions

---
 php-83/Dockerfile | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index 2fc7ced..4d3b6fe 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -72,26 +72,18 @@ RUN mkdir -p ${BUILD_DIR}  \
 
 ###############################################################################
 # ZLIB Build
+# We compile a newer version because Lambda uses an old version (1.2.7) that
+# has a security vulnerability (CVE-2022-37434).
+# See https://github.com/brefphp/aws-lambda-layers/pull/110
+# Can be removed once Lambda updates their version.
 # https://github.com/madler/zlib/releases
-# Needed for:
-#   - openssl
-#   - curl
-#   - php
-# Used By:
-#   - xml2
 ENV VERSION_ZLIB=1.3
-ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
-
+ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-# Download and upack the source code
-    curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
-
-# Move into the unpackaged code directory
 WORKDIR ${ZLIB_BUILD_DIR}/
-
-# Configure the build
 RUN set -xe; \
     make distclean \
  && CFLAGS="" \

From c54054025bdb8087f05b6cddeb6ada51267e31e0 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:25:45 +0200
Subject: [PATCH 07/10] Try using the HTTP URL to see if it fixes the build

---
 php-80/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index da139e3..61e39d6 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -80,7 +80,7 @@ ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \

From a19dc1aabcf717dce68b75a10c2973799a48ff9c Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 14:56:48 +0200
Subject: [PATCH 08/10] Update zlib download URLs

---
 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 61e39d6..f3580ca 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -80,7 +80,7 @@ ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-    curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 159c805..6a772b8 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -80,7 +80,7 @@ ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 6bc6e10..0a2032d 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -80,7 +80,7 @@ ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index 4d3b6fe..fb3cd18 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -81,7 +81,7 @@ ENV VERSION_ZLIB=1.3
 ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
-    curl -Ls https://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
+    curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
   | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \

From 8f93de16d04020c6fb788db7930fab541e7ca060 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 17:14:00 +0200
Subject: [PATCH 09/10] Fix the tar command

---
 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 f3580ca..9a1a90e 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -81,7 +81,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
     curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
-  | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
+  | tar xzC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
     make distclean \
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 6a772b8..2a9dfc7 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -81,7 +81,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
     curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
-  | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
+  | tar xzC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
     make distclean \
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 0a2032d..5684b7b 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -81,7 +81,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
     curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
-  | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
+  | tar xzC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
     make distclean \
diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index fb3cd18..87b16a2 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -82,7 +82,7 @@ ENV ZLIB_BUILD_DIR=${BUILD_DIR}/zlib
 RUN set -xe; \
     mkdir -p ${ZLIB_BUILD_DIR}; \
     curl -Ls https://github.com/madler/zlib/releases/download/v${VERSION_ZLIB}/zlib-${VERSION_ZLIB}.tar.gz \
-  | tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
+  | tar xzC ${ZLIB_BUILD_DIR} --strip-components=1
 WORKDIR ${ZLIB_BUILD_DIR}/
 RUN set -xe; \
     make distclean \

From 284e29a052423e17d72374918c4004f67b8207d0 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Thu, 31 Aug 2023 17:14:20 +0200
Subject: [PATCH 10/10] Fix the zlib build

---
 php-80/Dockerfile | 3 +--
 php-81/Dockerfile | 3 +--
 php-82/Dockerfile | 3 +--
 php-83/Dockerfile | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/php-80/Dockerfile b/php-80/Dockerfile
index 9a1a90e..bb738dd 100644
--- a/php-80/Dockerfile
+++ b/php-80/Dockerfile
@@ -89,8 +89,7 @@ RUN set -xe; \
     CPPFLAGS="-I${INSTALL_DIR}/include  -I/usr/include" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./configure \
-    --prefix=${INSTALL_DIR} \
-    --64
+    --prefix=${INSTALL_DIR}
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a
diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 2a9dfc7..2f21f67 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -89,8 +89,7 @@ RUN set -xe; \
     CPPFLAGS="-I${INSTALL_DIR}/include  -I/usr/include" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./configure \
-    --prefix=${INSTALL_DIR} \
-    --64
+    --prefix=${INSTALL_DIR}
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index 5684b7b..5dbeff5 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -89,8 +89,7 @@ RUN set -xe; \
     CPPFLAGS="-I${INSTALL_DIR}/include  -I/usr/include" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./configure \
-    --prefix=${INSTALL_DIR} \
-    --64
+    --prefix=${INSTALL_DIR}
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a
diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index 87b16a2..1a70317 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -90,9 +90,7 @@ RUN set -xe; \
     CPPFLAGS="-I${INSTALL_DIR}/include  -I/usr/include" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./configure \
-    --prefix=${INSTALL_DIR} \
-    --64
-
+    --prefix=${INSTALL_DIR}
 RUN set -xe; \
     make install \
  && rm ${INSTALL_DIR}/lib/libz.a