From 01304ea61b84becae87db7b08d2ee4c79d435448 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Tue, 26 Mar 2024 21:50:34 +0100
Subject: [PATCH] community/php82: security upgrade to 8.2.18
- CVE-2024-1874
- CVE-2024-2756
- CVE-2024-3096
---
community/php82/APKBUILD | 12 +++++++-----
community/php82/fix-lfs64-1.patch | 27 ---------------------------
2 files changed, 7 insertions(+), 32 deletions(-)
delete mode 100644 community/php82/fix-lfs64-1.patch
diff --git a/community/php82/APKBUILD b/community/php82/APKBUILD
index ff06487732e4..a578f0e93e2a 100644
--- a/community/php82/APKBUILD
+++ b/community/php82/APKBUILD
@@ -26,8 +26,8 @@
pkgname=php82
_pkgreal=php
-pkgver=8.2.17
-pkgrel=2
+pkgver=8.2.18
+pkgrel=0
_apiver=20220829
_suffix=${pkgname#php}
# Is this package the default (latest) PHP version?
@@ -112,7 +112,6 @@ source="php-$pkgver.tar.xz::https://php.net/distributions/$_pkgreal-$pkgver.tar.
$pkgname-fpm-version-suffix.patch
fix-tests-devserver.patch
phpinfo-avif.patch
- fix-lfs64-1.patch
fix-lfs64-2.patch
fix-icu74.patch
"
@@ -188,6 +187,10 @@ subpackages="$subpackages $pkgname-common::noarch"
subpackages="$subpackages $pkgname-litespeed"
# secfixes:
+# 8.2.18-r0:
+# - CVE-2024-1874
+# - CVE-2024-2756
+# - CVE-2024-3096
# 8.2.3-r0:
# - CVE-2023-0567
# - CVE-2023-0568
@@ -629,7 +632,7 @@ _extensions_by_load_order() {
}
sha512sums="
-113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8 php-8.2.17.tar.xz
+8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f php-8.2.18.tar.xz
f8662f7f5fcf286ba138d735538b62c0611df7941f3b398e6d2128077555f0ce133b6428f2607d3102c2e7323f2c58a4501727493584383a863e2f4e83057e7a php82-fpm.initd
29dc69d06c25ecc194b617e9af7c42fbdbe634a8312a5c6a1ab8e2d582cb64ed2f53308eeaa45dcf71b7f5618e6ef3e9d8a9d6932685e0d8af86203f43481bd9 php82-fpm.logrotate
504f0e4aca2dfd36f428006fe6442557e99f8608f683467ae95519b5219208951bf3ba7223af69728a4e055110f5e491ea4b484db2f696410ce35f4999a8481a php82-module.conf
@@ -643,7 +646,6 @@ f93c6544fe7cc630b72c2315b312e327b39d7a46e9bcd0d00d37d92863dd44c06f96f74539f0ef93
804f376d3a58318edc792ab0f898bf9f2f719dd56c16dbac21e0ea020b32556ef3283a7c14ea5a2791594af0c1b96ae99906033fc947feea340ab04b95626c68 php82-fpm-version-suffix.patch
1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
8833c5c6f5225f5e85a9cd842274e4e6b2f55dc572a13bdb3066c624f82c9f39fa07cb2f8f242092ff814f61f0cb8abaa792b1f93c16ad341f1a8dec05a6ca2d phpinfo-avif.patch
-d1e777feedd8d0e95a9bfdf9513f62f0daa6657849df210e4fccc650deb21108b2609a404dd186e03a049ea9f20ed7329c95d5c6e974ec11778e670bee76b8d7 fix-lfs64-1.patch
6f90c6b80a1fd72094877d52e2d6a26712a3d54ee83c8d4d75cad5505a2225cbca576085acf82c08b91220550b8a3527323e1a9f4a821e4e159b5c03efc083c6 fix-lfs64-2.patch
b376af772b4b92ce50f955a9becff47784383b4d453419d8c06ae4e712ccaabeea4898ca6a6ab6c3bbf1fdcc720ccf3fa85a8c0e538c914ea667ab58d0ba396c fix-icu74.patch
"
diff --git a/community/php82/fix-lfs64-1.patch b/community/php82/fix-lfs64-1.patch
deleted file mode 100644
index 4db5499dfa4c..000000000000
--- a/community/php82/fix-lfs64-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch-Source: https://github.com/php/php-src/commit/334419e1575b96c1800c666679286576659bf1ac
-From 334419e1575b96c1800c666679286576659bf1ac Mon Sep 17 00:00:00 2001
-From: David Carlier <devnexen@gmail.com>
-Date: Wed, 13 Mar 2024 18:50:17 +0000
-Subject: [PATCH] zend test fix copy_file_range for musl.
-
-normally should no longer need off64_t with glibc anyway.
----
- ext/zend_test/test.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
-index ed1f3ef547466..8c32238ce36f9 100644
---- a/ext/zend_test/test.c
-+++ b/ext/zend_test/test.c
-@@ -1128,9 +1128,9 @@ PHP_ZEND_TEST_API void bug_gh9090_void_int_char_var(int i, char *fmt, ...) {
- /**
- * This function allows us to simulate early return of copy_file_range by setting the limit_copy_file_range ini setting.
- */
--PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off64_t *off_in, int fd_out, off64_t *off_out, size_t len, unsigned int flags)
-+PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off_t *off_in, int fd_out, off_t *off_out, size_t len, unsigned int flags)
- {
-- ssize_t (*original_copy_file_range)(int, off64_t *, int, off64_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range");
-+ ssize_t (*original_copy_file_range)(int, off_t *, int, off_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range");
- if (ZT_G(limit_copy_file_range) >= Z_L(0)) {
- len = ZT_G(limit_copy_file_range);
- }
--
GitLab