diff options
| -rw-r--r-- | php-upstream.patch | 30 | ||||
| -rw-r--r-- | php72.spec | 13 |
2 files changed, 9 insertions, 34 deletions
diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index 5ffc5a9..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 528bc00d84cce18d74528677c156d6aec1b7fcd9 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 14 Feb 2018 08:59:24 +0100 -Subject: [PATCH] Fix timezone var_dump from - 51f2a5803fa4f09e212fed4b14ab8b4a003d4ef5 - ---- - ext/date/php_date.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index 82ac9a6..2df19f7 100644 ---- a/ext/date/php_date.c -+++ b/ext/date/php_date.c -@@ -2422,9 +2422,9 @@ static HashTable *date_object_get_debug_info_timezone(zval *object, int *is_temp - zend_string *tmpstr = zend_string_alloc(sizeof("UTC+05:00")-1, 0); - - ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d", -- tzobj->tzi.utc_offset > 0 ? '-' : '+', -- abs(tzobj->tzi.utc_offset / 60), -- abs((tzobj->tzi.utc_offset % 60))); -+ tzobj->tzi.utc_offset < 0 ? '-' : '+', -+ abs((int)(tzobj->tzi.utc_offset / 3600)), -+ abs(((int)(tzobj->tzi.utc_offset % 3600) / 60))); - - ZVAL_NEW_STR(&zv, tmpstr); - } --- -2.1.4 - @@ -117,7 +117,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -172,7 +172,6 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: php-upstream.patch # Security fixes (200+) @@ -1070,7 +1069,6 @@ low-level PHP extension for the libsodium cryptographic library. %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .upstream # security patches @@ -1945,8 +1943,11 @@ if [ -f /etc/rc.d/init.d/php-fpm ]; then fi %endif -%post embedded -p /sbin/ldconfig + +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%post embedded -p /sbin/ldconfig %postun embedded -p /sbin/ldconfig +%endif %{!?_licensedir:%global license %%doc} @@ -2124,6 +2125,10 @@ fi %changelog +* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.2.3~RC1-2 +- rebuild for new tag and drop patch merged upstream +- drop ldconfig scriptlets on F28 + * Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.2.3~RC1-1 - update to 7.2.3RC1 - adapt systzdata, fixheader and ldap_r patches |