diff options
| author | Remi Collet <remi@remirepo.net> | 2024-08-14 10:01:46 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-08-14 10:01:46 +0200 |
| commit | 26c0349c12696cdd0fc47ee6e877fabeae32f337 (patch) | |
| tree | 33a3edf00c511674e7cb5ee2924412907b51f141 | |
| parent | 2e5230819fb65319a5744dcf372aee3deb2a31b0 (diff) | |
test build for upstream patch
open https://github.com/php/php-src/pull/15383 fix test expectation
open https://github.com/php/php-src/pull/15382 cleanup php.ini
| -rw-r--r-- | failed.txt | 20 | ||||
| -rw-r--r-- | php.spec | 10 | ||||
| -rw-r--r-- | upstream.patch | 21 |
3 files changed, 38 insertions, 13 deletions
@@ -2,19 +2,17 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log -/var/lib/mock/scl83el8a/build.log:Tests failed : 1 -/var/lib/mock/scl83el8x/build.log:Tests failed : 1 -/var/lib/mock/scl83el9a/build.log:Tests failed : 1 -/var/lib/mock/scl83el9x/build.log:Tests failed : 1 -/var/lib/mock/scl83fc38x/build.log:Tests failed : 1 -/var/lib/mock/scl83fc39a/build.log:Tests failed : 1 -/var/lib/mock/scl83fc39x/build.log:Tests failed : 1 -/var/lib/mock/scl83fc40a/build.log:Tests failed : 1 -/var/lib/mock/scl83fc40x/build.log:Tests failed : 1 +/var/lib/mock/scl83el8a/build.log:Tests failed : 0 +/var/lib/mock/scl83el8x/build.log:Tests failed : 0 +/var/lib/mock/scl83el9a/build.log:Tests failed : 0 +/var/lib/mock/scl83el9x/build.log:Tests failed : 0 +/var/lib/mock/scl83fc38x/build.log:Tests failed : 0 +/var/lib/mock/scl83fc39a/build.log:Tests failed : 0 +/var/lib/mock/scl83fc39x/build.log:Tests failed : 0 +/var/lib/mock/scl83fc40a/build.log:Tests failed : 0 +/var/lib/mock/scl83fc40x/build.log:Tests failed : 0 -all: - 2 FPM: version string [sapi/fpm/tests/main-version.phpt] (1) proc_open give erratic test results :( @@ -88,7 +88,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -149,6 +149,7 @@ Patch48: php-8.3.0-openssl-ec-param.patch # RC Patch # Upstream fixes (100+) +Patch100: upstream.patch # Security fixes (200+) @@ -842,6 +843,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch -P48 -p1 -b .ec-param # upstream patches +%patch -P100 -p1 -b .up # security patches @@ -1636,9 +1638,13 @@ fi %changelog +* Wed Aug 14 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta1-2 +- test build for upstream patch +- open https://github.com/php/php-src/pull/15383 fix test expectation +- open https://github.com/php/php-src/pull/15382 cleanup php.ini + * Tue Aug 13 2024 Remi Collet <remi@remirepo.net> - 8.4.0~beta1-1 - Update to 8.4.0beta1 - * Thu Aug 1 2024 Remi Collet <remi@remirepo.net> - 8.4.0~alpha4-1 - Update to 8.4.0alpha4 diff --git a/upstream.patch b/upstream.patch new file mode 100644 index 0000000..f4c2a18 --- /dev/null +++ b/upstream.patch @@ -0,0 +1,21 @@ +From 40d88cacc1db11787aa2fde6d0ee4b6064746d94 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 13 Aug 2024 22:58:44 +0200 +Subject: [PATCH] Fix test expectation for "Built by..." (#15383) + +--- + sapi/fpm/tests/main-version.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sapi/fpm/tests/main-version.phpt b/sapi/fpm/tests/main-version.phpt +index 40ea45ef01026..5ae83562d070b 100644 +--- a/sapi/fpm/tests/main-version.phpt ++++ b/sapi/fpm/tests/main-version.phpt +@@ -16,6 +16,6 @@ echo "Done\n"; + --EXPECTF-- + string(%d) "PHP %s (fpm%s (built: %s + Copyright (c) The PHP Group +-Zend Engine v%s, Copyright (c) Zend Technologies ++%AZend Engine v%s, Copyright (c) Zend Technologies + " + Done |