X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=tld.patch;h=22f8dd92a8d25f4c4158f200c7d791660de309c0;hb=df3f9c3f967a1ee58138a46fc78acc154e13890a;hp=af7b49309f8fbc146ab4ba5dce4eaa8de271b891;hpb=ccc85b787e14f0dc9552636a6afae5bceb0158c0;p=packages%2Fzabbix.git diff --git a/tld.patch b/tld.patch index af7b493..22f8dd9 100644 --- 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.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-11 00:18:54.065715198 +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 @@ +@@ -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.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.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-11 00:18:54.065715198 +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.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-11 00:18:54.065715198 +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,108 @@ 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.25.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.25/src/go/cmd/zabbix_web_service/config.go +--- zabbix-6.0.25.orig/src/go/cmd/zabbix_web_service/config.go 2023-12-13 09:17:16.000000000 +0100 ++++ zabbix-6.0.25/src/go/cmd/zabbix_web_service/config.go 2024-01-11 00:28:57.120343885 +0100 +@@ -25,7 +25,7 @@ + ListenPort string `conf:"optional,range=1024:32767,default=10053"` + AllowedIP string `conf:"optional"` + LogType string `conf:"optional,default=file"` +- LogFile string `conf:"optional,default=/tmp/zabbix_web_service.log"` ++ LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_web_service.log"` + LogFileSize int `conf:"optional,range=0:1024,default=1"` + Timeout int `conf:"optional,range=1:30,default=3"` + DebugLevel int `conf:"range=0:5,default=3"` +diff -ur zabbix-6.0.25.orig/src/go/conf/mock_server.conf zabbix-6.0.25/src/go/conf/mock_server.conf +--- zabbix-6.0.25.orig/src/go/conf/mock_server.conf 2023-12-13 09:17:29.000000000 +0100 ++++ zabbix-6.0.25/src/go/conf/mock_server.conf 2024-01-11 00:29:17.508601798 +0100 +@@ -18,7 +18,7 @@ + # Default: + # LogFile= + +-#LogFile=/tmp/zabbix_mock_server.log ++#LogFile=/var/log/zabbix/zabbix_mock_server.log + + ### Option: DebugLevel + # Specifies debug level: +diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.25/src/go/conf/zabbix_agent2.conf +--- zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/src/go/conf/zabbix_agent2.conf 2024-01-11 00:27:56.657579028 +0100 +@@ -8,7 +8,7 @@ + # + # Mandatory: no + # Default: +-# PidFile=/tmp/zabbix_agent2.pid ++# PidFile=/var/run/zabbix/zabbix_agent2.pid + + ### Option: LogType + # Specifies where log messages are written to: +@@ -25,7 +25,7 @@ + # + # Mandatory: yes, if LogType is set to file, otherwise no + # Default: +-# LogFile=/tmp/zabbix_agent2.log ++# LogFile=/var/log/zabbix/zabbix_agent2.log + + ### Option: LogFileSize + # Maximum size of log file in MB. +@@ -272,9 +272,7 @@ + # Default: + # Include= + +-# Include=/usr/local/etc/zabbix_agent2.userparams.conf +-# Include=/usr/local/etc/zabbix_agent2.conf.d/ +-# Include=/usr/local/etc/zabbix_agent2.conf.d/*.conf ++Include=/etc/zabbix/zabbix_agent2.conf.d/*.conf + + ### Option:PluginTimeout + # Timeout for connections with external plugins. +@@ -477,4 +475,4 @@ + # ForceActiveChecksOnStart=0 + + # Include configuration files for plugins +-Include=./zabbix_agent2.d/plugins.d/*.conf ++Include=/etc/zabbix/zabbix_agent2.d/plugins.d/*.conf +diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.25/src/go/conf/zabbix_web_service.conf +--- zabbix-6.0.25.orig/src/go/conf/zabbix_web_service.conf 2023-12-13 09:17:29.000000000 +0100 ++++ zabbix-6.0.25/src/go/conf/zabbix_web_service.conf 2024-01-11 00:29:05.116445036 +0100 +@@ -18,7 +18,7 @@ + # + # Mandatory: yes, if LogType is set to file, otherwise no + # Default: +-# LogFile=/tmp/zabbix_web_service.log ++# LogFile=/var/log/zabbix/zabbix_web_service.log + + ### Option: LogFileSize + # Maximum size of log file in MB. +diff -ur zabbix-6.0.25.orig/src/go/internal/agent/options_nix.go zabbix-6.0.25/src/go/internal/agent/options_nix.go +--- zabbix-6.0.25.orig/src/go/internal/agent/options_nix.go 2023-12-13 09:17:33.000000000 +0100 ++++ zabbix-6.0.25/src/go/internal/agent/options_nix.go 2024-01-11 00:31:22.998189252 +0100 +@@ -24,7 +24,7 @@ + + type AgentOptions struct { + LogType string `conf:"optional,default=file"` +- LogFile string `conf:"optional,default=/tmp/zabbix_agent2.log"` ++ LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_agent2.log"` + LogFileSize int `conf:"optional,range=0:1024,default=1"` + DebugLevel int `conf:"optional,range=0:5,default=3"` + PidFile string `conf:"optional"` +diff -ur zabbix-6.0.25.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.25/src/go/pkg/pidfile/pidfile_nix.go +--- zabbix-6.0.25.orig/src/go/pkg/pidfile/pidfile_nix.go 2023-12-13 09:17:16.000000000 +0100 ++++ zabbix-6.0.25/src/go/pkg/pidfile/pidfile_nix.go 2024-01-11 00:28:30.003000848 +0100 +@@ -31,7 +31,7 @@ + + func createPidFile(pid int, path string) (file *os.File, err error) { + if path == "" { +- path = "/tmp/zabbix_agent2.pid" ++ path = "/var/run/zabbix/zabbix_agent2.pid" + } + + flockT := syscall.Flock_t{ +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-11 00:18:54.066715211 +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 +222,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.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-11 00:18:54.066715211 +0100 @@ -2,10 +2,10 @@ @@ -140,9 +238,9 @@ diff -ur zabbix-5.4.3.orig/src/zabbix_java/lib/logback.xml zabbix-5.4.3/src/zabb 1 3 -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.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-11 00:18:54.066715211 +0100 @@ -24,7 +24,7 @@ # Default: # PID_FILE= @@ -152,10 +250,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.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-11 00:18:54.067715224 +0100 +@@ -515,7 +515,7 @@ CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp"); if (NULL == CONFIG_PID_FILE) @@ -164,10 +262,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.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-11 00:18:54.067715224 +0100 +@@ -578,7 +578,7 @@ CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp"); if (NULL == CONFIG_PID_FILE) @@ -176,9 +274,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.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-11 00:18:54.067715224 +0100 @@ -25,7 +25,7 @@ const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; @@ -188,10 +286,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.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-11 00:18:54.139716136 +0100 +@@ -380,7 +380,7 @@ * @throws Exception */ protected function setMaintenanceMode() { @@ -200,7 +298,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 @@ +@@ -393,7 +393,7 @@ * Load zabbix config file. */ protected function loadConfigFile() { @@ -209,19 +307,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.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-11 00:18:54.139716136 +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 +319,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' => [