]> 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
- updated to 6.0.25
[packages/zabbix.git] / tld.patch
diff --git a/tld.patch b/tld.patch
index 262093f9880b9b4394b56f5b4a895755ea7424d0..663fcd7e1c32f112b142cd1508e4eb8162452e9a 100644 (file)
--- a/tld.patch
+++ b/tld.patch
@@ -1,6 +1,6 @@
-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
+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-6.0.2.orig/conf/zabbix_agentd.conf zabbix-6.0.2/conf/zabbix_agen
  
  ### Option: LogFileSize
  #     Maximum size of log file in MB.
-@@ -302,15 +302,12 @@
+@@ -309,15 +309,12 @@
  
  ### Option: Include
  #     You may include individual files or all files in a directory in the configuration file.
@@ -36,9 +36,9 @@ diff -ur zabbix-6.0.2.orig/conf/zabbix_agentd.conf zabbix-6.0.2/conf/zabbix_agen
  
  ####### USER-DEFINED MONITORED PARAMETERS #######
  
-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
+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=
@@ -74,9 +74,9 @@ diff -ur zabbix-6.0.2.orig/conf/zabbix_proxy.conf zabbix-6.0.2/conf/zabbix_proxy
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-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
+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=
@@ -112,10 +112,10 @@ diff -ur zabbix-6.0.2.orig/conf/zabbix_server.conf zabbix-6.0.2/conf/zabbix_serv
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-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 @@
+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-6.0.2.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.2/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-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
+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 @@
  
        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -140,9 +140,9 @@ diff -ur zabbix-6.0.2.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.2/src/zabb
                        <minIndex>1</minIndex>
                        <maxIndex>3</maxIndex>
                </rollingPolicy>
-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
+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-6.0.2.orig/src/zabbix_java/settings.sh zabbix-6.0.2/src/zabbix_j
  
  ### Option: zabbix.startPollers
  #     Number of worker threads to start.
-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 @@
+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-6.0.2.orig/src/zabbix_proxy/proxy.c zabbix-6.0.2/src/zabbix_prox
  
        if (NULL == CONFIG_TMPDIR)
                CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
-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 @@
+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,9 +176,9 @@ diff -ur zabbix-6.0.2.orig/src/zabbix_server/server.c zabbix-6.0.2/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
+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;
@@ -188,10 +188,10 @@ diff -ur zabbix-6.0.2.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.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 @@
+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-6.0.2.orig/ui/include/classes/core/ZBase.php zabbix-6.0.2/ui/inc
  
                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 @@
+@@ -393,7 +393,7 @@
         * Load zabbix config file.
         */
        protected function loadConfigFile() {
@@ -209,9 +209,9 @@ diff -ur zabbix-6.0.2.orig/ui/include/classes/core/ZBase.php zabbix-6.0.2/ui/inc
                $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
+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');
Zabbix - network monitoring software