From 188c6b49d812cc8b256917e4e34537ef4b23d90b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 8 Jan 2019 15:08:08 +0100
Subject: [PATCH] Update to 7.2.14 - http://www.php.net/releases/7_2_14.php

---
 .gitignore     |  1 +
 php-imap.patch | 71 --------------------------------------------------
 sources        |  2 +-
 3 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 php-imap.patch

diff --git a/.gitignore b/.gitignore
index 9252974..a9ccf4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ php-7.1.*.xz
 /php-7.2.11.tar.xz
 /php-7.2.12.tar.xz
 /php-7.2.13.tar.xz
+/php-7.2.14.tar.xz
diff --git a/php-imap.patch b/php-imap.patch
deleted file mode 100644
index 81c2b7c..0000000
--- a/php-imap.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d8765852e0400ee2ce8ae9e2177c42731d4539d8 Mon Sep 17 00:00:00 2001
-From: Stanislav Malyshev <stas@php.net>
-Date: Wed, 28 Nov 2018 15:45:51 -0800
-Subject: [PATCH] Add DISPLAY_INI_ENTRIES for imap
-
----
- ext/imap/php_imap.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
-index f6feebe9f769..a23e84c08521 100644
---- a/ext/imap/php_imap.c
-+++ b/ext/imap/php_imap.c
-@@ -1153,6 +1153,8 @@ PHP_MINFO_FUNCTION(imap)
- 	php_info_print_table_row(2, "Kerberos Support", "enabled");
- #endif
- 	php_info_print_table_end();
-+
-+	DISPLAY_INI_ENTRIES();
- }
- /* }}} */
- 
-From 7edc639b9ff1c3576773d79d016abbeed1f93846 Mon Sep 17 00:00:00 2001
-From: Stanislav Malyshev <stas@php.net>
-Date: Sun, 11 Nov 2018 10:04:01 -0800
-Subject: [PATCH] Fix #77020: null pointer dereference in imap_mail
-
-If an empty $message is passed to imap_mail(), we must not set message
-to NULL, since _php_imap_mail() is not supposed to handle NULL pointers
-(opposed to pointers to NUL).
----
- NEWS                         |  1 +
- ext/imap/php_imap.c          |  1 -
- ext/imap/tests/bug77020.phpt | 15 +++++++++++++++
- 3 files changed, 16 insertions(+), 1 deletion(-)
- create mode 100644 ext/imap/tests/bug77020.phpt
-
-diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
-index a23e84c08521..b30440f000f3 100644
---- a/ext/imap/php_imap.c
-+++ b/ext/imap/php_imap.c
-@@ -4125,7 +4125,6 @@ PHP_FUNCTION(imap_mail)
- 	if (!ZSTR_LEN(message)) {
- 		/* this is not really an error, so it is allowed. */
- 		php_error_docref(NULL, E_WARNING, "No message string in mail command");
--		message = NULL;
- 	}
- 
- 	if (_php_imap_mail(ZSTR_VAL(to), ZSTR_VAL(subject), ZSTR_VAL(message), headers?ZSTR_VAL(headers):NULL, cc?ZSTR_VAL(cc):NULL,
-diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt
-new file mode 100644
-index 000000000000..8a65232eec6d
---- /dev/null
-+++ b/ext/imap/tests/bug77020.phpt
-@@ -0,0 +1,15 @@
-+--TEST--
-+Bug #77020 (null pointer dereference in imap_mail)
-+--SKIPIF--
-+<?php
-+if (!extension_loaded('imap')) die('skip imap extension not available');
-+?>
-+--FILE--
-+<?php
-+imap_mail('1', 1, NULL);
-+?>
-+===DONE===
-+--EXPECTF--
-+Warning: imap_mail(): No message string in mail command in %s on line %d
-+%s
-+===DONE===
-
diff --git a/sources b/sources
index a35b06c..dcadcf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-7.2.13.tar.xz) = 9df1d43e9cd701db10281811b328721b85cb90c6c8dae1842b0fd848cb5388328918b3040bbad7634b340550d82b93746ea479ed45f4d8a80e8a316e6324115d
+SHA512 (php-7.2.14.tar.xz) = 13f2c97b730e3e872bd24bcc004c6cff5e2cc633c37a4eb60b8b5d1d4454bc5985f7d52943448d61cf4a227c64be770edc5eadd2c9612b297d71c0840b4b1259