.gitignore

@@ -1 +1 @@
-SOURCES/php-7.3.20.tar.xz
+SOURCES/php-7.2.24.tar.xz

.php.metadata

@@ -1 +1 @@
-d0dd05fa421e0f581960eda6cb8a256abb98b920 SOURCES/php-7.3.20.tar.xz
+d31628bdc89a724a2a0950c2ed7d79b40cf489a7 SOURCES/php-7.2.24.tar.xz

SOURCES/10-opcache.ini

@@ -42,15 +42,18 @@ opcache.max_accelerated_files=4000
 ; size of the optimized code.
 ;opcache.save_comments=1
 
+; If enabled, a fast shutdown sequence is used for the accelerated code
+; Depending on the used Memory Manager this may cause some incompatibilities.
+;opcache.fast_shutdown=0
+
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0
 
 ; A bitmask, where each bit enables or disables the appropriate OPcache
 ; passes
-;opcache.optimization_level=0x7FFFBFFF
+;opcache.optimization_level=0xffffffff
 
-; This hack should only be enabled to work around "Cannot redeclare class"
-; errors.
+;opcache.inherited_hack=1
 ;opcache.dups_fix=0
 
 ; The location of the OPcache blacklist file (wildcards allowed).
@@ -125,6 +128,3 @@ opcache.blacklist_filename=/etc/php.d/opcache*.blacklist
 ; This should improve performance, but requires appropriate OS configuration.
 opcache.huge_code_pages=0
 
-; If specified, it produces opcode dumps for debugging different stages of
-; optimizations.
-;opcache.opt_debug_level=0

SOURCES/php-5.6.3-embed.patch

@@ -18,7 +18,7 @@ diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in
  php_cgi_binary=NONE
  configure_options="@CONFIGURE_OPTIONS@"
 -php_sapis="@PHP_INSTALLED_SAPIS@"
-+php_sapis="apache2handler embed fpm phpdbg @PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@"
  
  # Set php_cli_binary and php_cgi_binary if available
  for sapi in $php_sapis; do

SOURCES/php-7.2.12-phpize.patch

@@ -1,6 +1,6 @@
-diff -up php-7.3.0RC4/scripts/phpize.in.headers php-7.3.0RC4/scripts/phpize.in
---- php-7.3.0RC4/scripts/phpize.in.headers	2018-10-23 11:32:20.000000000 +0200
-+++ php-7.3.0RC4/scripts/phpize.in	2018-10-23 13:35:55.382870481 +0200
+diff -up php-7.2.12RC1/scripts/phpize.in.headers php-7.2.12RC1/scripts/phpize.in
+--- php-7.2.12RC1/scripts/phpize.in.headers	2018-10-23 11:47:43.000000000 +0200
++++ php-7.2.12RC1/scripts/phpize.in	2018-10-23 11:49:51.651818777 +0200
 @@ -162,6 +162,15 @@ phpize_autotools()
    $PHP_AUTOHEADER || exit 1
  }

SOURCES/php-7.2.16-systzdata-v17.patch

@@ -5,8 +5,7 @@ Add support for use of the system timezone database, rather
 than embedding a copy.  Discussed upstream but was not desired.
 
 History:
-r18: adapt for autotool change in 7.3.3RC1
-r17: adapt for timelib 2018.01 (in 7.3.2RC1)
+r17: adapt for autotool change in 7.2.16RC1
 r16: adapt for timelib 2017.06 (in 7.2.3RC1)
 r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
 r14: improve check for valid tz file
@@ -29,10 +28,10 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
-diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config0.m4
---- php-7.3.3RC1/ext/date/config0.m4.systzdata	2019-02-19 14:57:51.314601701 +0100
-+++ php-7.3.3RC1/ext/date/config0.m4	2019-02-19 14:58:29.050812587 +0100
-@@ -9,6 +9,19 @@ io.h
+diff -up php-7.2.16RC1/ext/date/config0.m4.systzdata php-7.2.16RC1/ext/date/config0.m4
+--- php-7.2.16RC1/ext/date/config0.m4.systzdata	2019-02-19 11:22:22.223741585 +0100
++++ php-7.2.16RC1/ext/date/config0.m4	2019-02-19 11:23:05.089111556 +0100
+@@ -10,6 +10,19 @@ io.h
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
  
@@ -52,9 +51,9 @@ diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config
  PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
  timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
                   lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/lib/parse_tz.c
