From 57d47847ccf235b985d8b4269f14b2bf8b87754f Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 21 Jan 2015 10:44:23 +0100
Subject: [PATCH] 5.5.21

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

diff --git a/NEWS b/NEWS
index c2d1d2b347..a36d64a25e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-8 Jan 2014, PHP 5.5.21RC1
+22 Jan 2014, PHP 5.5.21
 
 - Core:
   . Upgraded crypt_blowfish to version 1.3. (Leigh)
@@ -19,17 +19,24 @@ PHP                                                                        NEWS
   . Fixed bug #68594 (Use after free vulnerability in unserialize()).
     (CVE-2014-8142) (Stefan Esser)
   . Fixed bug #68676 (Explicit Double Free). (Kalle)
+  . Fixed bug #68710 (Use After Free Vulnerability in PHP's unserialize()).
+    (CVE-2015-0231) (Stefan Esser)
 
 - CGI:
-  . Fix bug #68618 (out of bounds read crashes php-cgi). (Stas)
+  . Fixed bug #68618 (out of bounds read crashes php-cgi).(CVE-2014-9427)
+    (Stas)
 
 - CLI server:
-  . Fix bug #68745 (Invalid HTTP requests make web server segfault). (Adam)
+  . Fixed bug #68745 (Invalid HTTP requests make web server segfault). (Adam)
 
 - cURL:
   . Fixed bug #67643 (curl_multi_getcontent returns '' when
     CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
 
+- EXIF:
+  . Fixed bug #68799: Free called on unitialized pointer. (CVE-2015-0232)
+    (Stas)
+
 - Fileinfo:
   . Fixed bug #68671 (incorrect expression in libmagic).
     (Joshua Rogers, Anatol Belski)
diff --git a/configure.in b/configure.in
index 1730b80bd9..93b3109463 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
 PHP_RELEASE_VERSION=21
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
 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 fbc242fc2a..f935d3046c 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
 #define PHP_RELEASE_VERSION 21
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.21RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.21"
 #define PHP_VERSION_ID 50521
-- 
2.40.0