commit 99c1a55c167dae232bf698d5de71db445184b684
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Dec 18 20:10:04 2019 +0100
- up to 7.2.26; fixes CVE-2019-11046, CVE-2019-11044, CVE-2019-11045,
CVE-2019-11050, CVE-2019-11047)
pcre-shared.patch | 7 ++++++-
php.spec | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 27826e1..b738e79 100644
--- a/php.spec
+++ b/php.spec
@@ -154,7 +154,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов,
выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 7.2.24
+Version: 7.2.26
Release: 1
Epoch: 4
# All files licensed under PHP version 3.01, except
@@ -163,7 +163,7 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: fc1ef05e9157bd33b3bb93d8822b57b8
+# Source0-md5: 7afdc506028e8f48e34afd06b62ca1aa
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
diff --git a/pcre-shared.patch b/pcre-shared.patch
index 8bb03e4..fea37ea 100644
--- a/pcre-shared.patch
+++ b/pcre-shared.patch
@@ -75,12 +75,13 @@
PHPAPI pcre* pcre_get_compiled_regex(zend_string *regex, pcre_extra **extra,
int *options);
PHPAPI pcre* pcre_get_compiled_regex_ex(zend_string *regex, pcre_extra
**extra, int *preg_options, int *coptions);
-@@ -56,14 +78,18 @@
+@@ -78,18 +78,23 @@ typedef struct {
int refcount;
} pcre_cache_entry;
+PCRE_EXTERN
PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex);
+ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex,
int locale_aware);
+PCRE_EXTERN
PHPAPI void php_pcre_match_impl( pcre_cache_entry *pce, char *subject, int
subject_len, zval *return_value,
@@ -94,6 +95,10 @@
PHPAPI void php_pcre_split_impl( pcre_cache_entry *pce, zend_string
*subject_str, zval *return_value,
zend_long limit_val, zend_long flags);
++PCRE_EXTERN
+ PHPAPI void php_pcre_grep_impl( pcre_cache_entry *pce, zval *input, zval
*return_value,
+ zend_long flags);
+
--- php-5.3.1.pcre/ext/pcre/php_pcre.c 2009-11-30 21:38:01.759684456 +0000
+++ php-7.2.0beta1/ext/pcre/php_pcre.c 2017-07-22 12:42:57.878062137 +0300
@@ -21,6 +21,9 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/99c1a55c167dae232bf698d5de71db445184b684
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
