aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2022-11-13 17:56:17 +0100
committerAndy Postnikov <apostnikov@gmail.com>2022-11-23 11:43:18 +0000
commit20e416039e00094ade19dac9692dbcf379340812 (patch)
tree5708fee9dca07d1fd77dca7836aa0b36fe6bff5e
parent1c156ab6a2e7e9a7b8a0980779997a942ac236ae (diff)
downloadaports-20e416039e00094ade19dac9692dbcf379340812.tar.gz
aports-20e416039e00094ade19dac9692dbcf379340812.tar.bz2
aports-20e416039e00094ade19dac9692dbcf379340812.tar.xz
community/php81: upgrade to 8.1.13
-rw-r--r--community/php81/APKBUILD11
-rw-r--r--community/php81/fix-fpm-deps.patch57
2 files changed, 53 insertions, 15 deletions
diff --git a/community/php81/APKBUILD b/community/php81/APKBUILD
index fd5ca7144c..deb58caf1d 100644
--- a/community/php81/APKBUILD
+++ b/community/php81/APKBUILD
@@ -11,6 +11,7 @@
# fileinfo | BSD-2-Clause | ext/fileinfo/libmagic | used
# gd | BSD | ext/gd/libgd | used
# hash | CC0-1.0 | ext/hash/sha3 | used
+# xxHash | BSD-2-Clause | ext/hash/xxhash | used
# libmbfl | LGPL-2.1-only | ext/mbstring/libmbfl | used
# pcre | BSD-3-Clause | ext/pcre/pcrelib | not used
# sqlite3 | Public | ext/sqlite3/libsqlite | not used
@@ -25,8 +26,8 @@
pkgname=php81
_pkgreal=php
-pkgver=8.1.12
-pkgrel=1
+pkgver=8.1.13
+pkgrel=0
_apiver=20210902
_suffix=${pkgname#php}
# Is this package the default (latest) PHP version?
@@ -373,7 +374,7 @@ check() {
TESTS="${TESTS:- --show-diff }" NO_INTERACTION=1 REPORT_EXIT_STATUS=1 \
SKIP_SLOW_TESTS=1 SKIP_ONLINE_TESTS=1 TEST_TIMEOUT=10 \
SKIP_PERF_SENSITIVE=1 \
- TZ='' LANG='' LC_ALL='' \
+ TZ='' LANG='' LC_ALL='' TEST_FPM_EXTENSION_DIR=modules \
TRAVIS=true SKIP_IO_CAPTURE_TESTS=1 \
make test || [ "$allow_fail" = yes ]
@@ -631,7 +632,7 @@ _mv() {
}
sha512sums="
-437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907 php-8.1.12.tar.xz
+a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542 php-8.1.13.tar.xz
7dc9f55b12998355a6a6b5cf277285058e66928215f8d0109448d06fb696a74c674f83d18a81bf03f4f0bee06e77979e9a4ee5c81c7fdebff91447f8e697cc69 php81-fpm.initd
98bb27864f1ece80fef18cb286885c8c18de8f9d1076507b6a24df07e33aa400623b90401375e7ebe55d9ff802069d281642ec7d3a58ef8727121aabe7643241 php81-fpm.logrotate
2e3b22b4adbc81c6120757095c89e56642f3e8bf7724af2926f2667759ef082cdcff416334aad87f704a61fcb5b2c11830f17759ac771a3dd4e47d9bc5c7cf72 php81-module.conf
@@ -644,5 +645,5 @@ f43ab399c3b4a2b9a3a329acd32d9cbc690cad697dd0a0e87f3d654028b88af7dd1cd80cbf970c6f
d90e839cfae1cbb42c1dfb0fb73defa55154dbef69bc9a8206e561c2d0ceb43ca778e35dcfa3224570deabe7d59d35dac3f21d0c4bd82ac92cebd5477a30a89d xfail-openssl-1.1-test.patch
6d7beda99c30fb015a058f9ea24c560239430171fc91fddbfbd1bb3742c9b396143d126b5e8010722ddc88803d16fc226dcff01e12918f0c9c6e4a2d4b942b0f atomic-lsapi.patch
9680c7b98d9fc3ca265b9e12914e7daa0ab087f8b45bc444be50003ad3babcbe00726e3db6a289feddd91961acb363253e0a0246be934c34f196a9a41765c565 fix-icu72.patch
-94f79756a445ec84c61dde29e600167cab187ad4c9dd21d22c3be82f5eb2a8223f5c101546232eb16f30673d28ac038a35095d5412509afa83533969fed34afb fix-fpm-deps.patch
+12617f6fba17d32ae7d7465d0d1cb721d4ecf9f44858a85f7ba4aa615384ef3b1f4e534f2d28e34b91237da7e209daf333be7bbafeaf144d11a7bd2681892d3d fix-fpm-deps.patch
"
diff --git a/community/php81/fix-fpm-deps.patch b/community/php81/fix-fpm-deps.patch
index aa8a955967..4379b84e58 100644
--- a/community/php81/fix-fpm-deps.patch
+++ b/community/php81/fix-fpm-deps.patch
@@ -1,28 +1,65 @@
-Patch-Source: https://github.com/php/php-src/pull/9643
+Patch-Source: https://github.com/php/php-src/pull/9854
+
+From db2d32f476b09a640616ad111999cb33e3fc9cf3 Mon Sep 17 00:00:00 2001
+From: Jakub Zelenka <bukka@php.net>
+Date: Sun, 30 Oct 2022 16:36:58 +0000
+Subject: [PATCH] Introduce TEST_FPM_EXTENSION_DIR for FPM tests with shared
+ extensions
+
+---
+ sapi/fpm/tests/bug77780-header-sent-error.phpt | 2 +-
+ sapi/fpm/tests/tester.inc | 17 +++++++++++++++--
+ 2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/sapi/fpm/tests/bug77780-header-sent-error.phpt b/sapi/fpm/tests/bug77780-header-sent-error.phpt
-index b5e7691854..89780879a2 100644
+index b5e76918547f..017a2aa513c2 100644
--- a/sapi/fpm/tests/bug77780-header-sent-error.phpt
+++ b/sapi/fpm/tests/bug77780-header-sent-error.phpt
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ echo str_repeat('asdfghjkl', 150000) . "\n";
EOT;
$tester = new FPM\Tester($cfg, $code);
-$tester->start();
-+$tester->start(['-dextension=session']);
++$tester->start(extensions: ['session']);
$tester->expectLogStartNotices();
$tester
->request(
diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
-index 1d27ffc2c8..2fb8fbd5fa 100644
+index 2c4b81bd5903..6197cdba53f5 100644
--- a/sapi/fpm/tests/tester.inc
+++ b/sapi/fpm/tests/tester.inc
-@@ -392,7 +392,7 @@ class Tester
+@@ -379,12 +379,17 @@ class Tester
+ * @param array $extraArgs Command extra arguments.
+ * @param bool $forceStderr Whether to output to stderr so error log is used.
+ * @param bool $daemonize Whether to start FPM daemonized
++ * @param array $extensions List of extension to add if shared build used.
+ *
+ * @return bool
+ * @throws \Exception
+ */
+- public function start(array $extraArgs = [], bool $forceStderr = true, bool $daemonize = false)
+- {
++ public function start(
++ array $extraArgs = [],
++ bool $forceStderr = true,
++ bool $daemonize = false,
++ array $extensions = []
++ ) {
$configFile = $this->createConfig();
$desc = $this->outDesc ? [] : [1 => array('pipe', 'w'), 2 => array('redirect', 1)];
-- $cmd = [self::findExecutable(), '-F', '-y', $configFile];
-+ $cmd = [self::findExecutable(), '-F', '-y', $configFile, '-dextension_dir=modules'];
+@@ -399,6 +404,14 @@ class Tester
+ $cmd[] = '-F';
+ }
- if ($forceStderr) {
- $cmd[] = '-O';
++ $extensionDir = getenv('TEST_FPM_EXTENSION_DIR');
++ if ($extensionDir) {
++ $cmd[] = '-dextension_dir=' . $extensionDir;
++ foreach ($extensions as $extension) {
++ $cmd[] = '-dextension=' . $extension;
++ }
++ }
++
+ if (getenv('TEST_FPM_RUN_AS_ROOT')) {
+ $cmd[] = '--allow-to-run-as-root';
+ }