From c7fadd23282b105adbdd17692734bc2940831d62 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 17 Mar 2021 12:12:01 +0100
Subject: 8.0.5 is next

We also move the NEWS entry for bug 80847 to the proper version.
---
 NEWS               | 12 +++++++-----
 Zend/zend.h        |  2 +-
 configure.ac       |  2 +-
 main/php_version.h |  6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index cf7cc8ed1c..fa1bf056eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2021, PHP 8.0.4
+?? ??? 2021, PHP 8.0.5
+
+- FFI:
+  . Fixed bug #80847 (CData structs with fields of type struct can't be passed
+    as C function argument). (Nickolas Daniel da Silva, Dmitry)
+
+01 Apr 2021, PHP 8.0.4
 
 - Core:
   . Fixed bug #75776 (Flushing streams with compression filter is broken). (cmb)
@@ -12,10 +18,6 @@ PHP                                                                        NEWS
 - Dba:
   . Fixed bug #80817 (dba_popen() may cause segfault during RSHUTDOWN). (cmb)
 
-- FFI:
-  . Fixed bug #80847 (CData structs with fields of type struct can't be passed
-    as C function argument). (Nickolas Daniel da Silva, Dmitry)
-
 - IMAP:
   . Fixed bug #80800 (imap_open() fails when the flags parameter includes
     CL_EXPUNGE). (girgias)
diff --git a/Zend/zend.h b/Zend/zend.h
index a851ded9b9..dc451dc651 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.0.3-dev"
+#define ZEND_VERSION "4.0.5-dev"
 
 #define ZEND_ENGINE_3
 
diff --git a/configure.ac b/configure.ac
index 691eb8d1f6..7f428748ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[8.0.4-dev],[https://bugs.php.net],[php],[https://www.php.net])
+AC_INIT([PHP],[8.0.5-dev],[https://bugs.php.net],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
diff --git a/main/php_version.h b/main/php_version.h
index dd8b4b7b0b..e762a8a2ed 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 8
 #define PHP_MINOR_VERSION 0
-#define PHP_RELEASE_VERSION 4
+#define PHP_RELEASE_VERSION 5
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "8.0.4-dev"
-#define PHP_VERSION_ID 80004
+#define PHP_VERSION "8.0.5-dev"
+#define PHP_VERSION_ID 80005
-- 
cgit v1.2.1