]> TLD Linux GIT Repositories - packages/zabbix.git/blobdiff - tld.patch
TLD / packages / zabbix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 6.0.2
[packages/zabbix.git] / tld.patch
diff --git a/tld.patch b/tld.patch
index af7b49309f8fbc146ab4ba5dce4eaa8de271b891..262093f9880b9b4394b56f5b4a895755ea7424d0 100644 (file)
--- a/tld.patch
+++ b/tld.patch
@@ -1,6 +1,6 @@
-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
+diff -ur zabbix-6.0.2.orig/conf/zabbix_agentd.conf zabbix-6.0.2/conf/zabbix_agentd.conf
+--- zabbix-6.0.2.orig/conf/zabbix_agentd.conf  2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/conf/zabbix_agentd.conf       2022-03-24 18:45:54.814005822 +0100
 @@ -8,7 +8,7 @@
  #
  # Mandatory: no
@@ -19,7 +19,7 @@ diff -ur zabbix-5.4.3.orig/conf/zabbix_agentd.conf zabbix-5.4.3/conf/zabbix_agen
  
  ### Option: LogFileSize
  #     Maximum size of log file in MB.
-@@ -296,15 +296,12 @@
+@@ -302,15 +302,12 @@
  
  ### Option: Include
  #     You may include individual files or all files in a directory in the configuration file.
@@ -36,10 +36,10 @@ diff -ur zabbix-5.4.3.orig/conf/zabbix_agentd.conf zabbix-5.4.3/conf/zabbix_agen
  
  ####### USER-DEFINED MONITORED PARAMETERS #######
  
-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 @@
+diff -ur zabbix-6.0.2.orig/conf/zabbix_proxy.conf zabbix-6.0.2/conf/zabbix_proxy.conf
+--- zabbix-6.0.2.orig/conf/zabbix_proxy.conf   2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/conf/zabbix_proxy.conf        2022-03-24 18:45:54.815005824 +0100
+@@ -81,7 +81,7 @@
  # Default:
  # LogFile=
  
@@ -48,7 +48,7 @@ diff -ur zabbix-5.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/conf/zabbix_proxy
  
  ### Option: LogFileSize
  #     Maximum size of log file in MB.
-@@ -136,7 +136,7 @@
+@@ -129,7 +129,7 @@
  #
  # Mandatory: no
  # Default:
@@ -57,7 +57,7 @@ diff -ur zabbix-5.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/conf/zabbix_proxy
  
  ### Option: SocketDir
  #     IPC socket directory.
-@@ -595,15 +595,12 @@
+@@ -605,15 +605,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.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/conf/zabbix_proxy
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-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
+diff -ur zabbix-6.0.2.orig/conf/zabbix_server.conf zabbix-6.0.2/conf/zabbix_server.conf
+--- zabbix-6.0.2.orig/conf/zabbix_server.conf  2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/conf/zabbix_server.conf       2022-03-24 18:45:54.815005824 +0100
 @@ -35,7 +35,7 @@
  # Default:
  # LogFile=
@@ -95,7 +95,7 @@ diff -ur zabbix-5.4.3.orig/conf/zabbix_server.conf zabbix-5.4.3/conf/zabbix_serv
  
  ### Option: SocketDir
  #     IPC socket directory.
-@@ -645,15 +645,12 @@
+@@ -654,15 +654,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.4.3.orig/conf/zabbix_server.conf zabbix-5.4.3/conf/zabbix_serv
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-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 @@
+diff -ur zabbix-6.0.2.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.2/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-6.0.2.orig/src/zabbix_agent/zabbix_agentd.c 2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/src/zabbix_agent/zabbix_agentd.c      2022-03-24 18:45:54.815005824 +0100
+@@ -607,7 +607,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.4.3.orig/src/zabbix_agent/zabbix_agentd.c zabbix-5.4.3/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.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
+diff -ur zabbix-6.0.2.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.2/src/zabbix_java/lib/logback.xml
+--- zabbix-6.0.2.orig/src/zabbix_java/lib/logback.xml  2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/src/zabbix_java/lib/logback.xml       2022-03-24 18:45:54.816005826 +0100
 @@ -2,10 +2,10 @@
  
        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -140,9 +140,9 @@ diff -ur zabbix-5.4.3.orig/src/zabbix_java/lib/logback.xml zabbix-5.4.3/src/zabb
                        <minIndex>1</minIndex>
                        <maxIndex>3</maxIndex>
                </rollingPolicy>
-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
+diff -ur zabbix-6.0.2.orig/src/zabbix_java/settings.sh zabbix-6.0.2/src/zabbix_java/settings.sh
+--- zabbix-6.0.2.orig/src/zabbix_java/settings.sh      2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/src/zabbix_java/settings.sh   2022-03-24 18:45:54.816005826 +0100
 @@ -24,7 +24,7 @@
  # Default:
  # PID_FILE=
