Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergejs Maklakovs <sergejs.maklakovs@zabbix.com>2022-02-28 11:48:24 +0300
committerSergejs Maklakovs <sergejs.maklakovs@zabbix.com>2022-02-28 11:48:24 +0300
commit2e19ee1c57ec4d9e755f255148a3056624984bfe (patch)
tree64375bdea60d9ca81dafd943d60ce88cd122da7b
parentc93d403012a6b856a33f1448bafc5c8ee980eede (diff)
.......... [ZBXNEXT-826] updated release date and version [4.0.39]4.0.39
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--frontends/php/include/defines.inc.php2
-rw-r--r--include/version.h4
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java4
5 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c9314d33423..acd6c53a4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+Changes for 4.0.39
+
+4.0.39rc1 was released as 4.0.39 without any changes
+
+--------------------------------------------------------------------------------
Changes for 4.0.39rc1
Bug fixes:
........S. [ZBX-19789] added SourceIP support to ldap simple checks (dgoloscapov)
+..F....... [ZBX-20680] fixed reflected XSS issues (averza)
--------------------------------------------------------------------------------
Changes for 4.0.38
diff --git a/configure.ac b/configure.ac
index 361dc5879f6..fa3c052540d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([Zabbix],[4.0.39rc1])
+AC_INIT([Zabbix],[4.0.39])
AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99])
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index fc7cc4c215c..0a1536e8e25 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -19,7 +19,7 @@
**/
-define('ZABBIX_VERSION', '4.0.39rc1');
+define('ZABBIX_VERSION', '4.0.39');
define('ZABBIX_API_VERSION', '4.0.39');
define('ZABBIX_EXPORT_VERSION', '4.0');
define('ZABBIX_DB_VERSION', 4000000);
diff --git a/include/version.h b/include/version.h
index 9a64fce93a9..a600b41df11 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,7 +24,7 @@
#define ZBX_STR(str) ZBX_STR2(str)
#define APPLICATION_NAME "Zabbix Agent"
-#define ZABBIX_REVDATE "22 February 2022"
+#define ZABBIX_REVDATE "28 February 2022"
#define ZABBIX_VERSION_MAJOR 4
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 39
@@ -36,7 +36,7 @@
# define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM}
# endif
#endif
-#define ZABBIX_VERSION_RC "rc1"
+#define ZABBIX_VERSION_RC ""
#define ZABBIX_VERSION ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \
ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC
#define ZABBIX_REVISION ZBX_STR(ZABBIX_VERSION_REVISION)
diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
index d993d67236d..d004495c1f5 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
@@ -22,9 +22,9 @@ package com.zabbix.gateway;
class GeneralInformation
{
static final String APPLICATION_NAME = "Zabbix Java Gateway";
- static final String REVISION_DATE = "22 February 2022";
+ static final String REVISION_DATE = "28 February 2022";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "4.0.39rc1";
+ static final String VERSION = "4.0.39";
static void printVersion()
{