aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2022-10-26 01:30:35 +0200
committerAndy Postnikov <apostnikov@gmail.com>2022-10-26 12:04:58 +0000
commit4f0dccd4b57c64155c55f68d59f81b7eaccbfaab (patch)
treef119e8844d5021b5ceef834f727b592a7443524e
parent4253e08fd488bc7e0bdf029748d223a1ba3442dd (diff)
community/php8: security upgrade to 8.0.25
-rw-r--r--community/php8/APKBUILD15
-rw-r--r--community/php8/content-encoding.patch42
-rw-r--r--community/php8/disabled-tests.list1
3 files changed, 11 insertions, 47 deletions
diff --git a/community/php8/APKBUILD b/community/php8/APKBUILD
index 92453c19d8f..8f131abf6e9 100644
--- a/community/php8/APKBUILD
+++ b/community/php8/APKBUILD
@@ -25,7 +25,7 @@
pkgname=php8
_pkgreal=php
-pkgver=8.0.18
+pkgver=8.0.25
pkgrel=0
_apiver=20200930
_suffix=${pkgname#php}
@@ -100,7 +100,6 @@ source="https://php.net/distributions/$_pkgreal-$pkgver.tar.xz
$pkgname-fpm-version-suffix.patch
fix-tests-devserver.patch
xfail-openssl-1.1-test.patch
- content-encoding.patch
"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -176,6 +175,13 @@ subpackages="$subpackages $pkgname-common::noarch"
[ "$CARCH" != "riscv64" ] && subpackages="$subpackages $pkgname-litespeed"
# secfixes:
+# 8.0.25-r0:
+# - CVE-2022-31630
+# - CVE-2022-37454
+# - CVE-2022-31628
+# - CVE-2022-31629
+# - CVE-2022-31625
+# - CVE-2022-31626
# 8.0.16-r0:
# - CVE-2021-21708
# 8.0.13-r0:
@@ -622,16 +628,15 @@ _mv() {
}
sha512sums="
-fda43f5bcb2aba7c2777331b41d2d8bb35c0b8508feef1a2fbff15105acfd7a41e0a4f1f9111e5cf1091e5df04ac4c737ec939c5bd5d85535b3b3ebb0450bc21 php-8.0.18.tar.xz
+43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3 php-8.0.25.tar.xz
8a9a63cddfd9bdde23db85a7be0711e14688bab35b580abd0184d370c54de80b72cbdeb369570cd23927154984f024eaad5d222d53d9e19130fb2e8758dd4540 php8-fpm.initd
cd3a96d3febde3b6657ed80ff58945641443e84e5e0fd3d9df29e640e9549bc452a3412f1999fa02ae1ee2b64c08040998fa75805f67e0252741c376e26e1c3c php8-fpm.logrotate
95f536addfbb28fbca8b14da46d95a3595369d6e98d345f55f0fda1b12bdefd1579a27505424e7d1088a987d330798253cec9bd42b544bb567189cba746217c7 php8-module.conf
-782cf318f795fe1f6e04fb2bc3c5e658f2d4b558ec83f1c149e554776071337e5f0fbcfb82b99a0cdafc0a4c9897dbeb77ac59fc7d7a0023aed74f8fcec24e7d disabled-tests.list
+b164d0cdf195e75a45252a4445d062ab3564d994f5f3f281556dbd44611fafe72dd10de931d65359899cbb2c6b9700bab1fdf00f370f8c79a770519a303bfbdf disabled-tests.list
ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4f92f45ca5827c88cc4933099fad9c962f029ca81bef779d7 install-pear.patch
79f919ca110530cac2f1ed1e7a86e2c396c25022f00501b520b6bd2efa8eefd962df4ad25235b8a37d8a30d67d257baaf9dfb4041891206a5b15a9c895f1797d includedir.patch
b5d7e87df4f45171a185aec1d4cf96157b3c6b9ea9625237e31b0756220a12a64c260cc20c38bfb0146f11fca25c9c25be1981a922ecb14de5cc2965d29d8fe3 sharedir.patch
f634ac591576dff87487d239578420364edb56e977535c4a5ab799d360a799179edf1e7e6a4e6b6e5b4f58e267dbf913ed77bde140ad8425e6df4093bfa69e70 php8-fpm-version-suffix.patch
1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
996b9a542858b0385a300265194afc57eddb72b9d7e4dcdf63b4f1ba7d3588e67309030acc73f00af1717168becd50b1d3582fcb88605e9892fd683a33cae023 xfail-openssl-1.1-test.patch
-c703c56d8b0de2da15fa23212c31a5058fdad283a1fb7a31c9755ccdde3555d21c28c78a6f68286a28f5afa590719a8ea4bf61937ae311ec1b0145c1ed33639b content-encoding.patch
"
diff --git a/community/php8/content-encoding.patch b/community/php8/content-encoding.patch
deleted file mode 100644
index 313985faf35..00000000000
--- a/community/php8/content-encoding.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 792012885d1926ffc96bed3280e7e9560a54a9ad Mon Sep 17 00:00:00 2001
-From: "Christoph M. Becker" <cmbecker69@gmx.de>
-Date: Tue, 12 Apr 2022 17:18:00 +0200
-Subject: [PATCH] Fix GH-8218: ob_end_clean does not reset Content-Encoding
- header
-
-Patch-source: https://github.com/php/php-src/pull/8353
-
-The fix for GH-7953 introduced a regression by being to deliberate
-adding the respective headers. These must only be added, if the
-handler starts, but is not finalizing.
----
- ext/iconv/iconv.c | 2 +-
- ext/zlib/zlib.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
-index 7a66c965e3cb..f23aa90f52db 100644
---- a/ext/iconv/iconv.c
-+++ b/ext/iconv/iconv.c
-@@ -311,7 +311,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c
- mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;
- }
-
-- if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START))) {
-+ if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL)))) {
- size_t len;
- char *p = strstr(get_output_encoding(), "//");
-
-diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
-index f7cf0d5dac76..774a31e18cd4 100644
---- a/ext/zlib/zlib.c
-+++ b/ext/zlib/zlib.c
-@@ -281,7 +281,7 @@ static int php_zlib_output_handler(void **handler_context, php_output_context *o
- return FAILURE;
- }
-
-- if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || (output_context->op & PHP_OUTPUT_HANDLER_START)) {
-+ if (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL))) {
- int flags;
-
- if (SUCCESS == php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_FLAGS, &flags)) {
diff --git a/community/php8/disabled-tests.list b/community/php8/disabled-tests.list
index 6b6540f99df..340d40a35e4 100644
--- a/community/php8/disabled-tests.list
+++ b/community/php8/disabled-tests.list
@@ -211,3 +211,4 @@ ext/dom/tests/bug80268.phpt
ext/libxml/tests/bug61367-read.phpt
ext/libxml/tests/libxml_disable_entity_loader.phpt
sapi/fpm/tests/bug68391-conf-include-order.phpt
+sapi/fpm/tests/bug77780-header-sent-error.phpt