diff --git a/community/php8/APKBUILD b/community/php8/APKBUILD index 08931dcc69df8565e5c5a658839938b4cc58c8db..ea27e094000467126132ae8e29816742055e142e 100644 --- a/community/php8/APKBUILD +++ b/community/php8/APKBUILD @@ -25,7 +25,7 @@ pkgname=php8 _pkgreal=php -pkgver=8.0.25 +pkgver=8.0.26 pkgrel=0 _apiver=20200930 _suffix=${pkgname#php} @@ -370,7 +370,7 @@ check() { TESTS="${TESTS:- --show-diff}" NO_INTERACTION=1 REPORT_EXIT_STATUS=1 \ SKIP_SLOW_TESTS=1 SKIP_ONLINE_TESTS=1 TEST_TIMEOUT=10 \ - 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 ] @@ -628,7 +628,7 @@ _mv() { } sha512sums=" -43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3 php-8.0.25.tar.xz +2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5 php-8.0.26.tar.xz 8a9a63cddfd9bdde23db85a7be0711e14688bab35b580abd0184d370c54de80b72cbdeb369570cd23927154984f024eaad5d222d53d9e19130fb2e8758dd4540 php8-fpm.initd cd3a96d3febde3b6657ed80ff58945641443e84e5e0fd3d9df29e640e9549bc452a3412f1999fa02ae1ee2b64c08040998fa75805f67e0252741c376e26e1c3c php8-fpm.logrotate 95f536addfbb28fbca8b14da46d95a3595369d6e98d345f55f0fda1b12bdefd1579a27505424e7d1088a987d330798253cec9bd42b544bb567189cba746217c7 php8-module.conf @@ -640,5 +640,5 @@ f634ac591576dff87487d239578420364edb56e977535c4a5ab799d360a799179edf1e7e6a4e6b6e 1b64a7cef9e81387f955cb60ffa4e3d2277b4f6072e9328d779c0d447c202c8ee9dff0d8d8c34abc82c150311f51c4e9316a3b72a383ca6c9a6e683bc5b349a0 fix-tests-devserver.patch 996b9a542858b0385a300265194afc57eddb72b9d7e4dcdf63b4f1ba7d3588e67309030acc73f00af1717168becd50b1d3582fcb88605e9892fd683a33cae023 xfail-openssl-1.1-test.patch 465b38c089d938a4a072b2eff3edaf928455bf873f5eeb65ff3bee9614f5f45c70f285abb50809c2e2d9d259395acae38bd649860ca3b8d65e43447082a51552 atomic-lsapi.patch -3d720de5596b4f68cc1a19608d86f4e84bd2c89b4cbbccb16a7e05350a1e68cec1f070e6cd9120764d7c8488e735f6fbb723a6ec3f6b0204ccfef0ea5e22d8ae fix-fpm-deps.patch +12617f6fba17d32ae7d7465d0d1cb721d4ecf9f44858a85f7ba4aa615384ef3b1f4e534f2d28e34b91237da7e209daf333be7bbafeaf144d11a7bd2681892d3d fix-fpm-deps.patch " diff --git a/community/php8/fix-fpm-deps.patch b/community/php8/fix-fpm-deps.patch index 237f4954ccb11988923092efc9ce7b096d7e42e4..4379b84e585347058e4a02aac517ca73cc1310c4 100644 --- a/community/php8/fix-fpm-deps.patch +++ b/community/php8/fix-fpm-deps.patch @@ -1,34 +1,65 @@ -commit d1a89882d368b05748c828112cf01c05a44e32f4 -Author: Andy Postnikov -Date: Fri Sep 30 07:52:50 2022 +0200 +Patch-Source: https://github.com/php/php-src/pull/9854 - Fix test when session extesion is shared - - When extension is build as shared then testing fpm configuration gets no extensions from EXTENSIONS section +From db2d32f476b09a640616ad111999cb33e3fc9cf3 Mon Sep 17 00:00:00 2001 +From: Jakub Zelenka +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'; + }