-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[security] Update php #20536
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[security] Update php #20536
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/php@5c037aba: Update 8.1 to 8.1.34 (docker-library/php#1638)
Diff for bc0df28:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 15f9147..bc393e0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,74 +1,74 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/php.git
-Tags: 8.1.33-apache-bookworm, 8.1-apache-bookworm
+Tags: 8.1.34-apache-bookworm, 8.1-apache-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/bookworm/apache
-Tags: 8.1.33-apache-trixie, 8.1-apache-trixie, 8.1.33-apache, 8.1-apache
+Tags: 8.1.34-apache-trixie, 8.1-apache-trixie, 8.1.34-apache, 8.1-apache
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/trixie/apache
-Tags: 8.1.33-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.33-alpine3.21, 8.1-alpine3.21, 8.1.33-cli-alpine, 8.1-cli-alpine, 8.1.33-alpine, 8.1-alpine
+Tags: 8.1.34-cli-alpine3.21, 8.1-cli-alpine3.21, 8.1.34-alpine3.21, 8.1-alpine3.21, 8.1.34-cli-alpine, 8.1-cli-alpine, 8.1.34-alpine, 8.1-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/alpine3.21/cli
-Tags: 8.1.33-cli-alpine3.22, 8.1-cli-alpine3.22, 8.1.33-alpine3.22, 8.1-alpine3.22
+Tags: 8.1.34-cli-alpine3.22, 8.1-cli-alpine3.22, 8.1.34-alpine3.22, 8.1-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/alpine3.22/cli
-Tags: 8.1.33-cli-bookworm, 8.1-cli-bookworm, 8.1.33-bookworm, 8.1-bookworm
+Tags: 8.1.34-cli-bookworm, 8.1-cli-bookworm, 8.1.34-bookworm, 8.1-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/bookworm/cli
-Tags: 8.1.33-cli-trixie, 8.1-cli-trixie, 8.1.33-trixie, 8.1-trixie, 8.1.33-cli, 8.1-cli, 8.1.33, 8.1
+Tags: 8.1.34-cli-trixie, 8.1-cli-trixie, 8.1.34-trixie, 8.1-trixie, 8.1.34-cli, 8.1-cli, 8.1.34, 8.1
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/trixie/cli
-Tags: 8.1.33-fpm-alpine3.21, 8.1-fpm-alpine3.21, 8.1.33-fpm-alpine, 8.1-fpm-alpine
+Tags: 8.1.34-fpm-alpine3.21, 8.1-fpm-alpine3.21, 8.1.34-fpm-alpine, 8.1-fpm-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/alpine3.21/fpm
-Tags: 8.1.33-fpm-alpine3.22, 8.1-fpm-alpine3.22
+Tags: 8.1.34-fpm-alpine3.22, 8.1-fpm-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/alpine3.22/fpm
-Tags: 8.1.33-fpm-bookworm, 8.1-fpm-bookworm
+Tags: 8.1.34-fpm-bookworm, 8.1-fpm-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/bookworm/fpm
-Tags: 8.1.33-fpm-trixie, 8.1-fpm-trixie, 8.1.33-fpm, 8.1-fpm
+Tags: 8.1.34-fpm-trixie, 8.1-fpm-trixie, 8.1.34-fpm, 8.1-fpm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/trixie/fpm
-Tags: 8.1.33-zts-alpine3.21, 8.1-zts-alpine3.21, 8.1.33-zts-alpine, 8.1-zts-alpine
+Tags: 8.1.34-zts-alpine3.21, 8.1-zts-alpine3.21, 8.1.34-zts-alpine, 8.1-zts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/alpine3.21/zts
-Tags: 8.1.33-zts-alpine3.22, 8.1-zts-alpine3.22
+Tags: 8.1.34-zts-alpine3.22, 8.1-zts-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: eb7898cb9c2963997a4396833d4cc20e350a24ea
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/alpine3.22/zts
-Tags: 8.1.33-zts-bookworm, 8.1-zts-bookworm
+Tags: 8.1.34-zts-bookworm, 8.1-zts-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/bookworm/zts
-Tags: 8.1.33-zts-trixie, 8.1-zts-trixie, 8.1.33-zts, 8.1-zts
+Tags: 8.1.34-zts-trixie, 8.1-zts-trixie, 8.1.34-zts, 8.1-zts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 686f9529f8659f929509a2c3ec2df34a14a4594a
+GitCommit: 5c037abaf9dc0095e29807c048d9d1b97e6a9716
Directory: 8.1/trixie/zts
Tags: 8.2.30-apache-bookworm, 8.2-apache-bookworm
diff --git a/_bashbrew-list b/_bashbrew-list
index 76487b9..82243cd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -52,33 +52,33 @@ php:8.1-zts-alpine3.21
php:8.1-zts-alpine3.22
php:8.1-zts-bookworm
php:8.1-zts-trixie
-php:8.1.33
-php:8.1.33-alpine
-php:8.1.33-alpine3.21
-php:8.1.33-alpine3.22
-php:8.1.33-apache
-php:8.1.33-apache-bookworm
-php:8.1.33-apache-trixie
-php:8.1.33-bookworm
-php:8.1.33-cli
-php:8.1.33-cli-alpine
-php:8.1.33-cli-alpine3.21
-php:8.1.33-cli-alpine3.22
-php:8.1.33-cli-bookworm
-php:8.1.33-cli-trixie
-php:8.1.33-fpm
-php:8.1.33-fpm-alpine
-php:8.1.33-fpm-alpine3.21
-php:8.1.33-fpm-alpine3.22
-php:8.1.33-fpm-bookworm
-php:8.1.33-fpm-trixie
-php:8.1.33-trixie
-php:8.1.33-zts
-php:8.1.33-zts-alpine
-php:8.1.33-zts-alpine3.21
-php:8.1.33-zts-alpine3.22
-php:8.1.33-zts-bookworm
-php:8.1.33-zts-trixie
+php:8.1.34
+php:8.1.34-alpine
+php:8.1.34-alpine3.21
+php:8.1.34-alpine3.22
+php:8.1.34-apache
+php:8.1.34-apache-bookworm
+php:8.1.34-apache-trixie
+php:8.1.34-bookworm
+php:8.1.34-cli
+php:8.1.34-cli-alpine
+php:8.1.34-cli-alpine3.21
+php:8.1.34-cli-alpine3.22
+php:8.1.34-cli-bookworm
+php:8.1.34-cli-trixie
+php:8.1.34-fpm
+php:8.1.34-fpm-alpine
+php:8.1.34-fpm-alpine3.21
+php:8.1.34-fpm-alpine3.22
+php:8.1.34-fpm-bookworm
+php:8.1.34-fpm-trixie
+php:8.1.34-trixie
+php:8.1.34-zts
+php:8.1.34-zts-alpine
+php:8.1.34-zts-alpine3.21
+php:8.1.34-zts-alpine3.22
+php:8.1.34-zts-bookworm
+php:8.1.34-zts-trixie
php:8.2
php:8.2-alpine
php:8.2-alpine3.22
diff --git a/php_8.1-alpine/Dockerfile b/php_8.1-alpine/Dockerfile
index 200faca..cafec7e 100644
--- a/php_8.1-alpine/Dockerfile
+++ b/php_8.1-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
@@ -123,6 +123,13 @@ RUN set -eux; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
+ # https://github.com/php/php-src/pull/19131
+ # this backported commit broke our ability to apply 14834, which is the fix we need, so this is applied as a reverse patch to undo it
+ # 19131 was for FreeBSD, so doesn't apply to this alpine build
+ curl -fL 'https://github.com/php/php-src/commit/a5df26691d1b1f71b964b869510473a5d5413999.patch?full_index=1' -o 19131.patch; \
+ echo 'c98c01c74d3a6da197116f8511b16fed361ca6bbb6a8af8df629a933f541c213 *19131.patch' | sha256sum -c -; \
+ patch --reverse -p1 < 19131.patch; \
+ rm 19131.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
diff --git a/php_8.1-alpine3.22/Dockerfile b/php_8.1-alpine3.22/Dockerfile
index c7c517c..8bc6a67 100644
--- a/php_8.1-alpine3.22/Dockerfile
+++ b/php_8.1-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
@@ -123,6 +123,13 @@ RUN set -eux; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
+ # https://github.com/php/php-src/pull/19131
+ # this backported commit broke our ability to apply 14834, which is the fix we need, so this is applied as a reverse patch to undo it
+ # 19131 was for FreeBSD, so doesn't apply to this alpine build
+ curl -fL 'https://github.com/php/php-src/commit/a5df26691d1b1f71b964b869510473a5d5413999.patch?full_index=1' -o 19131.patch; \
+ echo 'c98c01c74d3a6da197116f8511b16fed361ca6bbb6a8af8df629a933f541c213 *19131.patch' | sha256sum -c -; \
+ patch --reverse -p1 < 19131.patch; \
+ rm 19131.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
diff --git a/php_8.1-apache-bookworm/Dockerfile b/php_8.1-apache-bookworm/Dockerfile
index 1bb1d46..767f088 100644
--- a/php_8.1-apache-bookworm/Dockerfile
+++ b/php_8.1-apache-bookworm/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1-apache/Dockerfile b/php_8.1-apache/Dockerfile
index a3dfec4..6b8add5 100644
--- a/php_8.1-apache/Dockerfile
+++ b/php_8.1-apache/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1-bookworm/Dockerfile b/php_8.1-bookworm/Dockerfile
index 006f194..3cbbbf4 100644
--- a/php_8.1-bookworm/Dockerfile
+++ b/php_8.1-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1-fpm-alpine/Dockerfile b/php_8.1-fpm-alpine/Dockerfile
index c8b7e9e..d006467 100644
--- a/php_8.1-fpm-alpine/Dockerfile
+++ b/php_8.1-fpm-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
@@ -123,6 +123,13 @@ RUN set -eux; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
+ # https://github.com/php/php-src/pull/19131
+ # this backported commit broke our ability to apply 14834, which is the fix we need, so this is applied as a reverse patch to undo it
+ # 19131 was for FreeBSD, so doesn't apply to this alpine build
+ curl -fL 'https://github.com/php/php-src/commit/a5df26691d1b1f71b964b869510473a5d5413999.patch?full_index=1' -o 19131.patch; \
+ echo 'c98c01c74d3a6da197116f8511b16fed361ca6bbb6a8af8df629a933f541c213 *19131.patch' | sha256sum -c -; \
+ patch --reverse -p1 < 19131.patch; \
+ rm 19131.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
diff --git a/php_8.1-fpm-alpine3.22/Dockerfile b/php_8.1-fpm-alpine3.22/Dockerfile
index f7b31a9..4d746aa 100644
--- a/php_8.1-fpm-alpine3.22/Dockerfile
+++ b/php_8.1-fpm-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
@@ -123,6 +123,13 @@ RUN set -eux; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
+ # https://github.com/php/php-src/pull/19131
+ # this backported commit broke our ability to apply 14834, which is the fix we need, so this is applied as a reverse patch to undo it
+ # 19131 was for FreeBSD, so doesn't apply to this alpine build
+ curl -fL 'https://github.com/php/php-src/commit/a5df26691d1b1f71b964b869510473a5d5413999.patch?full_index=1' -o 19131.patch; \
+ echo 'c98c01c74d3a6da197116f8511b16fed361ca6bbb6a8af8df629a933f541c213 *19131.patch' | sha256sum -c -; \
+ patch --reverse -p1 < 19131.patch; \
+ rm 19131.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
diff --git a/php_8.1-fpm-bookworm/Dockerfile b/php_8.1-fpm-bookworm/Dockerfile
index 97421c9..1f1cfb1 100644
--- a/php_8.1-fpm-bookworm/Dockerfile
+++ b/php_8.1-fpm-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1-fpm/Dockerfile b/php_8.1-fpm/Dockerfile
index af842f2..6855597 100644
--- a/php_8.1-fpm/Dockerfile
+++ b/php_8.1-fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1-zts-alpine/Dockerfile b/php_8.1-zts-alpine/Dockerfile
index 4de55cf..d375768 100644
--- a/php_8.1-zts-alpine/Dockerfile
+++ b/php_8.1-zts-alpine/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
@@ -123,6 +123,13 @@ RUN set -eux; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
+ # https://github.com/php/php-src/pull/19131
+ # this backported commit broke our ability to apply 14834, which is the fix we need, so this is applied as a reverse patch to undo it
+ # 19131 was for FreeBSD, so doesn't apply to this alpine build
+ curl -fL 'https://github.com/php/php-src/commit/a5df26691d1b1f71b964b869510473a5d5413999.patch?full_index=1' -o 19131.patch; \
+ echo 'c98c01c74d3a6da197116f8511b16fed361ca6bbb6a8af8df629a933f541c213 *19131.patch' | sha256sum -c -; \
+ patch --reverse -p1 < 19131.patch; \
+ rm 19131.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
diff --git a/php_8.1-zts-alpine3.22/Dockerfile b/php_8.1-zts-alpine3.22/Dockerfile
index 770f9c7..5ca3b20 100644
--- a/php_8.1-zts-alpine3.22/Dockerfile
+++ b/php_8.1-zts-alpine3.22/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
@@ -123,6 +123,13 @@ RUN set -eux; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
+ # https://github.com/php/php-src/pull/19131
+ # this backported commit broke our ability to apply 14834, which is the fix we need, so this is applied as a reverse patch to undo it
+ # 19131 was for FreeBSD, so doesn't apply to this alpine build
+ curl -fL 'https://github.com/php/php-src/commit/a5df26691d1b1f71b964b869510473a5d5413999.patch?full_index=1' -o 19131.patch; \
+ echo 'c98c01c74d3a6da197116f8511b16fed361ca6bbb6a8af8df629a933f541c213 *19131.patch' | sha256sum -c -; \
+ patch --reverse -p1 < 19131.patch; \
+ rm 19131.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
diff --git a/php_8.1-zts-bookworm/Dockerfile b/php_8.1-zts-bookworm/Dockerfile
index 73e78be..e0ead34 100644
--- a/php_8.1-zts-bookworm/Dockerfile
+++ b/php_8.1-zts-bookworm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1-zts/Dockerfile b/php_8.1-zts/Dockerfile
index 30e6f4c..2621832 100644
--- a/php_8.1-zts/Dockerfile
+++ b/php_8.1-zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\
diff --git a/php_8.1/Dockerfile b/php_8.1/Dockerfile
index 0aa7470..5310322 100644
--- a/php_8.1/Dockerfile
+++ b/php_8.1/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
-ENV PHP_VERSION 8.1.33
-ENV PHP_URL="https://www.php.net/distributions/php-8.1.33.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.33.tar.xz.asc"
-ENV PHP_SHA256="9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1"
+ENV PHP_VERSION 8.1.34
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.34.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.34.tar.xz.asc"
+ENV PHP_SHA256="ffa9e0982e82eeaea848f57687b425ed173aa278fe563001310ae2638db5c251"
RUN set -eux; \
\Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: