X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=tld.patch;h=22f8dd92a8d25f4c4158f200c7d791660de309c0;hb=refs%2Fheads%2Fmaster;hp=663fcd7e1c32f112b142cd1508e4eb8162452e9a;hpb=96ef8ffbef5ee8a1c610fabea058c6accd925618;p=packages%2Fzabbix.git

diff --git a/tld.patch b/tld.patch
index 663fcd7..8c297c1 100644
--- a/tld.patch
+++ b/tld.patch
@@ -1,6 +1,6 @@
-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
+diff -ur zabbix-6.0.30.orig/conf/zabbix_agentd.conf zabbix-6.0.30/conf/zabbix_agentd.conf
+--- zabbix-6.0.30.orig/conf/zabbix_agentd.conf	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/conf/zabbix_agentd.conf	2024-06-13 13:24:11.947817181 +0200
 @@ -8,7 +8,7 @@
  #
  # Mandatory: no
@@ -36,9 +36,9 @@ diff -ur zabbix-6.0.25.orig/conf/zabbix_agentd.conf zabbix-6.0.25/conf/zabbix_ag
  
  ####### USER-DEFINED MONITORED PARAMETERS #######
  
-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
+diff -ur zabbix-6.0.30.orig/conf/zabbix_proxy.conf zabbix-6.0.30/conf/zabbix_proxy.conf
+--- zabbix-6.0.30.orig/conf/zabbix_proxy.conf	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/conf/zabbix_proxy.conf	2024-06-13 13:24:12.411823745 +0200
 @@ -81,7 +81,7 @@
  # Default:
  # LogFile=
@@ -74,9 +74,9 @@ diff -ur zabbix-6.0.25.orig/conf/zabbix_proxy.conf zabbix-6.0.25/conf/zabbix_pro
  
  ### Option: SSLCertLocation
  #	Location of SSL client certificates.
-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
+diff -ur zabbix-6.0.30.orig/conf/zabbix_server.conf zabbix-6.0.30/conf/zabbix_server.conf
+--- zabbix-6.0.30.orig/conf/zabbix_server.conf	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/conf/zabbix_server.conf	2024-06-13 13:24:12.415823801 +0200
 @@ -35,7 +35,7 @@
  # Default:
  # LogFile=
@@ -112,10 +112,108 @@ diff -ur zabbix-6.0.25.orig/conf/zabbix_server.conf zabbix-6.0.25/conf/zabbix_se
  
  ### Option: SSLCertLocation
  #	Location of SSL client certificates.
-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 @@
+diff -ur zabbix-6.0.30.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.30/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-6.0.30.orig/src/go/cmd/zabbix_web_service/config.go	2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/cmd/zabbix_web_service/config.go	2024-06-13 13:24:12.415823801 +0200
+@@ -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.30.orig/src/go/conf/mock_server.conf zabbix-6.0.30/src/go/conf/mock_server.conf
+--- zabbix-6.0.30.orig/src/go/conf/mock_server.conf	2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/conf/mock_server.conf	2024-06-13 13:24:12.415823801 +0200
+@@ -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.30.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.30/src/go/conf/zabbix_agent2.conf
+--- zabbix-6.0.30.orig/src/go/conf/zabbix_agent2.conf	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/go/conf/zabbix_agent2.conf	2024-06-13 13:24:12.415823801 +0200
+@@ -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.30.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.30/src/go/conf/zabbix_web_service.conf
+--- zabbix-6.0.30.orig/src/go/conf/zabbix_web_service.conf	2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/conf/zabbix_web_service.conf	2024-06-13 13:24:12.415823801 +0200
+@@ -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.30.orig/src/go/internal/agent/options_nix.go zabbix-6.0.30/src/go/internal/agent/options_nix.go
+--- zabbix-6.0.30.orig/src/go/internal/agent/options_nix.go	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/go/internal/agent/options_nix.go	2024-06-13 13:24:12.415823801 +0200
+@@ -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.30.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.30/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-6.0.30.orig/src/go/pkg/pidfile/pidfile_nix.go	2024-05-21 08:57:51.000000000 +0200
++++ zabbix-6.0.30/src/go/pkg/pidfile/pidfile_nix.go	2024-06-13 13:24:12.415823801 +0200
+@@ -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.30.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.30/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-6.0.30.orig/src/zabbix_agent/zabbix_agentd.c	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/zabbix_agent/zabbix_agentd.c	2024-06-13 13:24:12.415823801 +0200
+@@ -609,7 +609,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-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.25/src/z
  #endif
  	if (NULL == CONFIG_LOG_TYPE_STR)
  		CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);
