X-Git-Url: https://git.tld-linux.org/?p=packages%2Fzabbix.git;a=blobdiff_plain;f=tld.patch;h=af7b49309f8fbc146ab4ba5dce4eaa8de271b891;hp=c5546edfbc224ef1ab4396cdef21fee52e83eaad;hb=ccc85b787e14f0dc9552636a6afae5bceb0158c0;hpb=541afd18973d389af9bf60b37298a247b64abee8

diff --git a/tld.patch b/tld.patch
index c5546ed..af7b493 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-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
 @@ -8,7 +8,7 @@
  #
  # Mandatory: no
@@ -36,9 +36,9 @@ 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
+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 @@
  # Default:
  # LogFile=
@@ -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 @@
+@@ -595,15 +595,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-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
 @@ -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 @@
+@@ -645,15 +645,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-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 @@
  		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-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
 @@ -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-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
 @@ -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-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 @@
  		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-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 @@
  		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-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
+@@ -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-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 @@
  	 * @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 @@
+@@ -386,7 +386,7 @@
  	 * Load zabbix config file.
  	 */
  	protected function loadConfigFile() {
@@ -209,11 +209,11 @@ 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 {
+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;
@@ -221,7 +221,7 @@ diff -ur zabbix-5.0.7.orig/ui/include/classes/setup/CSetupWizard.php zabbix-5.0.
  		$config = new CConfigFile($config_file_name);
  		$config->config = [
  			'DB' => [
-@@ -682,7 +682,7 @@
+@@ -970,7 +970,7 @@
  				// make zabbix.conf.php downloadable
  				header('Content-Type: application/x-httpd-php');
  				header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');