diff options
| -rw-r--r-- | php-intl.patch | 25 | ||||
| -rw-r--r-- | php71.spec | 8 |
2 files changed, 32 insertions, 1 deletions
diff --git a/php-intl.patch b/php-intl.patch new file mode 100644 index 0000000..a0ce193 --- /dev/null +++ b/php-intl.patch @@ -0,0 +1,25 @@ +From 6af22d0d3ed224d89be1d1e9e53ff7e2e2e5439d Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 18 Jan 2017 13:00:49 +0100 +Subject: [PATCH] Fix #73956 Link use CC instead of CXX + +--- + ext/intl/config.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/intl/config.m4 b/ext/intl/config.m4 +index dd28276..ca2cd82 100644 +--- a/ext/intl/config.m4 ++++ b/ext/intl/config.m4 +@@ -86,7 +86,7 @@ if test "$PHP_INTL" != "no"; then + breakiterator/codepointiterator_methods.cpp \ + uchar/uchar.c \ + idn/idn.c \ +- $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) ++ $icu_spoof_src, $ext_shared,,$ICU_INCS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,cxx) + PHP_ADD_BUILD_DIR($ext_builddir/collator) + PHP_ADD_BUILD_DIR($ext_builddir/converter) + PHP_ADD_BUILD_DIR($ext_builddir/common) +-- +2.1.4 + @@ -121,7 +121,7 @@ %endif #global rcver RC1 -%global rpmrel 2 +%global rpmrel 3 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -177,6 +177,7 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-5.6.3-oci8conf.patch # Upstream fixes (100+) +Patch100: php-intl.patch # Security fixes (200+) @@ -1026,6 +1027,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -b .73956 # security patches @@ -2051,6 +2053,10 @@ fi %changelog +* Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-3 +- EL-7: add patch for https://bugs.php.net/73956 +- switch back to gcc 6.2 + * Wed Jan 18 2017 Remi Collet <remi@fedoraproject.org> 7.1.1-2 - EL-7: rebuild using gcc 4.8 instead of 6.2 because of https://bugzilla.redhat.com/1414348 |