public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/
Date: Sat, 15 Mar 2025 16:59:01 +0000 (UTC)	[thread overview]
Message-ID: <1742057859.d00b626e1383e3542493a9fdb54d8aac5a22b8ad.mjo@gentoo> (raw)

commit:     d00b626e1383e3542493a9fdb54d8aac5a22b8ad
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 15:14:02 2025 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 16:57:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00b626e

dev-lang/php: backport test fix for newer pcre2

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../php/files/php-bug75457-pcre2-backport.patch    | 22 ++++++++++++++++++++++
 dev-lang/php/php-8.2.28.ebuild                     |  1 +
 dev-lang/php/php-8.3.19.ebuild                     |  1 +
 3 files changed, 24 insertions(+)

diff --git a/dev-lang/php/files/php-bug75457-pcre2-backport.patch b/dev-lang/php/files/php-bug75457-pcre2-backport.patch
new file mode 100644
index 000000000000..83c0ab0b3a2e
--- /dev/null
+++ b/dev-lang/php/files/php-bug75457-pcre2-backport.patch
@@ -0,0 +1,22 @@
+From 69480be12afb4040c6dd9275b7836231cdd6f6bb Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 12 Mar 2025 07:48:05 +0100
+Subject: [PATCH] Relax test expectation for pcre2lib 10.45 Using
+ e92848789acd8aa5cf32fedb519ba9378ac64e02
+
+Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
+---
+ ext/pcre/tests/bug75457.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/pcre/tests/bug75457.phpt b/ext/pcre/tests/bug75457.phpt
+index ee5ab162f8a6c..1401b25ff6fb7 100644
+--- a/ext/pcre/tests/bug75457.phpt
++++ b/ext/pcre/tests/bug75457.phpt
+@@ -6,5 +6,5 @@ $pattern = "/(((?(?C)0?=))(?!()0|.(?0)0)())/";
+ var_dump(preg_match($pattern, "hello"));
+ ?>
+ --EXPECTF--
+-Warning: preg_match(): Compilation failed: assertion expected after (?( or (?(?C) at offset 8 in %sbug75457.php on line %d
++Warning: preg_match(): Compilation failed:%r( atomic|)%r assertion expected after (?( or (?(?C) at offset 8 in %sbug75457.php on line %d
+ bool(false)

diff --git a/dev-lang/php/php-8.2.28.ebuild b/dev-lang/php/php-8.2.28.ebuild
index 48520240c2fd..d7612d5e8ebb 100644
--- a/dev-lang/php/php-8.2.28.ebuild
+++ b/dev-lang/php/php-8.2.28.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
 	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
 	"${FILESDIR}/php-8.2.20-implicit-printf.patch"
 	"${FILESDIR}/php-8.2.23-fix-ub.patch"
+	"${FILESDIR}/php-bug75457-pcre2-backport.patch"
 )
 
 # ARM/Windows functions (bug 923335)

diff --git a/dev-lang/php/php-8.3.19.ebuild b/dev-lang/php/php-8.3.19.ebuild
index bc53426063d5..a450d59a202e 100644
--- a/dev-lang/php/php-8.3.19.ebuild
+++ b/dev-lang/php/php-8.3.19.ebuild
@@ -135,6 +135,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/php-8.3.9-gd-cachevars.patch"
+	"${FILESDIR}/php-bug75457-pcre2-backport.patch"
 )
 
 PHP_MV="$(ver_cut 1)"


             reply	other threads:[~2025-03-15 16:59 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-15 16:59 Michael Orlitzky [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-10 14:50 [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/ Michael Orlitzky
2024-04-09 13:51 Michael Orlitzky
2024-03-04 17:00 Michael Orlitzky
2024-02-18 23:54 Michael Orlitzky
2023-05-05 13:18 Brian Evans
2023-01-05 21:30 Brian Evans
2022-04-05 19:03 Brian Evans
2021-03-25 15:56 Brian Evans
2021-02-25 19:23 Brian Evans
2020-12-23  0:39 Thomas Deutschmann
2020-12-03 20:48 Thomas Deutschmann
2019-02-11 14:21 Brian Evans
2019-02-06 18:26 Thomas Deutschmann
2018-12-07  1:16 Thomas Deutschmann
2018-12-07  0:41 Thomas Deutschmann
2018-12-06 23:20 Thomas Deutschmann
2018-05-04 21:03 Brian Evans
2018-04-30  0:16 Aaron Bauman
2018-04-27  2:21 Brian Evans
2016-09-30 15:07 Michael Orlitzky
2015-11-02 23:37 Michael Orlitzky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1742057859.d00b626e1383e3542493a9fdb54d8aac5a22b8ad.mjo@gentoo \
    --to=mjo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox