]> 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
- build and package Zabbix Agent 2
[packages/zabbix.git] / tld.patch
diff --git a/tld.patch b/tld.patch
index e4806ab3fa9b25d0a60d9beda3fc1cb63b185a6e..262093f9880b9b4394b56f5b4a895755ea7424d0 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-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.0.7.orig/conf/zabbix_agentd.conf zabbix-5.0.7/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.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
-@@ -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.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/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.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy
  
  ### Option: SocketDir
  #     IPC socket directory.
-@@ -578,15 +578,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.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-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.0.7.orig/conf/zabbix_server.conf zabbix-5.0.7/conf/zabbix_serv
  
  ### Option: SocketDir
  #     IPC socket directory.
-@@ -612,15 +612,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.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-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.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-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.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-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.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-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.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-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,3 +176,57 @@ 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-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;
+ 
+-      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-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() {
+-              require_once 'conf/maintenance.inc.php';
++              require_once '/etc/zabbix/web/maintenance.inc.php';
+ 
+               if (defined('ZBX_DENY_GUI_ACCESS')) {
+                       if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
+@@ -381,7 +381,7 @@
+        * Load zabbix config file.
+        */
+       protected function loadConfigFile() {
+-              $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH;
++              $configFile = CConfigFile::CONFIG_FILE_PATH;
+               $config = new CConfigFile($configFile);
+               $this->config = $config->load();
+       }
+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).'"');
+-                              $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH);
++                              $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH);
+                               $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