From 195427c55481d9913ac9dd3fbcedf2f7c637e6de Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyra3l@gmail.com>
Date: Thu, 19 Jan 2017 01:17:47 +0100
Subject: 5.6.30

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

diff --git a/NEWS b/NEWS
index 8fff05850c..1ee950bfec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,14 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-05 Jan 2017, PHP 5.6.30RC1
+19 Jan 2017, PHP 5.6.30
 
 - EXIF:
   . Fixed bug #73737 (FPE when parsing a tag format). (Stas)
 
 - GD:
   . Fixed bug #73549 (Use after free when stream is passed to imagepng). (cmb)
+  . Fixed bug #73868 (DOS vulnerability in gdImageCreateFromGd2Ctx()). (cmb)
+  . Fixed bug #73869 (Signed Integer Overflow gd_io.c). (cmb)
 
 - Intl:
   . Fixed bug #68447 (grapheme_extract take an extra trailing character). 
diff --git a/configure.in b/configure.in
index cefd8c4956..f859e798f0 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=6
 PHP_RELEASE_VERSION=30
-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 1c180c3169..fba7b0d4a8 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 6
 #define PHP_RELEASE_VERSION 30
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.30RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.30"
 #define PHP_VERSION_ID 50630
-- 
cgit v1.2.1