summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-06-25 08:23:30 +0200
committerRemi Collet <remi@remirepo.net>2020-06-25 08:23:30 +0200
commit15e92b89ae2fea7d8d2d5b4888a6a16be857ef02 (patch)
tree6b7e7280dbefbcdfb53b39b4705951602b2cb70d /php.spec
parentfd4d14fb9d92a61266483239aba5c692be9c573d (diff)
add upstream patch to use hash in gen_stub.php
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/php.spec b/php.spec
index 26f15c2..5e12d62 100644
--- a/php.spec
+++ b/php.spec
@@ -108,7 +108,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 21%{?dist}
+Release: 22%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -166,6 +166,7 @@ Patch47: php-5.6.3-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
+Patch100: https://github.com/php/php-src/commit/c9b9f525a929158736977d6bad938380cad29cc6.patch
# Security fixes (200+)
@@ -872,6 +873,8 @@ in pure PHP.
%patch9 -p1 -b .curltls
%endif
+%patch100 -p1 -b .up100
+
%patch41 -p1 -b .syslib
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6
%patch42 -p1 -b .systzdata
@@ -1011,11 +1014,6 @@ sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \
sed -e 's:%{_root_datadir}:%{_datadir}:' \
-i 20-ffi.ini
-# Temp workaround see https://github.com/php/php-src/pull/5739
-for i in $(find ext sapi Zend -name \*stub.php); do
- touch -c -r $i ${i/.stub.php/_arginfo.h}
-done
-
%if 0%{!?scl:1}
: SCL macro not defined
exit 1
@@ -1751,6 +1749,9 @@ fi
%changelog
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 8.0.0~alpha1-22
+- add upstream patch to use hash in gen_stub.php
+
* Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 8.0.0~alpha1-21
- use system nikic/php-parser if available to generate
C headers from PHP stub