From 8fe4cc6d28eb1d2f6af6e1b898c8f7cc72a3e9f3 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Tue, 16 Dec 2014 11:44:41 -0800
Subject: 5.4.37

---
 NEWS               | 4 +++-
 configure.in       | 2 +-
 main/php_version.h | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 546fe19fe6..121b67197f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20?? PHP 5.4.36
+?? ??? 20?? PHP 5.4.37
+
+18 Dec 2014 PHP 5.4.36
 
 - Core:
   . Upgraded crypt_blowfish to version 1.3. (Leigh)
diff --git a/configure.in b/configure.in
index 8a14b49805..8700b1775a 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=36
+PHP_RELEASE_VERSION=37
 PHP_EXTRA_VERSION="-dev"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index a36ea89436..d0aab5a10c 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,8 +2,8 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 36
+#define PHP_RELEASE_VERSION 37
 
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.36-dev"
-#define PHP_VERSION_ID 50436
+#define PHP_VERSION "5.4.37-dev"
+#define PHP_VERSION_ID 50437
-- 
cgit v1.2.1


From cd387b457572709cbaaaee15ccc0db1185a3c23a Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 17 Dec 2014 02:10:36 +0100
Subject: add missing NEWS entry

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 121b67197f..581f3a62b8 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ PHP                                                                        NEWS
   . Fixed bug #68594 (Use after free vulnerability in unserialize()).
     (CVE-2014-8142) (Stefan Esser)
 
+- Mcrypt:
+  . Fixed possible read after end of buffer and use after free. (Dmitry)
+
 13 Nov 2014 PHP 5.4.35
 
 - Core:
-- 
cgit v1.2.1