- updated to 5.4.3

diff --git a/always_compile_ipc.patch b/always_compile_ipc.patch
index 076dcd7534ca993540bf373213ee6de72de72d45..4551e8da0a8d631e0ad0a1dcf79c54e820117999 100644 (file)
--- a/always_compile_ipc.patch
+++ b/always_compile_ipc.patch
@@ -1,7 +1,7 @@
-diff -ur zabbix-5.0.7.orig/configure.ac zabbix-5.0.7/configure.ac
---- zabbix-5.0.7.orig/configure.ac     2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/configure.ac  2021-01-03 20:31:44.256798240 +0100
-@@ -1668,7 +1668,7 @@
+diff -ur zabbix-5.4.3.orig/configure.ac zabbix-5.4.3/configure.ac
+--- zabbix-5.4.3.orig/configure.ac     2021-07-21 09:21:30.000000000 +0200
++++ zabbix-5.4.3/configure.ac  2021-07-26 15:22:01.354383385 +0200
+@@ -1682,7 +1682,7 @@
  AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
  
  dnl Check if Zabbix internal IPC services are used

diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 0288f6a9f04387532e72d30f5f0f6a2b02168b6a..f6dcd6b52c925091074bc6647adad8953584fa42 100644 (file)
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -1,18 +1,18 @@
-diff -ur zabbix-5.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy.conf
---- zabbix-5.0.7.orig/conf/zabbix_proxy.conf   2021-01-03 20:22:59.543798240 +0100
-+++ zabbix-5.0.7/conf/zabbix_proxy.conf        2021-01-03 20:28:36.745798240 +0100
-@@ -158,6 +158,7 @@
+diff -ur zabbix-5.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/conf/zabbix_proxy.conf
+--- zabbix-5.4.3.orig/conf/zabbix_proxy.conf   2021-07-26 15:14:02.107383385 +0200
++++ zabbix-5.4.3/conf/zabbix_proxy.conf        2021-07-26 15:18:42.151383385 +0200
+@@ -160,6 +160,7 @@
  ### Option: DBName
  #     Database name.
  #     For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
 +#     If provided name does not contain '/' or ':' (no a path or special type) a .db file in /var/lib/zabbix will be used.
- #     Warning: do not attempt to use the same database Zabbix server is using.
- #
- # Mandatory: yes
-diff -ur zabbix-5.0.7.orig/src/libs/zbxdb/db.c zabbix-5.0.7/src/libs/zbxdb/db.c
---- zabbix-5.0.7.orig/src/libs/zbxdb/db.c      2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.0.7/src/libs/zbxdb/db.c   2021-01-03 20:30:32.174798240 +0100
-@@ -383,6 +383,7 @@
+ #     If the Net Service Name connection method is used to connect to Oracle database, specify the service name from
+ #     the tnsnames.ora file or set to empty string; also see the TWO_TASK environment variable if DBName is set to
+ #     empty string.
+diff -ur zabbix-5.4.3.orig/src/libs/zbxdb/db.c zabbix-5.4.3/src/libs/zbxdb/db.c
+--- zabbix-5.4.3.orig/src/libs/zbxdb/db.c      2021-07-19 16:04:10.000000000 +0200
++++ zabbix-5.4.3/src/libs/zbxdb/db.c   2021-07-26 15:17:02.917383385 +0200
+@@ -388,6 +388,7 @@
        unsigned int    i = 0;
  #elif defined(HAVE_SQLITE3)
        char            *p, *path = NULL;
@@ -20,7 +20,7 @@ diff -ur zabbix-5.0.7.orig/src/libs/zbxdb/db.c zabbix-5.0.7/src/libs/zbxdb/db.c
  #endif
  
  #ifndef HAVE_MYSQL
-@@ -830,6 +831,10 @@
+@@ -836,6 +837,10 @@
        ZBX_UNUSED(ca);
        ZBX_UNUSED(cipher);
        ZBX_UNUSED(cipher_13);

diff --git a/tld.patch b/tld.patch
index c5546edfbc224ef1ab4396cdef21fee52e83eaad..af7b49309f8fbc146ab4ba5dce4eaa8de271b891 100644 (file)
--- a/tld.patch
+++ b/tld.patch
@@ -1,6 +1,6 @@
-diff -ur zabbix-5.0.7.orig/conf/zabbix_agentd.conf zabbix-5.0.7/conf/zabbix_agentd.conf
---- zabbix-5.0.7.orig/conf/zabbix_agentd.conf  2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/conf/zabbix_agentd.conf       2021-01-03 22:16:31.046106105 +0100
+diff -ur zabbix-5.4.3.orig/conf/zabbix_agentd.conf zabbix-5.4.3/conf/zabbix_agentd.conf
+--- zabbix-5.4.3.orig/conf/zabbix_agentd.conf  2021-07-19 16:04:10.000000000 +0200
++++ zabbix-5.4.3/conf/zabbix_agentd.conf       2021-07-26 15:14:02.107383385 +0200
 @@ -8,7 +8,7 @@
  #
  # Mandatory: no
