X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=tld.patch;h=663fcd7e1c32f112b142cd1508e4eb8162452e9a;hb=f188806109560ad0c5d1744ebfd0d41001d4e4bf;hp=c5546edfbc224ef1ab4396cdef21fee52e83eaad;hpb=4523bfffb57a373581cdf4a1f86ebd4e56216bde;p=packages%2Fzabbix.git diff --git a/tld.patch b/tld.patch index c5546ed..663fcd7 100644 --- 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.25.orig/conf/zabbix_agentd.conf zabbix-6.0.25/conf/zabbix_agentd.conf +--- zabbix-6.0.25.orig/conf/zabbix_agentd.conf 2023-12-13 09:17:32.000000000 +0100 ++++ zabbix-6.0.25/conf/zabbix_agentd.conf 2024-01-10 22:39:30.653744791 +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 @@ +@@ -309,15 +309,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.25.orig/conf/zabbix_proxy.conf zabbix-6.0.25/conf/zabbix_proxy.conf +--- zabbix-6.0.25.orig/conf/zabbix_proxy.conf 2023-12-13 09:17:32.000000000 +0100 ++++ zabbix-6.0.25/conf/zabbix_proxy.conf 2024-01-10 22:39:30.653744791 +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.25.orig/conf/zabbix_server.conf zabbix-6.0.25/conf/zabbix_server.conf +--- zabbix-6.0.25.orig/conf/zabbix_server.conf 2023-12-13 09:17:32.000000000 +0100 ++++ zabbix-6.0.25/conf/zabbix_server.conf 2024-01-10 22:39:30.653744791 +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.25.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c +--- zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c 2024-01-10 22:39:30.654744803 +0100 +@@ -603,7 +603,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.25.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.25/src/zabbix_java/lib/logback.xml +--- zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml 2023-12-13 09:17:17.000000000 +0100 ++++ zabbix-6.0.25/src/zabbix_java/lib/logback.xml 2024-01-10 22:39:30.654744803 +0100 @@ -2,10 +2,10 @@ @@ -140,9 +140,9 @@ diff -ur zabbix-5.0.7.orig/src/zabbix_java/lib/logback.xml zabbix-5.0.7/src/zabb 1 3 -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.25.orig/src/zabbix_java/settings.sh zabbix-6.0.25/src/zabbix_java/settings.sh +--- zabbix-6.0.25.orig/src/zabbix_java/settings.sh 2023-12-13 09:17:17.000000000 +0100 ++++ zabbix-6.0.25/src/zabbix_java/settings.sh 2024-01-10 22:39:30.654744803 +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.25.orig/src/zabbix_proxy/proxy.c zabbix-6.0.25/src/zabbix_proxy/proxy.c +--- zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/src/zabbix_proxy/proxy.c 2024-01-10 22:39:30.655744816 +0100 +@@ -515,7 +515,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.25.orig/src/zabbix_server/server.c zabbix-6.0.25/src/zabbix_server/server.c +--- zabbix-6.0.25.orig/src/zabbix_server/server.c 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/src/zabbix_server/server.c 2024-01-10 22:39:30.655744816 +0100 +@@ -578,7 +578,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-6.0.25.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.25/ui/include/classes/core/CConfigFile.php +--- zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/ui/include/classes/core/CConfigFile.php 2024-01-10 22:39:30.655744816 +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-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-6.0.25.orig/ui/include/classes/core/ZBase.php zabbix-6.0.25/ui/include/classes/core/ZBase.php +--- zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/ui/include/classes/core/ZBase.php 2024-01-10 22:39:30.754746056 +0100 +@@ -380,7 +380,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 @@ +@@ -393,7 +393,7 @@ * Load zabbix config file. */ protected function loadConfigFile() { @@ -209,19 +209,10 @@ 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 { - $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' => [ -@@ -682,7 +682,7 @@ +diff -ur zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php +--- zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php 2024-01-10 22:39:30.754746056 +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.0.7.orig/ui/include/classes/setup/CSetupWizard.php zabbix-5.0. $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' => [