Update to 7.4.19 - http://www.php.net/releases/7_4_19.php

(cherry picked from commit 56f3ef61f5)

.gitignore

@@ -4,3 +4,5 @@ TODO
 php-5.*.xz
 php-7.*.xz
 php-7.*.xz.asc
+php-8.*.xz
+php-8.*.xz.asc

php-5.6.3-phpinfo.patch

@@ -1,27 +0,0 @@
-
-Drop "Configure Command" from phpinfo as it doesn't
-provide any useful information.
-The available extensions are not related to this command.
-
---- php-5.4.9/ext/standard/info.c.orig	2012-12-11 10:43:02.450578276 +0100
-+++ php-5.4.9/ext/standard/info.c	2012-12-11 10:44:12.530820821 +0100
-@@ -743,9 +743,6 @@
- #ifdef ARCHITECTURE
- 		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
- #endif
--#ifdef CONFIGURE_COMMAND
--		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
--#endif
- 
- 		if (sapi_module.pretty_name) {
- 			php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
---- php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt.orig	2012-12-11 11:07:26.959156091 +0100
-+++ php-5.4.9/ext/standard/tests/general_functions/phpinfo.phpt	2012-12-11 11:07:30.899170970 +0100
-@@ -20,7 +20,6 @@
- 
- System => %s
- Build Date => %s%a
--Configure Command => %s
- Server API => Command Line Interface
- Virtual Directory Support => %s
- Configuration File (php.ini) Path => %s

php-7.2.4-fixheader.patch

@@ -1,12 +0,0 @@
-diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac
---- php-7.2.4RC1/configure.ac.fixheader	2018-03-13 12:42:47.594623100 +0100
-+++ php-7.2.4RC1/configure.ac	2018-03-13 12:43:35.591871825 +0100
-@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d`
- fi
- AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
- 
--PHP_UNAME=`uname -a | xargs`
-+PHP_UNAME=`uname | xargs`
- AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
- PHP_OS=`uname | xargs`
- AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])

php-7.4.8-phpinfo.patch

@@ -0,0 +1,76 @@
+
+Drop "Configure Command" from phpinfo as it doesn't
+provide any useful information.
+The available extensions are not related to this command.
+
+diff -up a/ext/standard/info.c.phpinfo v/ext/standard/info.c
+--- a/ext/standard/info.c.phpinfo	2015-08-18 23:39:24.000000000 +0200
++++ b/ext/standard/info.c	2015-08-22 07:56:18.344761928 +0200
+@@ -809,9 +809,6 @@ PHPAPI void php_print_info(int flag)
+ #ifdef ARCHITECTURE
+ 		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
+ #endif
+-#ifdef CONFIGURE_COMMAND
+-		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
+-#endif
+ 
+ 		if (sapi_module.pretty_name) {
+ 			php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
+diff -up a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo b/ext/standard/tests/general_functions/phpinfo.phpt
+--- a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2015-08-18 23:39:22.000000000 +0200
++++ b/ext/standard/tests/general_functions/phpinfo.phpt	2015-08-22 07:56:18.344761928 +0200
+@@ -20,7 +20,6 @@ PHP Version => %s
+ 
+ System => %s
+ Build Date => %s%a
+-Configure Command => %s
+ Server API => Command Line Interface
+ Virtual Directory Support => %s
+ Configuration File (php.ini) Path => %s
+
+
+Backported  from 8.0:
+
+From ad0d2e438fddc089917e71e5d8909d145db9da8a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 3 Jul 2020 10:08:09 +0200
+Subject: [PATCH] display info about system used to build and its provider
+
+---
+ configure.ac        | 5 +++++
+ ext/standard/info.c | 6 ++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index d9e6329314a3..77f12a55569a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1328,6 +1328,11 @@ PHP_UNAME=${PHP_UNAME:-$UNAME}
+ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
+ PHP_OS=`uname | xargs`
+ AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
++PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME}
++AC_DEFINE_UNQUOTED(PHP_BUILD_SYSTEM,"$PHP_BUILD_SYSTEM",[builder uname output])
++if test -n "${PHP_BUILD_PROVIDER}"; then
++  AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider])
++fi
+ 
+ PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
+ 
+diff --git a/ext/standard/info.c b/ext/standard/info.c
+index 262e95ae2731..f652efd23657 100644
+--- a/ext/standard/info.c
++++ b/ext/standard/info.c
+@@ -803,6 +803,12 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
+ 		php_info_print_table_start();
+ 		php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
+ 		php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
++#ifdef PHP_BUILD_SYSTEM
++		php_info_print_table_row(2, "Build System", PHP_BUILD_SYSTEM);
++#endif
++#ifdef PHP_BUILD_PROVIDER
++		php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER);
++#endif
+ #ifdef COMPILER
+ 		php_info_print_table_row(2, "Compiler", COMPILER);
+ #endif

php.spec

@@ -51,7 +51,7 @@
 %global with_lmdb     0
 %endif
 
-%global upver        7.4.3
+%global upver        7.4.19
 #global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -100,10 +100,9 @@ Patch42: php-7.3.3-systzdata-v18.patch
 Patch43: php-7.4.0-phpize.patch
 # Use -lldap_r for OpenLDAP
 Patch45: php-7.4.0-ldap_r.patch
-# Make php_config.h constant across builds
-Patch46: php-7.2.4-fixheader.patch
 # drop "Configure command" from phpinfo output
-Patch47: php-5.6.3-phpinfo.patch
+# and add build system and provider (from 8.0)
+Patch47: php-7.4.8-phpinfo.patch
 
 # Upstream fixes (100+)
 
@@ -135,6 +134,7 @@ BuildRequires: bzip2
 BuildRequires: perl-interpreter
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: make
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -274,6 +274,7 @@ Requires: php-cli%{?_isa} = %{version}-%{release}
 # always needed to build extension
 Requires: autoconf
 Requires: automake
+Requires: make
 Requires: gcc
 Requires: gcc-c++
 Requires: libtool
@@ -707,7 +708,6 @@ in pure PHP.
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %patch45 -p1 -b .ldap_r
 %endif
-%patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
 
 # upstream patches
@@ -799,6 +799,11 @@ cp %{SOURCE50} %{SOURCE51} %{SOURCE53} .
 %build
 # Set build date from https://reproducible-builds.org/specs/source-date-epoch/
 export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
+export PHP_UNAME=$(uname)
+export PHP_BUILD_SYSTEM=$(cat /etc/redhat-release | sed -e 's/ Beta//')
+%if 0%{?vendor:1}
+export PHP_BUILD_PROVIDER="%{vendor}"
+%endif
 
 # Force use of system libtool:
 libtoolize --force --copy
@@ -1336,6 +1341,8 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
        $RPM_BUILD_ROOT%{_libdir}/php-zts/modules/*.a \
        $RPM_BUILD_ROOT%{_bindir}/{phptar} \
        $RPM_BUILD_ROOT%{_datadir}/pear \
+       $RPM_BUILD_ROOT%{_bindir}/zts-phar* \
+       $RPM_BUILD_ROOT%{_mandir}/man1/zts-phar* \
        $RPM_BUILD_ROOT%{_libdir}/libphp7.a \
        $RPM_BUILD_ROOT%{_libdir}/libphp7.la
 
@@ -1503,6 +1510,60 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
+* Tue May  4 2021 Remi Collet <remi@remirepo.net> - 7.4.19-1
+- Update to 7.4.19 - http://www.php.net/releases/7_4_19.php
+
+* Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 7.4.18-1
+- Update to 7.4.18 - http://www.php.net/releases/7_4_18.php
+
+* Tue Mar  2 2021 Remi Collet <remi@remirepo.net> - 7.4.16-1
+- Update to 7.4.16 - http://www.php.net/releases/7_4_16.php
+
+* Tue Feb  2 2021 Remi Collet <remi@remirepo.net> - 7.4.15-1
+- Update to 7.4.15 - http://www.php.net/releases/7_4_15.php
+- add upstream patch for https://bugs.php.net/80682
+  fix opcache doesn't honour pcre.jit option
+
+* Tue Jan  5 2021 Remi Collet <remi@remirepo.net> - 7.4.14-1
+- Update to 7.4.14 - http://www.php.net/releases/7_4_14.php
+- explicitly requires make
+
+* Tue Nov 24 2020 Remi Collet <remi@remirepo.net> - 7.4.13-1
+- Update to 7.4.13 - http://www.php.net/releases/7_4_13.php
+
+* Tue Oct 27 2020 Remi Collet <remi@remirepo.net> - 7.4.12-1
+- Update to 7.4.12 - http://www.php.net/releases/7_4_12.php
+
+* Tue Sep 29 2020 Remi Collet <remi@remirepo.net> - 7.4.11-1
+- Update to 7.4.11 - http://www.php.net/releases/7_4_11.php
+
+* Tue Sep  1 2020 Remi Collet <remi@remirepo.net> - 7.4.10-1
+- Update to 7.4.10 - http://www.php.net/releases/7_4_10.php
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 7.4.9-1
+- Update to 7.4.9 - http://www.php.net/releases/7_4_9.php
+
+* Thu Jul  9 2020 Remi Collet <remi@remirepo.net> - 7.4.8-2
+- Update to 7.4.8 - http://www.php.net/releases/7_4_8.php
+  rebuild from new sources
+
+* Tue Jul  7 2020 Remi Collet <remi@remirepo.net> - 7.4.8-1
+- Update to 7.4.8 - http://www.php.net/releases/7_4_8.php
+- display build system and provider in phpinfo (from 8.0)
+- drop patch to fix PHP_UNAME
+
+* Tue Jun  9 2020 Remi Collet <remi@remirepo.net> - 7.4.7-1
+- Update to 7.4.7 - http://www.php.net/releases/7_4_7.php
+
+* Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.4.6-1
+- Update to 7.4.6 - http://www.php.net/releases/7_4_6.php
+
+* Tue Apr 14 2020 Remi Collet <remi@remirepo.net> - 7.4.5-1
+- Update to 7.4.5 - http://www.php.net/releases/7_4_5.php
+
+* Tue Mar 17 2020 Remi Collet <remi@remirepo.net> - 7.4.4-1
+- Update to 7.4.4 - http://www.php.net/releases/7_4_4.php
+
 * Tue Feb 18 2020 Remi Collet <remi@remirepo.net> - 7.4.3-1
 - Update to 7.4.3 - http://www.php.net/releases/7_4_3.php
 

sources

@@ -1,2 +1,2 @@
-SHA512 (php-7.4.3.tar.xz) = 121f2870bbce99f8ab2d42655a9bf6aed1dc37f3c91c238bc37f448543595d55358c2d023f2d3e08c81b1b21d47be9c2d47ef7a2e776c8ac8ac34482b63e5bf3
-SHA512 (php-7.4.3.tar.xz.asc) = d2d676b271598fec83087e681956016d0f1bf99ec02a0cf46b3ca6fa860a932f8ac161a87d465f0fa2e99365aa15ed7bc3b425073d316ea0944134e966627852
+SHA512 (php-7.4.19.tar.xz) = 2ac51b9920069ebe8ac68a94f8e9aac2b3d44d69668f340aba95f8303632fe1bfc4c3f2ce398cc7e2c2ea48583d8e04dedfc66f7147c1f4470a55417554d0071
+SHA512 (php-7.4.19.tar.xz.asc) = b25fe454b36953cf27d7138ecfd368f28e94a9167e114f200d56aad62f9828a0daf4c11fcc6c5b31e02e1520ed156624a66afe434843d404b9f13a705e086f8a