@@ -36,9 +36,9 @@ diff -ur zabbix-5.0.7.orig/conf/zabbix_agentd.conf zabbix-5.0.7/conf/zabbix_agen
  
  ####### USER-DEFINED MONITORED PARAMETERS #######
  
-diff -ur zabbix-5.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy.conf
---- zabbix-5.0.7.orig/conf/zabbix_proxy.conf   2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/conf/zabbix_proxy.conf        2021-01-03 22:17:05.509106105 +0100
+diff -ur zabbix-5.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/conf/zabbix_proxy.conf
+--- zabbix-5.4.3.orig/conf/zabbix_proxy.conf   2021-07-19 16:04:10.000000000 +0200
++++ zabbix-5.4.3/conf/zabbix_proxy.conf        2021-07-26 15:14:02.107383385 +0200
 @@ -88,7 +88,7 @@
  # Default:
  # LogFile=
@@ -57,7 +57,7 @@ diff -ur zabbix-5.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy
  
  ### Option: SocketDir
  #     IPC socket directory.
-@@ -578,15 +578,12 @@
+@@ -595,15 +595,12 @@
  
  ### Option: Include
  #     You may include individual files or all files in a directory in the configuration file.
@@ -74,9 +74,9 @@ diff -ur zabbix-5.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-diff -ur zabbix-5.0.7.orig/conf/zabbix_server.conf zabbix-5.0.7/conf/zabbix_server.conf
---- zabbix-5.0.7.orig/conf/zabbix_server.conf  2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/conf/zabbix_server.conf       2021-01-03 22:17:13.072106105 +0100
+diff -ur zabbix-5.4.3.orig/conf/zabbix_server.conf zabbix-5.4.3/conf/zabbix_server.conf
+--- zabbix-5.4.3.orig/conf/zabbix_server.conf  2021-07-19 16:04:10.000000000 +0200
++++ zabbix-5.4.3/conf/zabbix_server.conf       2021-07-26 15:14:02.108383385 +0200
 @@ -35,7 +35,7 @@
  # Default:
  # LogFile=
@@ -95,7 +95,7 @@ diff -ur zabbix-5.0.7.orig/conf/zabbix_server.conf zabbix-5.0.7/conf/zabbix_serv
  
  ### Option: SocketDir
  #     IPC socket directory.
-@@ -612,15 +612,12 @@
+@@ -645,15 +645,12 @@
  
  ### Option: Include
  #     You may include individual files or all files in a directory in the configuration file.
@@ -112,10 +112,10 @@ diff -ur zabbix-5.0.7.orig/conf/zabbix_server.conf zabbix-5.0.7/conf/zabbix_serv
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-diff -ur zabbix-5.0.7.orig/src/zabbix_agent/zabbix_agentd.c zabbix-5.0.7/src/zabbix_agent/zabbix_agentd.c
---- zabbix-5.0.7.orig/src/zabbix_agent/zabbix_agentd.c 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_agent/zabbix_agentd.c      2021-01-03 22:04:59.483106105 +0100
-@@ -598,7 +598,7 @@
+diff -ur zabbix-5.4.3.orig/src/zabbix_agent/zabbix_agentd.c zabbix-5.4.3/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-5.4.3.orig/src/zabbix_agent/zabbix_agentd.c 2021-07-19 16:04:10.000000000 +0200
++++ zabbix-5.4.3/src/zabbix_agent/zabbix_agentd.c      2021-07-26 15:14:02.108383385 +0200
+@@ -605,7 +605,7 @@
                CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, DEFAULT_LOAD_MODULE_PATH);
  
        if (NULL == CONFIG_PID_FILE)
@@ -124,9 +124,9 @@ diff -ur zabbix-5.0.7.orig/src/zabbix_agent/zabbix_agentd.c zabbix-5.0.7/src/zab
  #endif
        if (NULL == CONFIG_LOG_TYPE_STR)
                CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);
