apply timelib fix for empty POSIX string in older TZif2 files

switch back to system tzdata on EL-7

1 files changed, 11 insertions, 5 deletions

diff --git a/php.spec b/php.spec
index 3b385a1..d9f12e0 100644
--- a/php.spec
+++ b/php.spec
@@ -87,7 +87,7 @@
 %bcond_without        libgd
 
 # build with system tzdata (2021 required)
-%if 0%{?fedora} >= 33 || 0%{?rhel} >= 8
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 7
 %bcond_without        tzdata
 %else
 %bcond_with           tzdata
@@ -113,7 +113,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-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
@@ -161,8 +161,9 @@ Patch10: php-7.0.7-curl.patch
 Patch41: php-8.0.0-parser.patch
 # use system tzdata
 Patch42: php-8.1.0-systzdata-v20.patch
+Patch43: php-8.1.0-timelib.patch
 # See http://bugs.php.net/53436
-Patch43: php-7.4.0-phpize.patch
+Patch44: php-7.4.0-phpize.patch
 # Use -lldap_r for OpenLDAP
 Patch45: php-7.4.0-ldap_r.patch
 # Ignore unsupported "threads" option on password_hash
@@ -225,7 +226,7 @@ BuildRequires: re2c
 # used for tests
 BuildRequires: /bin/ps
 %if %{with tzdata}
-BuildRequires: tzdata >= 2021
+BuildRequires: tzdata
 %endif
 
 Requires: httpd-mmn = %{_httpd_mmn}
@@ -933,8 +934,9 @@ in pure PHP.
 %patch41 -p1 -b .syslib
 %if %{with tzdata}
 %patch42 -p1 -b .systzdata
+%patch43 -p1 -b .up
 %endif
-%patch43 -p1 -b .headers
+%patch44 -p1 -b .headers
 sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %patch45 -p1 -b .ldap_r
@@ -1814,6 +1816,10 @@ fi
 
 
 %changelog
+* Tue Jun  8 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210608-2
+- apply timelib fix for empty POSIX string in older TZif2 files
+- switch back to system tzdata on EL-7
+
 * Tue Jun  8 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210608-1
 - new build
 - ignore unsupported "threads" options in password_hash