-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
+diff -ur zabbix-6.0.30.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.30/src/zabbix_java/lib/logback.xml
+--- zabbix-6.0.30.orig/src/zabbix_java/lib/logback.xml	2024-05-20 12:30:20.000000000 +0200
++++ zabbix-6.0.30/src/zabbix_java/lib/logback.xml	2024-06-13 13:24:12.415823801 +0200
 @@ -2,10 +2,10 @@
  
  	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -140,9 +238,9 @@ diff -ur zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.25/src/za
  			<minIndex>1</minIndex>
  			<maxIndex>3</maxIndex>
  		</rollingPolicy>
-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
+diff -ur zabbix-6.0.30.orig/src/zabbix_java/settings.sh zabbix-6.0.30/src/zabbix_java/settings.sh
+--- zabbix-6.0.30.orig/src/zabbix_java/settings.sh	2024-05-20 12:30:20.000000000 +0200
++++ zabbix-6.0.30/src/zabbix_java/settings.sh	2024-06-13 13:24:12.415823801 +0200
 @@ -24,7 +24,7 @@
  # Default:
  # PID_FILE=
@@ -152,10 +250,10 @@ diff -ur zabbix-6.0.25.orig/src/zabbix_java/settings.sh zabbix-6.0.25/src/zabbix
  
  ### Option: zabbix.startPollers
  #	Number of worker threads to start.
-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 @@
+diff -ur zabbix-6.0.30.orig/src/zabbix_proxy/proxy.c zabbix-6.0.30/src/zabbix_proxy/proxy.c
+--- zabbix-6.0.30.orig/src/zabbix_proxy/proxy.c	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/zabbix_proxy/proxy.c	2024-06-13 13:24:12.415823801 +0200
+@@ -522,7 +522,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-6.0.25.orig/src/zabbix_proxy/proxy.c zabbix-6.0.25/src/zabbix_pr
  
  	if (NULL == CONFIG_TMPDIR)
  		CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
-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 @@
+diff -ur zabbix-6.0.30.orig/src/zabbix_server/server.c zabbix-6.0.30/src/zabbix_server/server.c
+--- zabbix-6.0.30.orig/src/zabbix_server/server.c	2024-05-21 08:57:56.000000000 +0200
++++ zabbix-6.0.30/src/zabbix_server/server.c	2024-06-13 13:24:12.415823801 +0200
+@@ -585,7 +585,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-6.0.25.orig/src/zabbix_server/server.c zabbix-6.0.25/src/zabbix_
  
  	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.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
+diff -ur zabbix-6.0.30.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.30/ui/include/classes/core/CConfigFile.php
+--- zabbix-6.0.30.orig/ui/include/classes/core/CConfigFile.php	2024-05-21 08:57:57.000000000 +0200
++++ zabbix-6.0.30/ui/include/classes/core/CConfigFile.php	2024-06-13 13:24:12.415823801 +0200
 @@ -25,7 +25,7 @@
  	const CONFIG_ERROR = 2;
  	const CONFIG_VAULT_ERROR = 3;
@@ -188,9 +286,9 @@ diff -ur zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.2
  
  	private static $supported_db_types = [
  		ZBX_DB_MYSQL => true,
-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
+diff -ur zabbix-6.0.30.orig/ui/include/classes/core/ZBase.php zabbix-6.0.30/ui/include/classes/core/ZBase.php
+--- zabbix-6.0.30.orig/ui/include/classes/core/ZBase.php	2024-05-21 08:57:57.000000000 +0200
++++ zabbix-6.0.30/ui/include/classes/core/ZBase.php	2024-06-13 13:24:12.419823858 +0200
 @@ -380,7 +380,7 @@
  	 * @throws Exception
  	 */
@@ -209,10 +307,10 @@ diff -ur zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php zabbix-6.0.25/ui/i
  		$config = new CConfigFile($configFile);
  		$this->config = $config->load();
  	}
-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 @@
+diff -ur zabbix-6.0.30.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.30/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-6.0.30.orig/ui/include/classes/setup/CSetupWizard.php	2024-05-21 08:57:57.000000000 +0200
++++ zabbix-6.0.30/ui/include/classes/setup/CSetupWizard.php	2024-06-13 13:24:12.419823858 +0200
+@@ -273,7 +273,7 @@
  				// make zabbix.conf.php downloadable
  				header('Content-Type: application/x-httpd-php');
  				header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');
@@ -221,7 +319,7 @@ diff -ur zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0
  				$config->config = [
  					'DB' => [
  						'TYPE' => $this->getConfig('DB_TYPE'),
-@@ -821,7 +821,7 @@
+@@ -825,7 +825,7 @@
  
  		$this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);