-diff -ur zabbix-5.0.7.orig/src/zabbix_java/lib/logback.xml zabbix-5.0.7/src/zabbix_java/lib/logback.xml
---- zabbix-5.0.7.orig/src/zabbix_java/lib/logback.xml  2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_java/lib/logback.xml       2021-01-03 22:03:05.902106105 +0100
+diff -ur zabbix-5.4.3.orig/src/zabbix_java/lib/logback.xml zabbix-5.4.3/src/zabbix_java/lib/logback.xml
+--- zabbix-5.4.3.orig/src/zabbix_java/lib/logback.xml  2021-03-29 10:33:08.000000000 +0200
++++ zabbix-5.4.3/src/zabbix_java/lib/logback.xml       2021-07-26 15:14:02.108383385 +0200
 @@ -2,10 +2,10 @@
  
        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -140,9 +140,9 @@ diff -ur zabbix-5.0.7.orig/src/zabbix_java/lib/logback.xml zabbix-5.0.7/src/zabb
                        <minIndex>1</minIndex>
                        <maxIndex>3</maxIndex>
                </rollingPolicy>
-diff -ur zabbix-5.0.7.orig/src/zabbix_java/settings.sh zabbix-5.0.7/src/zabbix_java/settings.sh
---- zabbix-5.0.7.orig/src/zabbix_java/settings.sh      2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_java/settings.sh   2021-01-03 22:03:05.902106105 +0100
+diff -ur zabbix-5.4.3.orig/src/zabbix_java/settings.sh zabbix-5.4.3/src/zabbix_java/settings.sh
+--- zabbix-5.4.3.orig/src/zabbix_java/settings.sh      2021-03-29 10:33:08.000000000 +0200
++++ zabbix-5.4.3/src/zabbix_java/settings.sh   2021-07-26 15:14:02.109383385 +0200
 @@ -24,7 +24,7 @@
  # Default:
  # PID_FILE=
@@ -152,10 +152,10 @@ diff -ur zabbix-5.0.7.orig/src/zabbix_java/settings.sh zabbix-5.0.7/src/zabbix_j
  
  ### Option: zabbix.startPollers
  #     Number of worker threads to start.
-diff -ur zabbix-5.0.7.orig/src/zabbix_proxy/proxy.c zabbix-5.0.7/src/zabbix_proxy/proxy.c
---- zabbix-5.0.7.orig/src/zabbix_proxy/proxy.c 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_proxy/proxy.c      2021-01-03 22:08:43.899106105 +0100
-@@ -474,7 +474,7 @@
+diff -ur zabbix-5.4.3.orig/src/zabbix_proxy/proxy.c zabbix-5.4.3/src/zabbix_proxy/proxy.c
+--- zabbix-5.4.3.orig/src/zabbix_proxy/proxy.c 2021-07-19 16:04:10.000000000 +0200
++++ zabbix-5.4.3/src/zabbix_proxy/proxy.c      2021-07-26 15:14:02.109383385 +0200
+@@ -495,7 +495,7 @@
                CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
  
        if (NULL == CONFIG_PID_FILE)
@@ -164,10 +164,10 @@ diff -ur zabbix-5.0.7.orig/src/zabbix_proxy/proxy.c zabbix-5.0.7/src/zabbix_prox
  
        if (NULL == CONFIG_TMPDIR)
                CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
-diff -ur zabbix-5.0.7.orig/src/zabbix_server/server.c zabbix-5.0.7/src/zabbix_server/server.c
---- zabbix-5.0.7.orig/src/zabbix_server/server.c       2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_server/server.c    2021-01-03 22:08:56.453106105 +0100
-@@ -482,7 +482,7 @@
+diff -ur zabbix-5.4.3.orig/src/zabbix_server/server.c zabbix-5.4.3/src/zabbix_server/server.c
+--- zabbix-5.4.3.orig/src/zabbix_server/server.c       2021-07-19 16:04:11.000000000 +0200
++++ zabbix-5.4.3/src/zabbix_server/server.c    2021-07-26 15:14:02.110383385 +0200
+@@ -520,7 +520,7 @@
                CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
  
        if (NULL == CONFIG_PID_FILE)
@@ -176,22 +176,22 @@ diff -ur zabbix-5.0.7.orig/src/zabbix_server/server.c zabbix-5.0.7/src/zabbix_se
  
        if (NULL == CONFIG_ALERT_SCRIPTS_PATH)
                CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DEFAULT_ALERT_SCRIPTS_PATH);
-diff -ur zabbix-5.0.7.orig/ui/include/classes/core/CConfigFile.php zabbix-5.0.7/ui/include/classes/core/CConfigFile.php
---- zabbix-5.0.7.orig/ui/include/classes/core/CConfigFile.php  2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/ui/include/classes/core/CConfigFile.php       2021-01-03 22:57:20.570106105 +0100
-@@ -24,7 +24,7 @@
-       const CONFIG_NOT_FOUND = 1;
+diff -ur zabbix-5.4.3.orig/ui/include/classes/core/CConfigFile.php zabbix-5.4.3/ui/include/classes/core/CConfigFile.php
+--- zabbix-5.4.3.orig/ui/include/classes/core/CConfigFile.php  2021-07-19 16:04:11.000000000 +0200
++++ zabbix-5.4.3/ui/include/classes/core/CConfigFile.php       2021-07-26 15:14:02.110383385 +0200
+@@ -25,7 +25,7 @@
        const CONFIG_ERROR = 2;
