From e93fdf6330e5cbf5eb0d2d2c9f0eb3d294b07f8a Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Tue, 29 Mar 2016 18:08:54 +0200
Subject: [PATCH] 5.5.34

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

diff --git a/NEWS b/NEWS
index 6d3caf60de..96660ba72c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,26 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-** PHP 5.5 is in security-only mode , please do not commit to this branch **
+31 Mar 2016, PHP 5.5.34
 
-??? 2016, PHP 5.5.34
+- Fileinfo:
+  . Fixed bug #71527 (Buffer over-write in finfo_open with malformed magic
+    file). (Anatol)
+
+- Mbstring:
+  . Fixed bug #71906 (AddressSanitizer: negative-size-param (-1) in
+    mbfl_strcut). (Stas)
 
+- OBBC
+  . Fixed bug #71860 (Invalid memory write in phar on filename with \0 in
+    name). (Stas)
 
+- SNMP:
+  . Fixed bug #71704 (php_snmp_error() Format String Vulnerability).
+    (andrew at jmpesp dot org)
+
+- Standard
+  . Fixed bug #71798 (Integer Overflow in php_raw_url_encode).
+    (taoguangchen at icloud dot com, Stas)
 
 03 Mar 2016, PHP 5.5.33
 
diff --git a/configure.in b/configure.in
index 21a52065c5..5eed7bd87f 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=34
-PHP_EXTRA_VERSION="-dev"
+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 25446e3d65..a1c58c4b83 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 34
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.34-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.34"
 #define PHP_VERSION_ID 50534
-- 
2.40.0