summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-07-30 14:21:00 +0200
committerRemi Collet <remi@remirepo.net>2019-07-30 14:21:00 +0200
commitc64f810a6fd60f814a9ab0bd81ce02024d9f935e (patch)
treea1321d299b8fe1559683889c4b3b498e315a2e34
parentf7843daadd9b064a59a5a091ca7385c294ab3b85 (diff)
Update to 7.2.21 - http://www.php.net/releases/7_2_21.phpHEADmaster
-rw-r--r--failed.txt2
-rw-r--r--php-bug78297.patch49
-rw-r--r--php.spec7
3 files changed, 5 insertions, 53 deletions
diff --git a/failed.txt b/failed.txt
index e284450..47ada00 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.2.21RC1 (2019-07-18)
+===== 7.2.21 (2019-08-01)
$ grep -ar 'Tests failed' /var/lib/mock/scl72*/build.log
diff --git a/php-bug78297.patch b/php-bug78297.patch
deleted file mode 100644
index facf639..0000000
--- a/php-bug78297.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8a19fe29de77d7477d59db472dd6aadabd5ac249 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Tue, 16 Jul 2019 11:08:27 +0200
-Subject: [PATCH] Fixed bug #78297
-
----
- NEWS | 2 ++
- sapi/phpdbg/phpdbg_list.c | 1 +
- sapi/phpdbg/tests/bug78297.phpt | 16 ++++++++++++++++
- 3 files changed, 19 insertions(+)
- create mode 100644 sapi/phpdbg/tests/bug78297.phpt
-
-diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
-index aab641c..a9b0f4b 100644
---- a/sapi/phpdbg/phpdbg_list.c
-+++ b/sapi/phpdbg/phpdbg_list.c
-@@ -248,6 +248,7 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) {
- } else {
- zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file->filename);
- }
-+ return NULL;
- }
-
- data.buf = estrndup(bufptr, len);
-diff --git a/sapi/phpdbg/tests/bug78297.phpt b/sapi/phpdbg/tests/bug78297.phpt
-new file mode 100644
-index 0000000..47b13ad
---- /dev/null
-+++ b/sapi/phpdbg/tests/bug78297.phpt
-@@ -0,0 +1,16 @@
-+--TEST--
-+Bug #78297: Include unexistent file memory leak
-+--PHPDBG--
-+r
-+q
-+--FILE--
-+<?php
-+include "does_not_exist.php";
-+--EXPECTF--
-+[Successful compilation of %s]
-+prompt>
-+Warning: include(%s): failed to open stream: No such file or directory in %s on line %d
-+
-+Warning: include(): Failed opening 'does_not_exist.php' for inclusion (include_path=%s) in %s on line %d
-+[Script ended normally]
-+prompt>
---
-2.1.4
-
diff --git a/php.spec b/php.spec
index 0193253..0ec2763 100644
--- a/php.spec
+++ b/php.spec
@@ -132,7 +132,7 @@
%endif
%global upver 7.2.21
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -194,7 +194,6 @@ Patch49: php-7.2.16-pdooci.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-bug78297.patch
# Security fixes (200+)
@@ -948,7 +947,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .78297
# security patches
@@ -1894,6 +1892,9 @@ fi
%changelog
+* Tue Jul 30 2019 Remi Collet <remi@remirepo.net> - 7.2.21-1
+- Update to 7.2.21 - http://www.php.net/releases/7_2_21.php
+
* Tue Jul 16 2019 Remi Collet <remi@remirepo.net> - 7.2.21~RC1-1
- update to 7.2.21RC1
- add upstream patch for #78297