From aea903b43f54d554d0e10829b6bb2f6409c4f890 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sat, 7 Oct 2017 20:11:56 +0300 Subject: [PATCH 2/2] 5.6.31-alt2%ubt - NMU: backported php7 patch to disable pcre jit; see also https://bugs.php.net/bug.php?id=73121 - E2K: avoid pcre jit (needs porting) --- .gear/php5.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gear/php5.spec b/.gear/php5.spec index be6a359..fe338e4 100644 --- a/.gear/php5.spec +++ b/.gear/php5.spec @@ -4,7 +4,7 @@ Summary: The PHP5 scripting language Name: php5 Version: 5.6.31 -Release: alt1%ubt +Release: alt2%ubt %define php5_name %name %define _php5_version %version @@ -36,6 +36,8 @@ Patch13: php-4.3.11-dlopen.patch Patch17: php-fix-headers-order.patch +Patch20: php-pcre-jit.patch + Patch30: php-4.3.11-libtool.patch Patch32: php-5.2.1-umask.patch Patch33: php-5.2.5-norpath.patch @@ -163,6 +165,7 @@ in use by other PHP5-related packages. %patch12 -p2 -b .alternatives %patch13 -p1 %patch17 -p1 +%patch20 -p1 %patch30 -p0 %patch32 -p1 %patch33 -p2 @@ -248,6 +251,9 @@ subst "s,./stamp=$,," build/buildcheck.sh --without-mysql \ --with-mm=%_usr \ --without-sqlite \ +%ifarch e2k + --without-pcre-jit \ +%endif --with-regex=php \ --without-pear \ # @@ -423,6 +429,11 @@ subst 's,@php5_release@,%php5_release,' %buildroot/%_sysconfdir/rpm/macros.d %doc tests run-tests.php %changelog +* Sat Oct 07 2017 Michael Shigorin 5.6.31-alt2%ubt +- NMU: backported php7 patch to disable pcre jit; + see also https://bugs.php.net/bug.php?id=73121 +- E2K: avoid pcre jit (needs porting) + * Fri Jul 07 2017 Anton Farygin 5.6.31-alt1%ubt - new version with security fixes for mbstring (CVE-2017-9224, CVE-2017-9226, CVE-2017-9227, CVE-2017-9228, CVE-2017-9229) -- 2.7.4