aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2024-01-30 22:18:49 +0100
committerAndy Postnikov <apostnikov@gmail.com>2024-02-13 18:07:56 +0000
commit5ffcf99745b884e60270ab622613edae0b60880c (patch)
tree3b7477d63d2c1748bfa9ef364d09600cb3d7666a
parent4ad279f534cfdfeb6f1995fbcd243c72032939bc (diff)
community/php83: upgrade to 8.3.3
-rw-r--r--community/php83/APKBUILD6
-rw-r--r--community/php83/fix-curl860.patch28
2 files changed, 32 insertions, 2 deletions
diff --git a/community/php83/APKBUILD b/community/php83/APKBUILD
index 461bbd5e9e6..ec35f32611f 100644
--- a/community/php83/APKBUILD
+++ b/community/php83/APKBUILD
@@ -25,7 +25,7 @@
# json | https://wiki.php.net/rfc/always_enable_json
pkgname=php83
-pkgver=8.3.2
+pkgver=8.3.3
pkgrel=0
_apiver=20230831
_suffix=${pkgname#php}
@@ -113,6 +113,7 @@ source="php-$pkgver.tar.xz::https://php.net/distributions/php-$pkgver.tar.xz
fix-tests-devserver.patch
phpinfo-avif.patch
fix-lfs64.patch
+ fix-curl860.patch
"
builddir="$srcdir/php-$pkgver"
@@ -606,7 +607,7 @@ _extensions_by_load_order() {
}
sha512sums="
-acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c php-8.3.2.tar.xz
+42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0 php-8.3.3.tar.xz
39be7f05f71656107f730818d6abcb4065e550e5b2e2c7021b3490d329c967064012dbeb63ee790ecb65a8e0f7a0f59148de2c692d7879d773acee21fe412bee php83-fpm.initd
1b177644e92be37b28ccc3f8a583aeaf636293d45517d6225c0d6e1c7639d33f734e5f671b5e703b8be00c936422de4a1845039b0eff0e60df5e70cde13186b7 php83-fpm.logrotate
283716161585c68b41be2540312414f028dfee9fcd63fde34662379dd3f05709136e9bd2dc1ba843e8832fdde643eba202d024623d1d46300f9fbf3bebdbf0d2 php83-module.conf
@@ -621,4 +622,5 @@ ec206639d076ddac6c2d1db697a5428ed3be979157db39417af7fbe6ab837e8dc00315ae0e55aea4
1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch
8833c5c6f5225f5e85a9cd842274e4e6b2f55dc572a13bdb3066c624f82c9f39fa07cb2f8f242092ff814f61f0cb8abaa792b1f93c16ad341f1a8dec05a6ca2d phpinfo-avif.patch
4228737f7417d14a750c8ebdf7c07bf89d4b254ed41c27934260db2f52b2d2e03cf677329180f1c886043975eab6a78e8fd7826d107cdddf6b10ba4cee07c643 fix-lfs64.patch
+9154ea68ec28b83aaa25d2be9012fde5802872b0d97b6141fcddbf93ee86fddd2d1f0e14fe64942c2a5bc51089041659e8b09cce94c634cb1898f25cdf86ed61 fix-curl860.patch
"
diff --git a/community/php83/fix-curl860.patch b/community/php83/fix-curl860.patch
new file mode 100644
index 00000000000..c12313a3d10
--- /dev/null
+++ b/community/php83/fix-curl860.patch
@@ -0,0 +1,28 @@
+Patch-Source: https://github.com/php/php-src/commit/404803577db5e53209a5ae881c39c9092b7deacb
+From 404803577db5e53209a5ae881c39c9092b7deacb Mon Sep 17 00:00:00 2001
+From: Ayesh Karunaratne <ayesh@aye.sh>
+Date: Thu, 1 Feb 2024 02:03:55 +0700
+Subject: [PATCH] ext/curl: Fix failing tests due to string changes in libcurl
+ 8.6.0
+
+Upstream libcurl 8.6.0 contains a change[^1] that caused a test failure.
+This fixes it by updating the test's `EXPECTF` to use a regex to account for both string patterns.
+
+[^1]: https://github.com/curl/curl/commit/45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683
+
+Closes GH-13293.
+---
+ NEWS | 2 ++
+ ext/curl/tests/bug77946.phpt | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ext/curl/tests/bug77946.phpt b/ext/curl/tests/bug77946.phpt
+index 8b1e70675554f..7b836187d6bfb 100644
+--- a/ext/curl/tests/bug77946.phpt
++++ b/ext/curl/tests/bug77946.phpt
+@@ -34,4 +34,4 @@ curl_multi_close($mh);
+ --EXPECTF--
+ int(1)
+ int(1)
+-string(%d) "Protocol %Sunknown%S not supported or disabled in libcurl"
++string(%d) "Protocol %Sunknown%S %rnot supported( or disabled in libcurl)?%r"