From 184d4e9fded736b607167a4185eabfbd083322b9 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Tue, 12 May 2015 12:38:38 -0700
Subject: [PATCH] prep for 5.4.41

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

diff --git a/NEWS b/NEWS
index 811f66ddf5..4fc57ee083 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,28 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015 PHP 5.4.41
+14 May 2015 PHP 5.4.41
+
+- Core: 
+  . Fixed bug #69364 (PHP Multipart/form-data remote dos Vulnerability). (Stas)
+  . Fixed bug #69403 (str_repeat() sign mismatch based memory corruption). 
+    (Stas)
+  . Fixed bug #69418 (CVE-2006-7243 fix regressions in 5.4+). (Stas)
+  . Fixed bug #69522 (heap buffer overflow in unpack()). (Stas)
+  
+- FTP:
+  . Fixed bug #69545 (Integer overflow in ftp_genlist() resulting in heap
+    overflow). (Stas)
+
+- PCNTL:
+  . Fixed bug #68598 (pcntl_exec() should not allow null char). (Stas)
 
 - PCRE
   . Upgraded pcrelib to 8.37.
 
+- Phar:
+  . Fixed bug #69453 (Memory Corruption in phar_parse_tarfile when entry
+    filename starts with null). (Stas)
+
 16 Apr 2015 PHP 5.4.40
 
 - Apache2handler:
diff --git a/configure.in b/configure.in
index 11bfa6d03c..fb47c92b5d 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=4
 PHP_RELEASE_VERSION=41
-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 e4ca1a5b6d..08599cbdfc 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
 #define PHP_RELEASE_VERSION 41
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.41-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.41"
 #define PHP_VERSION_ID 50441
-- 
2.40.0