---- php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata	2019-02-19 12:18:27.000000000 +0100
-+++ php-7.3.3RC1/ext/date/lib/parse_tz.c	2019-02-19 14:57:20.397428931 +0100
+diff -up php-7.2.16RC1/ext/date/lib/parse_tz.c.systzdata php-7.2.16RC1/ext/date/lib/parse_tz.c
+--- php-7.2.16RC1/ext/date/lib/parse_tz.c.systzdata	2019-02-19 11:13:22.000000000 +0100
++++ php-7.2.16RC1/ext/date/lib/parse_tz.c	2019-02-19 11:19:40.245313535 +0100
 @@ -25,8 +25,21 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -77,7 +76,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -87,6 +100,11 @@ static int read_php_preamble(const unsig
+@@ -67,6 +80,11 @@ static int read_php_preamble(const unsig
  {
  	uint32_t version;
  
@@ -89,7 +88,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
  	/* read ID */
  	version = (*tzf)[3] - '0';
  	*tzf += 4;
-@@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
  	}
  }
  
@@ -520,7 +519,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
  {
  	int left = 0, right = tzdb->index_size - 1;
  
-@@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns
+@@ -400,9 +840,48 @@ static int seek_to_tz_position(const uns
  	return 0;
  }
  
@@ -569,7 +568,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
  }
  
  const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -451,7 +930,30 @@ const timelib_tzdb_index_entry *timelib_
+@@ -414,7 +893,30 @@ const timelib_tzdb_index_entry *timelib_
  int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
  {
  	const unsigned char *tzf;
@@ -601,7 +600,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
  }
  
  static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -493,12 +995,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
+@@ -456,12 +958,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
  timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
  {
  	const unsigned char *tzf;
@@ -617,10 +616,11 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
  		tmp = timelib_tzinfo_ctor(timezone);
  
  		version = read_preamble(&tzf, tmp, &type);
-@@ -537,11 +1041,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha
+ 			timelib_tzinfo_dtor(tmp);
+ 			return NULL;
  		}
- 		skip_posix_string(&tzf, tmp);
- 
++
 +#ifdef HAVE_SYSTEM_TZDATA
 +		if (memmap) {
 +			const struct location_info *li;
@@ -643,8 +643,10 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li
 +			munmap(memmap, maplen);
 +		} else {
 +#endif
- 		if (type == TIMELIB_TZINFO_PHP) {
- 			read_location(&tzf, tmp);
+ 		if (version == 2 || version == 3) {
+ 			if (!skip_64bit_preamble(&tzf, tmp)) {
+ 				/* 64 bit preamble is not in place */
+@@ -501,6 +1028,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha
  		} else {
  			set_default_location_and_comments(&tzf, tmp);
  		}

SOURCES/php-7.2.4-fixheader.patch

@@ -0,0 +1,12 @@
+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])

SOURCES/php-7.2.7-getallheaders.patch

@@ -0,0 +1,280 @@
+Adapted for 7.2.7 from 7.3 by remi
+
+
+From 0ea4013f101d64fbeb9221260b36e98f10ed1ddd Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 4 Jul 2018 08:48:38 +0200
+Subject: [PATCH] Fixed bug #62596 add getallheaders (apache_request_headers)
+ missing function in FPM add sapi_add_request_header in public API (was
+ add_request_header) fix arginfo for fastcgi_finish_request fucntion
+
+---
+ main/SAPI.c                       | 50 +++++++++++++++++++++++++++++
+ main/SAPI.h                       |  1 +
+ sapi/cgi/cgi_main.c               | 51 +----------------------------
+ sapi/fpm/fpm/fpm_main.c           | 25 ++++++++++++++-
+ sapi/fpm/tests/getallheaders.phpt | 67 +++++++++++++++++++++++++++++++++++++++
+ 5 files changed, 143 insertions(+), 51 deletions(-)
+ create mode 100644 sapi/fpm/tests/getallheaders.phpt
+
+diff --git a/main/SAPI.c b/main/SAPI.c
+index b6c3329..7e0c7c8 100644
+--- a/main/SAPI.c
++++ b/main/SAPI.c
+@@ -1104,6 +1104,56 @@ SAPI_API void sapi_terminate_process(void) {
+ 	}
+ }
+ 
++SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */
++{
++	zval *return_value = (zval*)arg;
++	char *str = NULL;
++
++	ALLOCA_FLAG(use_heap)
++
++	if (var_len > 5 &&
++	    var[0] == 'H' &&
++	    var[1] == 'T' &&
++	    var[2] == 'T' &&
++	    var[3] == 'P' &&
++	    var[4] == '_') {
++
++		char *p;
++
++		var_len -= 5;
++		p = var + 5;
++		var = str = do_alloca(var_len + 1, use_heap);
++		*str++ = *p++;
++		while (*p) {
++			if (*p == '_') {
++				*str++ = '-';
++				p++;
++				if (*p) {
++					*str++ = *p++;
++				}
++			} else if (*p >= 'A' && *p <= 'Z') {
++				*str++ = (*p++ - 'A' + 'a');
++			} else {
++				*str++ = *p++;
++			}
++		}
++		*str = 0;
++	} else if (var_len == sizeof("CONTENT_TYPE")-1 &&
++	           memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) {
++		var = "Content-Type";
++	} else if (var_len == sizeof("CONTENT_LENGTH")-1 &&
++	           memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) {
++		var = "Content-Length";
++	} else {
++		return;
++	}
++	add_assoc_stringl_ex(return_value, var, var_len, val, val_len);
++	if (str) {
++		free_alloca(var, use_heap);
++	}
++}
++/* }}} */
++
+ /*
+  * Local variables:
+  * tab-width: 4
+diff --git a/main/SAPI.h b/main/SAPI.h
+index f829fd7..4b8e223 100644
+--- a/main/SAPI.h
++++ b/main/SAPI.h
+@@ -151,6 +151,7 @@ SAPI_API void sapi_shutdown(void);
+ SAPI_API void sapi_activate(void);
+ SAPI_API void sapi_deactivate(void);
+ SAPI_API void sapi_initialize_empty_request(void);
++SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg);
+ END_EXTERN_C()
+ 
+ /*
+diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
+index 2e9cefe..350846d 100644
+--- a/sapi/cgi/cgi_main.c
++++ b/sapi/cgi/cgi_main.c
+@@ -1591,54 +1591,6 @@ PHP_FUNCTION(apache_child_terminate) /*
+ }
+ /* }}} */
+ 
+-static void add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */
+-{
+-	zval *return_value = (zval*)arg;
+-	char *str = NULL;
+-	char *p;
+-	ALLOCA_FLAG(use_heap)
+-
+-	if (var_len > 5 &&
+-	    var[0] == 'H' &&
+-	    var[1] == 'T' &&
+-	    var[2] == 'T' &&
+-	    var[3] == 'P' &&
+-	    var[4] == '_') {
+-
+-		var_len -= 5;
+-		p = var + 5;
+-		var = str = do_alloca(var_len + 1, use_heap);
+-		*str++ = *p++;
+-		while (*p) {
+-			if (*p == '_') {
+-				*str++ = '-';
+-				p++;
+-				if (*p) {
+-					*str++ = *p++;
+-				}
+-			} else if (*p >= 'A' && *p <= 'Z') {
+-				*str++ = (*p++ - 'A' + 'a');
+-			} else {
+-				*str++ = *p++;
+-			}
+-		}
+-		*str = 0;
+-	} else if (var_len == sizeof("CONTENT_TYPE")-1 &&
+-	           memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) {
+-		var = "Content-Type";
+-	} else if (var_len == sizeof("CONTENT_LENGTH")-1 &&
+-	           memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) {
+-		var = "Content-Length";
+-	} else {
+-		return;
+-	}
+-	add_assoc_stringl_ex(return_value, var, var_len, val, val_len);
+-	if (str) {
+-		free_alloca(var, use_heap);
+-	}
+-}
+-/* }}} */
+-
+ PHP_FUNCTION(apache_request_headers) /* {{{ */
+ {
+ 	if (zend_parse_parameters_none()) {
+@@ -1648,7 +1600,7 @@ PHP_FUNCTION(apache_request_headers) /*
+ 	if (fcgi_is_fastcgi()) {
+ 		fcgi_request *request = (fcgi_request*) SG(server_context);
+ 
+-		fcgi_loadenv(request, add_request_header, return_value);
++		fcgi_loadenv(request, sapi_add_request_header, return_value);
+ 	} else {
+ 		char buf[128];
+ 		char **env, *p, *q, *var, *val, *t = buf;
+diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
+index 3256660..e815be4 100644
+--- a/sapi/fpm/fpm/fpm_main.c
++++ b/sapi/fpm/fpm/fpm_main.c
+@@ -1533,6 +1533,10 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
+ {
+ 	fcgi_request *request = (fcgi_request*) SG(server_context);
+ 
++	if (zend_parse_parameters_none() == FAILURE) {
++		return;
++	}
++
+ 	if (!fcgi_is_closed(request)) {
+ 		php_output_end_all();
+ 		php_header();
+@@ -1547,8 +1551,27 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
+ }
+ /* }}} */
+ 
++ZEND_BEGIN_ARG_INFO(cgi_fcgi_sapi_no_arginfo, 0)
++ZEND_END_ARG_INFO()
++
++PHP_FUNCTION(apache_request_headers) /* {{{ */
++{
++	fcgi_request *request;
++
++	if (zend_parse_parameters_none() == FAILURE) {
++		return;
++	}
++
++	array_init(return_value);
++	if ((request = (fcgi_request*) SG(server_context))) {
++		fcgi_loadenv(request, sapi_add_request_header, return_value);
++	}
++} /* }}} */
++
+ static const zend_function_entry cgi_fcgi_sapi_functions[] = {
+-	PHP_FE(fastcgi_finish_request,              NULL)
++	PHP_FE(fastcgi_finish_request,                    cgi_fcgi_sapi_no_arginfo)
++	PHP_FE(apache_request_headers,                    cgi_fcgi_sapi_no_arginfo)
++	PHP_FALIAS(getallheaders, apache_request_headers, cgi_fcgi_sapi_no_arginfo)
+ 	PHP_FE_END
+ };
+ 
+diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt
+new file mode 100644
+index 0000000..b41f1c6
+--- /dev/null
++++ b/sapi/fpm/tests/getallheaders.phpt
+@@ -0,0 +1,67 @@
++--TEST--
++FPM: Function getallheaders basic test
++--SKIPIF--
++<?php include "skipif.inc"; ?>
++--FILE--
++<?php
++
++require_once "tester.inc";
++
++$cfg = <<<EOT
++[global]
++error_log = {{FILE:LOG}}
++[unconfined]
++listen = {{ADDR}}
++pm = dynamic
++pm.max_children = 5
++pm.start_servers = 1
++pm.min_spare_servers = 1
++pm.max_spare_servers = 3
++EOT;
++
++$code = <<<EOT
++<?php
++echo "Test Start\n";
++var_dump(getallheaders());
++echo "Test End\n";
++EOT;
++
++$headers = [];
++$tester = new FPM\Tester($cfg, $code);
++$tester->start();
++$tester->expectLogStartNotices();
++$tester->request(
++		'', 
++		[
++			'HTTP_X_FOO' => 'BAR',
++			'HTTP_FOO'   => 'foo'
++		]
++	)->expectBody(
++		[
++			'Test Start',
++			'array(4) {',
++			'  ["Foo"]=>',
++			'  string(3) "foo"',
++			'  ["X-Foo"]=>',
++			'  string(3) "BAR"',
++			'  ["Content-Length"]=>',
++			'  string(1) "0"',
++			'  ["Content-Type"]=>',
++			'  string(0) ""',
++			'}',
++			'Test End',
++		]
++	);
++$tester->terminate();
++$tester->expectLogTerminatingNotices();
++$tester->close();
++
++?>
++Done
++--EXPECT--
++Done
++--CLEAN--
++<?php
++require_once "tester.inc";
++FPM\Tester::clean();
++?>
+-- 
+2.1.4
+

SOURCES/php-7.3.20-fixheader.patch

@@ -1,13 +0,0 @@
-diff -up ./configure.ac.fixheader ./configure.ac
---- ./configure.ac.fixheader	2020-07-06 16:04:56.069183751 +0200
-+++ ./configure.ac	2020-07-06 16:05:52.044046238 +0200
-@@ -1350,7 +1350,8 @@ 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`
-+UNAME=`uname -a | xargs`
-+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])

SOURCES/php-fpm-www.conf

@@ -1,5 +1,5 @@
 ; Start a new pool named 'www'.
-; the variable $pool can be used in any directive and will be replaced by the
+; the variable $pool can we used in any directive and will be replaced by the
 ; pool name ('www' here)
 [www]
 
@@ -330,10 +330,6 @@ slowlog = /var/log/php-fpm/www-slow.log
 ; Default Value: 0
 ;request_slowlog_timeout = 0
 
-; Depth of slow log stack trace.
-; Default Value: 20
-;request_slowlog_trace_depth = 20
-
 ; The timeout for serving a single request after which the worker process will
 ; be killed. This option should be used when the 'max_execution_time' ini option
 ; does not stop script execution for some reason. A value of '0' means 'off'.
@@ -385,7 +381,7 @@ slowlog = /var/log/php-fpm/www-slow.log
 ; Limits the extensions of the main script FPM will allow to parse. This can
 ; prevent configuration mistakes on the web server side. You should only limit
 ; FPM to .php extensions to prevent malicious users to use other extensions to
-; execute php code.
+; exectute php code.
 ; Note: set an empty value to allow all extensions.
 ; Default Value: .php
 ;security.limit_extensions = .php .php3 .php4 .php5 .php7

SOURCES/php-fpm.conf

@@ -43,24 +43,6 @@ error_log = /var/log/php-fpm/error.log
 ; Default Value: notice
 ;log_level = notice
 
-; Log limit on number of characters in the single line (log entry). If the
-; line is over the limit, it is wrapped on multiple lines. The limit is for
-; all logged characters including message prefix and suffix if present. However
-; the new line character does not count into it as it is present only when
-; logging to a file descriptor. It means the new line character is not present
-; when logging to syslog.
-; Default Value: 1024
-;log_limit = 4096
-
-; Log buffering specifies if the log line is buffered which means that the
-; line is written in a single write operation. If the value is false, then the
-; data is written directly into the file descriptor. It is an experimental
-; option that can potentionaly improve logging performance and memory usage
-; for some heavy logging scenarios. This option is ignored if logging to syslog
-; as it has to be always buffered.
-; Default value: yes
-;log_buffering = no
-
 ; If this number of child processes exit with SIGSEGV or SIGBUS within the time
 ; interval set by emergency_restart_interval then FPM will restart. A value
 ; of '0' means 'Off'.

SOURCES/php.ini

@@ -15,7 +15,7 @@
 ; 5. The web server's directory (for SAPI modules), or directory of PHP
 ; (otherwise in Windows)
 ; 6. The directory from the --with-config-file-path compile time option, or the
-; Windows directory (usually C:\windows)
+; Windows directory (C:\windows or C:\winnt)
 ; See the PHP docs for more specific information.
 ; http://php.net/configuration.file
 
@@ -83,7 +83,7 @@
 ; development version only in development environments, as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
-; This is the php.ini-production INI file.
+; This is php.ini-production INI file.
 
 ;;;;;;;;;;;;;;;;;;;
 ; Quick Reference ;
@@ -169,7 +169,7 @@
 ; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
 ;user_ini.filename = ".user.ini"
 
-; To disable this feature set this option to an empty value
+; To disable this feature set this option to empty value
 ;user_ini.filename =
 
 ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
@@ -248,7 +248,7 @@ output_buffering = 4096
 ; Production Value: "form="
 ;url_rewriter.tags
 
-; URL rewriter will not rewrite absolute URL nor form by default. To enable
+; URL rewriter will not rewrites absolute URL nor form by default. To enable
 ; absolute URL rewrite, allowed hosts must be defined at RUNTIME.
 ; Refer to session.trans_sid_hosts for more details.
 ; Default Value: ""
@@ -305,7 +305,6 @@ serialize_precision = -1
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
 ; or per-virtualhost web server configuration file.
-; Note: disables the realpath cache
 ; http://php.net/open-basedir
 ;open_basedir =
 
@@ -338,7 +337,6 @@ disable_classes =
 ; Determines the size of the realpath cache to be used by PHP. This value should
 ; be increased on systems where PHP opens many files to reflect the quantity of
 ; the file operations performed.
-; Note: if open_basedir is set, the cache is disabled
 ; http://php.net/realpath-cache-size
 ;realpath_cache_size = 4096k
 
@@ -399,7 +397,7 @@ max_input_time = 60
 ;max_input_nesting_level = 64
 
 ; How many GET/POST/COOKIE input variables may be accepted
-;max_input_vars = 1000
+; max_input_vars = 1000
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
@@ -584,28 +582,9 @@ html_errors = On
 ; http://php.net/error-log
 ; Example:
 ;error_log = php_errors.log
-; Log errors to syslog (Event Log on Windows).
+; Log errors to syslog.
 ;error_log = syslog
 
-; The syslog ident is a string which is prepended to every message logged
-; to syslog. Only used when error_log is set to syslog.
-;syslog.ident = php
-
-; The syslog facility is used to specify what type of program is logging
-; the message. Only used when error_log is set to syslog.
-;syslog.facility = user
-
-; Set this to disable filtering control characters (the default).
-; Some loggers only accept NVT-ASCII, others accept anything that's not
-; control characters. If your logger accepts everything, then no filtering
-; is needed at all.
-; Allowed values are:
-;   ascii (all printable ASCII characters and NL)
-;   no-ctrl (all characters except control characters)
-;   all (all characters)
-; http://php.net/syslog.filter
-;syslog.filter = ascii
-
 ;windows.show_crt_warning
 ; Default value: 0
 ; Development value: 0
@@ -755,13 +734,13 @@ user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
 ; http://php.net/extension-dir
-;extension_dir = "./"
+; extension_dir = "./"
 ; On windows:
-;extension_dir = "ext"
+; extension_dir = "ext"
 
 ; Directory where the temporary files should be placed.
 ; Defaults to the system default (see sys_get_temp_dir)
-;sys_temp_dir = "/tmp"
+; sys_temp_dir = "/tmp"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -798,9 +777,10 @@ enable_dl = Off
 
 ; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
 ; of the web tree and people will not be able to circumvent .htaccess security.
+; http://php.net/cgi.dicard-path
 ;cgi.discard_path=1
 
-; FastCGI under IIS supports the ability to impersonate
+; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
 ; security tokens of the calling client.  This allows IIS to define the
 ; security context that the request runs under.  mod_fastcgi under Apache
 ; does not currently support this feature (03/17/2002)
@@ -943,7 +923,7 @@ cli_server.color = On
 [iconv]
 ; Use of this INI entry is deprecated, use global input_encoding instead.
 ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
-; The precedence is: default_charset < input_encoding < iconv.input_encoding
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
 ;iconv.input_encoding =
 
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
@@ -958,13 +938,6 @@ cli_server.color = On
 ; otherwise output encoding conversion cannot be performed.
 ;iconv.output_encoding =
 
-[imap]
-; rsh/ssh logins are disabled by default. Use this INI entry if you want to
-; enable them. Note that the IMAP library does not filter mailbox names before
-; passing them to rsh/ssh command, thus passing untrusted data to this function
-; with rsh/ssh enabled is insecure.
-;imap.enable_insecure_rsh=0
-
 [intl]
 ;intl.default_locale =
 ; This directive allows you to produce PHP errors when some error
@@ -974,33 +947,22 @@ cli_server.color = On
 ;intl.use_exceptions = 0
 
 [sqlite3]
-; Directory pointing to SQLite3 extensions
-; http://php.net/sqlite3.extension-dir
 ;sqlite3.extension_dir =
 
-; SQLite defensive mode flag (only available from SQLite 3.26+)
-; When the defensive flag is enabled, language features that allow ordinary
-; SQL to deliberately corrupt the database file are disabled. This forbids
-; writing directly to the schema, shadow tables (eg. FTS data tables), or
-; the sqlite_dbpage virtual table.
-; https://www.sqlite.org/c3ref/c_dbconfig_defensive.html
-; (for older SQLite versions, this flag has no use)
-;sqlite3.defensive = 1
-
 [Pcre]
-; PCRE library backtracking limit.
+;PCRE library backtracking limit.
 ; http://php.net/pcre.backtrack-limit
 ;pcre.backtrack_limit=100000
 
-; PCRE library recursion limit.
-; Please note that if you set this value to a high number you may consume all
-; the available process stack and eventually crash PHP (due to reaching the
-; stack size limit imposed by the Operating System).
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
+;stack size limit imposed by the Operating System).
 ; http://php.net/pcre.recursion-limit
 ;pcre.recursion_limit=100000
 
-; Enables or disables JIT compilation of patterns. This requires the PCRE
-; library to be compiled with JIT support.
+;Enables or disables JIT compilation of patterns. This requires the PCRE
+;library to be compiled with JIT support.
 pcre.jit=0
 
 [Pdo]
@@ -1011,8 +973,13 @@ pcre.jit=0
 ;pdo_odbc.db2_instance_name
 
 [Pdo_mysql]
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/pdo_mysql.cache_size
+pdo_mysql.cache_size = 2000
+
 ; Default socket name for local MySQL connects.  If empty, uses the built-in
 ; MySQL defaults.
+; http://php.net/pdo_mysql.default-socket
 pdo_mysql.default_socket=
 
 [Phar]
@@ -1035,12 +1002,12 @@ sendmail_path = /usr/sbin/sendmail -t -i
 ;mail.force_extra_parameters =
 
 ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
-mail.add_x_header = Off
+mail.add_x_header = On
 
 ; The path to a log file that will log all mail() calls. Log entries include
 ; the full path of the script, line number, To address and headers.
 ;mail.log =
-; Log mail to syslog (Event Log on Windows).
+; Log mail to syslog;
 ;mail.log = syslog
 
 [ODBC]
@@ -1084,6 +1051,8 @@ odbc.defaultlrl = 4096
 ; http://php.net/odbc.defaultbinmode
 odbc.defaultbinmode = 1
 
+;birdstep.max_links = -1
+
 [Interbase]
 ; Allow or prevent persistent links.
 ibase.allow_persistent = 1
@@ -1133,6 +1102,10 @@ mysqli.allow_persistent = On
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
 
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/mysqli.cache_size
+mysqli.cache_size = 2000
+
 ; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
 ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
 ; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
@@ -1167,10 +1140,12 @@ mysqli.reconnect = Off
 [mysqlnd]
 ; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On
 
 ; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = Off
 
 ; Records communication from all extensions using mysqlnd to the specified log
@@ -1179,23 +1154,29 @@ mysqlnd.collect_memory_statistics = Off
 ;mysqlnd.debug =
 
 ; Defines which queries will be logged.
+; http://php.net/mysqlnd.log_mask
 ;mysqlnd.log_mask = 0
 
 ; Default size of the mysqlnd memory pool, which is used by result sets.
+; http://php.net/mysqlnd.mempool_default_size
 ;mysqlnd.mempool_default_size = 16000
 
 ; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
+; http://php.net/mysqlnd.net_cmd_buffer_size
 ;mysqlnd.net_cmd_buffer_size = 2048
 
 ; Size of a pre-allocated buffer used for reading data sent by the server in
 ; bytes.
+; http://php.net/mysqlnd.net_read_buffer_size
 ;mysqlnd.net_read_buffer_size = 32768
 
 ; Timeout for network requests in seconds.
+; http://php.net/mysqlnd.net_read_timeout
 ;mysqlnd.net_read_timeout = 31536000
 
 ; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
 ; key.
+; http://php.net/mysqlnd.sha256_server_public_key
 ;mysqlnd.sha256_server_public_key =
 
 [PostgreSQL]
@@ -1274,11 +1255,10 @@ session.save_handler = files
 ;session.save_path = "/tmp"
 
 ; Whether to use strict session mode.
-; Strict session mode does not accept an uninitialized session ID, and
-; regenerates the session ID if the browser sends an uninitialized session ID.
-; Strict mode protects applications from session fixation via a session adoption
-; vulnerability. It is disabled by default for maximum compatibility, but
-; enabling it is encouraged.
+; Strict session mode does not accept uninitialized session ID and regenerate
+; session ID if browser sends uninitialized session ID. Strict mode protects
+; applications from session fixation via session adoption vulnerability. It is
+; disabled by default for maximum compatibility, but enabling it is encouraged.
 ; https://wiki.php.net/rfc/strict_sessions
 session.use_strict_mode = 0
 
@@ -1316,16 +1296,10 @@ session.cookie_path = /
 ; http://php.net/session.cookie-domain
 session.cookie_domain =
 
-; Whether or not to add the httpOnly flag to the cookie, which makes it
-; inaccessible to browser scripting languages such as JavaScript.
+; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
 ; http://php.net/session.cookie-httponly
 session.cookie_httponly =
 
-; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
-; Current valid values are "Lax" or "Strict"
-; https://tools.ietf.org/html/draft-west-first-party-cookies-07
-session.cookie_samesite =
-
 ; Handler used to serialize data.  php is the standard serializer of PHP.
 ; http://php.net/session.serialize-handler
 session.serialize_handler = php
@@ -1335,7 +1309,7 @@ session.serialize_handler = php
 ; gc_probability/gc_divisor. Where session.gc_probability is the numerator
 ; and gc_divisor is the denominator in the equation. Setting this value to 1
 ; when the session.gc_divisor value is 100 will give you approximately a 1% chance
-; the gc will run on any given request.
+; the gc will run on any give request.
 ; Default Value: 1
 ; Development Value: 1
 ; Production Value: 1
@@ -1345,10 +1319,10 @@ session.gc_probability = 1
 ; Defines the probability that the 'garbage collection' process is started on every
 ; session initialization. The probability is calculated by using the following equation:
 ; gc_probability/gc_divisor. Where session.gc_probability is the numerator and
-; session.gc_divisor is the denominator in the equation. Setting this value to 100
-; when the session.gc_probability value is 1 will give you approximately a 1% chance
-; the gc will run on any given request. Increasing this value to 1000 will give you
-; a 0.1% chance the gc will run on any given request. For high volume production servers,
+; session.gc_divisor is the denominator in the equation. Setting this value to 1
+; when the session.gc_divisor value is 100 will give you approximately a 1% chance
+; the gc will run on any give request. Increasing this value to 1000 will give you
+; a 0.1% chance the gc will run on any give request. For high volume production servers,
 ; this is a more efficient approach.
 ; Default Value: 100
 ; Development Value: 1000
@@ -1399,7 +1373,7 @@ session.use_trans_sid = 0
 ; Set session ID character length. This value could be between 22 to 256.
 ; Shorter length than default is supported only for compatibility reason.
 ; Users should use 32 or more chars.
-; http://php.net/session.sid-length
+; http://php.net/session.sid_length
 ; Default Value: 32
 ; Development Value: 26
 ; Production Value: 26
@@ -1418,7 +1392,7 @@ session.sid_length = 26
 session.trans_sid_tags = "a=href,area=href,frame=src,form="
 
 ; URL rewriter does not rewrite absolute URLs by default.
-; To enable rewrites for absolute paths, target hosts must be specified
+; To enable rewrites for absolute pathes, target hosts must be specified
 ; at RUNTIME. i.e. use ini_set()
 ; <form> tags is special. PHP will check action attribute's URL regardless
 ; of session.trans_sid_tags setting.
@@ -1507,7 +1481,7 @@ zend.assertions = -1
 ; http://php.net/assert.active
 ;assert.active = On
 
-; Throw an AssertionError on failed assertions
+; Throw an AssertationException on failed assertions
 ; http://php.net/assert.exception
 ;assert.exception = On
 
@@ -1543,9 +1517,9 @@ zend.assertions = -1
 
 ; Use of this INI entry is deprecated, use global input_encoding instead.
 ; http input encoding.
-; mbstring.encoding_translation = On is needed to use this setting.
+; mbstring.encoding_traslation = On is needed to use this setting.
 ; If empty, default_charset or input_encoding or mbstring.input is used.
-; The precedence is: default_charset < input_encoding < mbsting.http_input
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
 ; http://php.net/mbstring.http-input
 ;mbstring.http_input =
 

SPECS/php.spec

@@ -7,11 +7,11 @@
 #
 
 # API/ABI check
-%global apiver      20180731
-%global zendver     20180731
+%global apiver      20170718
+%global zendver     20170718
 %global pdover      20170320
 # Extension version
-%global jsonver     1.7.0
+%global jsonver     1.6.0
 
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
@@ -20,7 +20,7 @@
 %global _hardened_build 1
 
 # version used for php embedded library soname
-%global embed_version 7.3
+%global embed_version 7.2
 
 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
@@ -35,12 +35,12 @@
 # needed at srpm build time, when httpd-devel not yet installed
 %{!?_httpd_mmn:        %{expand: %%global _httpd_mmn        %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
 
+%global with_argon2   0
 %global with_dtrace   1
 %global with_libgd    1
 %global with_zip      0
 %global with_libzip   0
 %if 0%{?fedora}
-%global with_argon2   1
 %global with_zts      1
 %global with_firebird 1
 %global with_imap     1
@@ -50,7 +50,6 @@
 %global with_lmdb     1
 %global with_tidy     1
 %else
-%global with_argon2   0
 %global with_zts      0
 %global with_firebird 0
 %global with_imap     0
@@ -61,8 +60,7 @@
 %global with_tidy     0
 %endif
 
-%global upver        7.3.20
-#global rcver        RC1
+%global upver        7.2.24
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -73,11 +71,10 @@ Release: 1%{?dist}
 # TSRM is licensed under BSD
 # main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0
 # ext/date/lib is MIT
-# Zend/zend_sort is NCSA
-License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA
+License: PHP and Zend and BSD and MIT and ASL 1.0
 URL: http://www.php.net/
 
-Source0: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
+Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
 Source1: php.conf
 Source2: php.ini
 Source3: macros.php
@@ -103,15 +100,17 @@ Patch8: php-7.2.0-libdb.patch
 
 # Functional changes
 Patch40: php-7.2.4-dlopen.patch
-Patch42: php-7.3.3-systzdata-v18.patch
+Patch42: php-7.2.16-systzdata-v17.patch
 # See http://bugs.php.net/53436
-Patch43: php-7.3.0-phpize.patch
+Patch43: php-7.2.12-phpize.patch
 # Use -lldap_r for OpenLDAP
 Patch45: php-7.2.3-ldap_r.patch
 # Make php_config.h constant across builds
-Patch46: php-7.3.20-fixheader.patch
+Patch46: php-7.2.4-fixheader.patch
 # drop "Configure command" from phpinfo output
 Patch47: php-5.6.3-phpinfo.patch
+# getallheaders for FPM backported from 7.3
+Patch48: php-7.2.7-getallheaders.patch
 
 # Upstream fixes (100+)
 
@@ -131,7 +130,7 @@ BuildRequires: nginx-filesystem
 BuildRequires: libstdc++-devel, openssl-devel
 BuildRequires: sqlite-devel >= 3.6.0
 BuildRequires: zlib-devel, smtpdaemon, libedit-devel
-BuildRequires: pcre2-devel >= 10.30
+BuildRequires: pcre-devel >= 6.6
 BuildRequires: bzip2
 BuildRequires: perl-interpreter
 BuildRequires: autoconf
@@ -149,8 +148,6 @@ BuildRequires: systemtap-sdt-devel
 %if %{with_argon2}
 BuildRequires: libargon2-devel
 %endif
-# used for tests
-BuildRequires: %{_bindir}/ps
 
 %if %{with_zts}
 Provides: php-zts = %{version}-%{release}
@@ -182,8 +179,6 @@ which adds support for the PHP language to Apache HTTP Server.
 
 %package cli
 Summary: Command-line interface for PHP
-# sapi/cli/ps_title.c is PostgreSQL
-License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and PostgreSQL
 Requires: php-common%{?_isa} = %{version}-%{release}
 Provides: php-cgi = %{version}-%{release}, php-cgi%{?_isa} = %{version}-%{release}
 Provides: php-pcntl, php-pcntl%{?_isa}
@@ -280,7 +275,7 @@ Requires: automake
 Requires: gcc
 Requires: gcc-c++
 Requires: libtool
-Requires: pcre2-devel%{?_isa}
+Requires: pcre-devel%{?_isa}
 Obsoletes: php-pecl-json-devel  < %{jsonver}
 Obsoletes: php-pecl-jsonc-devel < %{jsonver}
 %if %{with_zts}
@@ -379,7 +374,7 @@ License: PHP
 Requires: php-pdo%{?_isa} = %{version}-%{release}
 Provides: php_database
 Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa}
-BuildRequires: krb5-devel, openssl-devel, libpq-devel
+BuildRequires: krb5-devel, openssl-devel, postgresql-devel
 
 %description pgsql
 The php-pgsql package add PostgreSQL database support to PHP.
@@ -510,7 +505,7 @@ Summary: A module for PHP applications which need multi-byte string handling
 # libmbfl is licensed under LGPLv2
 # ucgendat is licensed under OpenLDAP
 License: PHP and LGPLv2 and OpenLDAP
-Provides: bundled(oniguruma) = 6.9.0
+Provides: bundled(oniguruma) = 6.3.0
 Provides: bundled(libmbfl) = 1.3.2
 Requires: php-common%{?_isa} = %{version}-%{release}
 
@@ -717,6 +712,7 @@ low-level PHP extension for the libsodium cryptographic library.
 %endif
 %patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
+%patch48 -p1 -b .getallheaders
 
 # upstream patches
 
@@ -738,6 +734,7 @@ cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE
 cp ext/mbstring/oniguruma/COPYING oniguruma_COPYING
 cp ext/mbstring/ucgendat/OPENLDAP_LICENSE ucgendat_LICENSE
 cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE
+cp ext/phar/LICENSE phar_LICENSE
 cp ext/bcmath/libbcmath/COPYING.LIB libbcmath_COPYING
 cp ext/date/lib/LICENSE.rst timelib_LICENSE
 
@@ -753,13 +750,16 @@ mkdir build-cgi build-apache build-embedded \
 rm ext/date/tests/timezone_location_get.phpt
 rm ext/date/tests/timezone_version_get.phpt
 rm ext/date/tests/timezone_version_get_basic1.phpt
+rm ext/date/tests/bug33414-1.phpt
+rm ext/date/tests/bug33415-2.phpt
+rm ext/date/tests/date_modify-1.phpt
 # fails sometime
+rm ext/date/tests/bug73837.phpt
 rm ext/sockets/tests/mcast_ipv?_recv.phpt
+rm sapi/cli/tests/upload_2G.phpt
 # cause stack exhausion
 rm Zend/tests/bug54268.phpt
 rm Zend/tests/bug68412.phpt
-# tar issue
-rm ext/zlib/tests/004-mb.phpt
 
 # Safety check for API version change.
 pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
@@ -816,11 +816,14 @@ chmod 644 README.*
 # Some extensions have their own configuration file
 cp %{SOURCE50} 10-opcache.ini
 
+%ifarch x86_64
+sed -e '/opcache.huge_code_pages/s/0/1/' -i 10-opcache.ini
+%endif
+
 
 %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)
 
 # aclocal workaround - to be improved
 cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4
@@ -836,7 +839,7 @@ touch configure.ac
 CFLAGS=$(echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign | sed 's/-mstackrealign//')
 export CFLAGS
 
-# Install extension modules in %%{_libdir}/php/modules.
+# Install extension modules in %{_libdir}/php/modules.
 EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
 
 # Set PEAR_INSTALLDIR to ensure that the hard-coded include_path
@@ -878,9 +881,6 @@ ln -sf ../configure
     --with-openssl \
     --with-system-ciphers \
     --with-pcre-regex=%{_prefix} \
-%ifarch s390 s390x sparc64 sparcv9 riscv64
-    --without-pcre-jit \
-%endif
     --with-zlib \
     --with-layout=GNU \
     --with-kerberos \
@@ -1000,7 +1000,6 @@ popd
 without_shared="--without-gd \
       --disable-dom --disable-dba --without-unixODBC \
       --disable-opcache \
-      --disable-phpdbg \
       --disable-json \
       --disable-xmlreader --disable-xmlwriter \
       --without-sodium \
@@ -1387,7 +1386,7 @@ sed -e "s/@PHP_APIVER@/%{apiver}-%{__isa_bits}/" \
 %endif
     < %{SOURCE3} > macros.php
 install -m 644 -D macros.php \
-           $RPM_BUILD_ROOT%{_rpmmacrodir}/macros.php
+           $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.php
 
 # Remove unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
@@ -1427,6 +1426,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %doc CODING_STANDARDS CREDITS EXTENSIONS NEWS README*
 %license LICENSE TSRM_LICENSE
 %license libmagic_LICENSE
+%license phar_LICENSE
 %license timelib_LICENSE
 %doc php.ini-*
 %config(noreplace) %{_sysconfdir}/php.ini
@@ -1510,7 +1510,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %{_mandir}/man1/zts-phpize.1*
 %endif
 %{_mandir}/man1/php-config.1*
-%{_rpmmacrodir}/macros.php
+%{_rpmconfigdir}/macros.d/macros.php
 
 %files embedded
 %{_libdir}/libphp7.so
@@ -1569,20 +1569,14 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 
 
 %changelog
-* Fri Jul 10 2020 Remi Collet <rcollet@redhat.com> - 7.3.20-1
-- update to 7.3.20 #1856655
+* Thu Nov  7 2019 Remi Collet <rcollet@redhat.com> - 7.2.24-1
+- update to 7.2.24 #1726981
 
-* Tue Oct 29 2019 Remi Collet <rcollet@redhat.com> - 7.3.5-5
+* Tue Oct 29 2019 Remi Collet <rcollet@redhat.com> - 7.2.11-4
 - fix underflow in env_path_info in fpm_main.c CVE-2019-11043
 
-* Mon Jul  1 2019 Remi Collet <rcollet@redhat.com> - 7.3.5-3
-- fix AVC denied httpd_execmem when php-opcache is installed #1725104
-
-* Tue May 14 2019 Remi Collet <rcollet@redhat.com> - 7.3.5-2
-- cleanup php-devel dependencies
-
-* Tue May 14 2019 Remi Collet <rcollet@redhat.com> - 7.3.5-1
-- update to 7.3.5
+* Wed May 15 2019 Joe Orton <jorton@redhat.com> - 7.2.11-2
+- rebuild (#1695587)
 
 * Wed Oct 10 2018 Remi Collet <rcollet@redhat.com> - 7.2.11-1
 - update to 7.2.11 #1628543