@@ -152,10 +152,10 @@ diff -ur zabbix-5.4.3.orig/src/zabbix_java/settings.sh zabbix-5.4.3/src/zabbix_j
  
  ### Option: zabbix.startPollers
  #     Number of worker threads to start.
-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 @@
+diff -ur zabbix-6.0.2.orig/src/zabbix_proxy/proxy.c zabbix-6.0.2/src/zabbix_proxy/proxy.c
+--- zabbix-6.0.2.orig/src/zabbix_proxy/proxy.c 2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/src/zabbix_proxy/proxy.c      2022-03-24 18:45:54.816005826 +0100
+@@ -501,7 +501,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.4.3.orig/src/zabbix_proxy/proxy.c zabbix-5.4.3/src/zabbix_prox
  
        if (NULL == CONFIG_TMPDIR)
                CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
-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 @@
+diff -ur zabbix-6.0.2.orig/src/zabbix_server/server.c zabbix-6.0.2/src/zabbix_server/server.c
+--- zabbix-6.0.2.orig/src/zabbix_server/server.c       2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/src/zabbix_server/server.c    2022-03-24 18:45:54.817005828 +0100
+@@ -556,7 +556,7 @@
                CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
  
        if (NULL == CONFIG_PID_FILE)
@@ -176,9 +176,9 @@ diff -ur zabbix-5.4.3.orig/src/zabbix_server/server.c zabbix-5.4.3/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.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
+diff -ur zabbix-6.0.2.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.2/ui/include/classes/core/CConfigFile.php
+--- zabbix-6.0.2.orig/ui/include/classes/core/CConfigFile.php  2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/ui/include/classes/core/CConfigFile.php       2022-03-24 18:45:54.817005828 +0100
 @@ -25,7 +25,7 @@
        const CONFIG_ERROR = 2;
        const CONFIG_VAULT_ERROR = 3;
@@ -188,10 +188,10 @@ diff -ur zabbix-5.4.3.orig/ui/include/classes/core/CConfigFile.php zabbix-5.4.3/
  
        private static $supported_db_types = [
                ZBX_DB_MYSQL => true,
-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 @@
+diff -ur zabbix-6.0.2.orig/ui/include/classes/core/ZBase.php zabbix-6.0.2/ui/include/classes/core/ZBase.php
+--- zabbix-6.0.2.orig/ui/include/classes/core/ZBase.php        2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/ui/include/classes/core/ZBase.php     2022-03-24 18:45:54.817005828 +0100
+@@ -368,7 +368,7 @@
         * @throws Exception
         */
        protected function setMaintenanceMode() {
@@ -200,7 +200,7 @@ diff -ur zabbix-5.4.3.orig/ui/include/classes/core/ZBase.php zabbix-5.4.3/ui/inc
  
                if (defined('ZBX_DENY_GUI_ACCESS')) {
                        if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
-@@ -386,7 +386,7 @@
+@@ -381,7 +381,7 @@
         * Load zabbix config file.
         */
        protected function loadConfigFile() {
@@ -209,19 +209,10 @@ diff -ur zabbix-5.4.3.orig/ui/include/classes/core/ZBase.php zabbix-5.4.3/ui/inc
                $config = new CConfigFile($configFile);
                $this->config = $config->load();
        }
-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;
-+              $config_file_name = CConfigFile::CONFIG_FILE_PATH;
-               $config = new CConfigFile($config_file_name);
-               $config->config = [
-                       'DB' => [
-@@ -970,7 +970,7 @@
+diff -ur zabbix-6.0.2.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-6.0.2.orig/ui/include/classes/setup/CSetupWizard.php        2022-03-14 10:57:00.000000000 +0100
++++ zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php     2022-03-24 18:46:52.896140242 +0100
+@@ -271,7 +271,7 @@
                                // make zabbix.conf.php downloadable
                                header('Content-Type: application/x-httpd-php');
                                header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');
@@ -230,3 +221,12 @@ diff -ur zabbix-5.4.3.orig/ui/include/classes/setup/CSetupWizard.php zabbix-5.4.
                                $config->config = [
                                        'DB' => [
                                                'TYPE' => $this->getConfig('DB_TYPE'),
+@@ -821,7 +821,7 @@
+ 
+               $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
+ 
+-              $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
++              $config_file_name = CConfigFile::CONFIG_FILE_PATH;
+               $config = new CConfigFile($config_file_name);
+               $config->config = [
+                       'DB' => [
Zabbix - network monitoring software