From 8f155eae867aacd79bec46391277100189d95a3a Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Tue, 1 Apr 2014 14:32:03 +0200
Subject: 5.5.11 final

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

diff --git a/NEWS b/NEWS
index 56ea52798e..8cb6bc208e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-20 Mar 2014, PHP 5.5.11RC1
+03 Apr 2014, PHP 5.5.11
 
 - Core:
   . Allow zero length comparison in substr_compare() (Tjerk)
@@ -18,6 +18,10 @@ PHP                                                                        NEWS
   . Added clear_env configuration directive to disable clearenv() call.
   (Github PR# 598, Paul Annesley)
 
+- Fileinfo:
+  . Fixed bug #66946 (fileinfo: extensive backtracking in awk rule regular
+    expression). (CVE-2013-7345) (Remi)
+
 - GD:
   . Fixed bug #66714 (imageconvolution breakage). (Brad Daily)
   . Fixed bug #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)
diff --git a/configure.in b/configure.in
index 04588e875e..0ddd1ea015 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=11
-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 d72b0b2298..332a859893 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 11
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.11RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.11"
 #define PHP_VERSION_ID 50511
-- 
cgit v1.2.1