+       const CONFIG_VAULT_ERROR = 3;
  
 -      const CONFIG_FILE_PATH = '/conf/zabbix.conf.php';
 +      const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php';
  
        private static $supported_db_types = [
                ZBX_DB_MYSQL => true,
-diff -ur zabbix-5.0.7.orig/ui/include/classes/core/ZBase.php zabbix-5.0.7/ui/include/classes/core/ZBase.php
---- zabbix-5.0.7.orig/ui/include/classes/core/ZBase.php        2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/ui/include/classes/core/ZBase.php     2021-01-03 22:57:20.571106105 +0100
-@@ -322,7 +322,7 @@
+diff -ur zabbix-5.4.3.orig/ui/include/classes/core/ZBase.php zabbix-5.4.3/ui/include/classes/core/ZBase.php
+--- zabbix-5.4.3.orig/ui/include/classes/core/ZBase.php        2021-07-19 16:04:11.000000000 +0200
++++ zabbix-5.4.3/ui/include/classes/core/ZBase.php     2021-07-26 15:14:02.110383385 +0200
+@@ -373,7 +373,7 @@
         * @throws Exception
         */
        protected function setMaintenanceMode() {
@@ -200,7 +200,7 @@ diff -ur zabbix-5.0.7.orig/ui/include/classes/core/ZBase.php zabbix-5.0.7/ui/inc
  
                if (defined('ZBX_DENY_GUI_ACCESS')) {
                        if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
-@@ -335,7 +335,7 @@
+@@ -386,7 +386,7 @@
         * Load zabbix config file.
         */
        protected function loadConfigFile() {
@@ -209,11 +209,11 @@ diff -ur zabbix-5.0.7.orig/ui/include/classes/core/ZBase.php zabbix-5.0.7/ui/inc
                $config = new CConfigFile($configFile);
                $this->config = $config->load();
        }
-diff -ur zabbix-5.0.7.orig/ui/include/classes/setup/CSetupWizard.php zabbix-5.0.7/ui/include/classes/setup/CSetupWizard.php
---- zabbix-5.0.7.orig/ui/include/classes/setup/CSetupWizard.php        2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/ui/include/classes/setup/CSetupWizard.php     2021-01-03 22:58:00.877106105 +0100
-@@ -425,7 +425,7 @@
-       private function stage5(): array {
+diff -ur zabbix-5.4.3.orig/ui/include/classes/setup/CSetupWizard.php zabbix-5.4.3/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-5.4.3.orig/ui/include/classes/setup/CSetupWizard.php        2021-07-19 16:04:11.000000000 +0200
++++ zabbix-5.4.3/ui/include/classes/setup/CSetupWizard.php     2021-07-26 15:14:02.111383385 +0200
+@@ -618,7 +618,7 @@
+ 
                $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
  
 -              $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
@@ -221,7 +221,7 @@ diff -ur zabbix-5.0.7.orig/ui/include/classes/setup/CSetupWizard.php zabbix-5.0.
                $config = new CConfigFile($config_file_name);
                $config->config = [
                        'DB' => [
-@@ -682,7 +682,7 @@
+@@ -970,7 +970,7 @@
                                // make zabbix.conf.php downloadable
                                header('Content-Type: application/x-httpd-php');
                                header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');

diff --git a/zabbix.spec b/zabbix.spec
index d728cff6c2de6977f592bd3674d0be8a8f8f8c97..c3bf2af99d57f3c61c834347d5a196f96bb2b8a8 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -14,12 +14,12 @@
 Summary:       Zabbix - network monitoring software
 Summary(pl.UTF-8):     Zabbix - oprogramowanie do monitorowania sieci
 Name:          zabbix
-Version:       5.0.14
+Version:       5.4.3
 Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
-Source0:       https://cdn.zabbix.com/zabbix/sources/stable/5.0/%{name}-%{version}.tar.gz
-# Source0-md5: 22093602912d09b67a5ade1876967655
+Source0:       https://cdn.zabbix.com/zabbix/sources/stable/5.4/%{name}-%{version}.tar.gz
+# Source0-md5: 5dccb536c164e45c7d5c1a5a9d64be43
 Source1:       %{name}-apache.conf
 Source2:       %{name}_agentd.init
 Source3:       %{name}_server.init