Add patches for Alpine/8.1 builds

Co-authored-by: yosifkit <[email protected]>
docker-library · Dec 11, 2024 · 45cfafc · 45cfafc
1 parent aa678ae
commit 45cfafc
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 0 deletions.
diff --git a/8.1/alpine3.20/cli/Dockerfile b/8.1/alpine3.20/cli/Dockerfile
diff --git a/8.1/alpine3.20/fpm/Dockerfile b/8.1/alpine3.20/fpm/Dockerfile
diff --git a/8.1/alpine3.20/zts/Dockerfile b/8.1/alpine3.20/zts/Dockerfile
diff --git a/8.1/alpine3.21/cli/Dockerfile b/8.1/alpine3.21/cli/Dockerfile
diff --git a/8.1/alpine3.21/fpm/Dockerfile b/8.1/alpine3.21/fpm/Dockerfile
diff --git a/8.1/alpine3.21/zts/Dockerfile b/8.1/alpine3.21/zts/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -261,6 +261,8 @@ RUN set -eux; \
 			"libsodium-dev",
 			"libxml2-dev",
 			"openssl-dev",
+			# https://github.com/docker-library/php/pull/1552
+			if env.version | rtrimstr("-rc") == "8.1" then "patch", "patchutils" else empty end,
 			"readline-dev",
 			"sqlite-dev",
 			# https://github.com/docker-library/php/issues/888
@@ -304,6 +306,19 @@ RUN set -eux; \
 	; \
 	docker-php-source extract; \
 	cd /usr/src/php; \
+{{ if is_alpine and (env.version | rtrimstr("-rc") == "8.1") then ( -}}
+# Apply patches; see https://github.com/docker-library/php/pull/1552
+	# https://github.com/php/php-src/issues/11678
+	curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
+	echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
+	patch -p1 < 11678.patch; \
+	rm 11678.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 -; \
+	filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
+	rm 14834.patch; \
+{{ ) else "" end -}}
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 {{ if is_alpine then "" else ( -}}
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \