From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 16 Aug 2024 20:49:30 +0000 (+0200)
Subject: - updated to 6.0.33
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f65b40fa31bf1ed5ed4e6adfc2b1c58cb050af87;p=packages%2Fzabbix.git
- updated to 6.0.33
---
diff --git a/agent2.patch b/agent2.patch
index b9dac1e..bf67519 100644
--- a/agent2.patch
+++ b/agent2.patch
@@ -1,7 +1,7 @@
-diff -ur zabbix-6.0.28.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go zabbix-6.0.28/src/go/cmd/zabbix_agent2/zabbix_agent2.go
---- zabbix-6.0.28.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2024-04-04 17:12:19.513414181 +0200
-+++ zabbix-6.0.28/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2024-04-04 17:28:27.146405319 +0200
-@@ -646,7 +646,7 @@
+diff -ur zabbix-6.0.33.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go zabbix-6.0.33/src/go/cmd/zabbix_agent2/zabbix_agent2.go
+--- zabbix-6.0.33.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2024-08-16 22:41:12.270404367 +0200
++++ zabbix-6.0.33/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2024-08-16 22:41:24.782633257 +0200
+@@ -645,7 +645,7 @@
Shorthand: "f",
Description: "Run Zabbix agent in foreground",
},
diff --git a/always_compile_ipc.patch b/always_compile_ipc.patch
index 1a67d36..456111b 100644
--- a/always_compile_ipc.patch
+++ b/always_compile_ipc.patch
@@ -1,7 +1,7 @@
-diff -ur zabbix-6.0.30.orig/configure.ac zabbix-6.0.30/configure.ac
---- zabbix-6.0.30.orig/configure.ac 2024-06-13 13:33:23.551609990 +0200
-+++ zabbix-6.0.30/configure.ac 2024-06-13 13:33:36.243788954 +0200
-@@ -1541,7 +1541,7 @@
+diff -ur zabbix-6.0.33.orig/configure.ac zabbix-6.0.33/configure.ac
+--- zabbix-6.0.33.orig/configure.ac 2024-08-16 22:40:40.081815563 +0200
++++ zabbix-6.0.33/configure.ac 2024-08-16 22:40:54.118072316 +0200
+@@ -1542,7 +1542,7 @@
AM_CONDITIONAL(HAVE_SSH2, [test "x$have_ssh" = "xyes (libssh2)"])
dnl Check if Zabbix internal IPC services are used
diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 9091f59..b29ae73 100644
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -1,6 +1,6 @@
-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-06-13 13:32:41.691019740 +0200
-+++ zabbix-6.0.30/conf/zabbix_proxy.conf 2024-06-13 13:32:53.907191988 +0200
+diff -ur zabbix-6.0.33.orig/conf/zabbix_proxy.conf zabbix-6.0.33/conf/zabbix_proxy.conf
+--- zabbix-6.0.33.orig/conf/zabbix_proxy.conf 2024-08-16 22:29:35.641660778 +0200
++++ zabbix-6.0.33/conf/zabbix_proxy.conf 2024-08-16 22:29:51.057943061 +0200
@@ -153,6 +153,7 @@
### Option: DBName
# Database name.
@@ -9,10 +9,11 @@ diff -ur zabbix-6.0.30.orig/conf/zabbix_proxy.conf zabbix-6.0.30/conf/zabbix_pro
# If the Net Service Name connection method is used to connect to Oracle database, specify the service name from
# the tnsnames.ora file or set to empty string; also see the TWO_TASK environment variable if DBName is set to
# empty string.
-diff -ur zabbix-6.0.30.orig/src/libs/zbxdb/db.c zabbix-6.0.30/src/libs/zbxdb/db.c
---- zabbix-6.0.30.orig/src/libs/zbxdb/db.c 2024-06-13 13:32:41.727020248 +0200
-+++ zabbix-6.0.30/src/libs/zbxdb/db.c 2024-06-13 13:32:54.235196614 +0200
-@@ -439,6 +439,7 @@
+Only in zabbix-6.0.33/conf: zabbix_proxy.conf.rej
+diff -ur zabbix-6.0.33.orig/src/libs/zbxdb/db.c zabbix-6.0.33/src/libs/zbxdb/db.c
+--- zabbix-6.0.33.orig/src/libs/zbxdb/db.c 2024-08-16 22:29:35.765663048 +0200
++++ zabbix-6.0.33/src/libs/zbxdb/db.c 2024-08-16 22:39:37.540671497 +0200
+@@ -444,6 +444,7 @@
unsigned int i = 0;
#elif defined(HAVE_SQLITE3)
char *p, *path = NULL;
@@ -20,10 +21,10 @@ diff -ur zabbix-6.0.30.orig/src/libs/zbxdb/db.c zabbix-6.0.30/src/libs/zbxdb/db.
#endif
#ifndef HAVE_MYSQL
-@@ -878,6 +879,10 @@
- ZBX_UNUSED(ca);
+@@ -888,6 +889,10 @@
ZBX_UNUSED(cipher);
ZBX_UNUSED(cipher_13);
+ ZBX_UNUSED(read_only_recoverable);
+ if (!strchr(dbname, '/') && !strchr(dbname, ':')) {
+ zbx_snprintf(dbname_buf, sizeof(dbname_buf), "/var/lib/zabbix/%s.db", dbname);
+ dbname = dbname_buf;
diff --git a/tld.patch b/tld.patch
index 8c297c1..19571ce 100644
--- a/tld.patch
+++ b/tld.patch
@@ -1,6 +1,6 @@
-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
+diff -ur zabbix-6.0.33.orig/conf/zabbix_agentd.conf zabbix-6.0.33/conf/zabbix_agentd.conf
+--- zabbix-6.0.33.orig/conf/zabbix_agentd.conf 2024-08-16 22:28:36.880584826 +0200
++++ zabbix-6.0.33/conf/zabbix_agentd.conf 2024-08-16 22:28:57.060954342 +0200
@@ -8,7 +8,7 @@
#
# Mandatory: no
@@ -36,9 +36,9 @@ diff -ur zabbix-6.0.30.orig/conf/zabbix_agentd.conf zabbix-6.0.30/conf/zabbix_ag
####### USER-DEFINED MONITORED PARAMETERS #######
-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
+diff -ur zabbix-6.0.33.orig/conf/zabbix_proxy.conf zabbix-6.0.33/conf/zabbix_proxy.conf
+--- zabbix-6.0.33.orig/conf/zabbix_proxy.conf 2024-08-16 22:28:36.880584826 +0200
++++ zabbix-6.0.33/conf/zabbix_proxy.conf 2024-08-16 22:28:57.064954415 +0200
@@ -81,7 +81,7 @@
# Default:
# LogFile=
@@ -74,9 +74,9 @@ diff -ur zabbix-6.0.30.orig/conf/zabbix_proxy.conf zabbix-6.0.30/conf/zabbix_pro
### Option: SSLCertLocation
# Location of SSL client certificates.
-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
+diff -ur zabbix-6.0.33.orig/conf/zabbix_server.conf zabbix-6.0.33/conf/zabbix_server.conf
+--- zabbix-6.0.33.orig/conf/zabbix_server.conf 2024-08-16 22:28:36.880584826 +0200
++++ zabbix-6.0.33/conf/zabbix_server.conf 2024-08-16 22:28:57.064954415 +0200
@@ -35,7 +35,7 @@
# Default:
# LogFile=
@@ -112,9 +112,9 @@ diff -ur zabbix-6.0.30.orig/conf/zabbix_server.conf zabbix-6.0.30/conf/zabbix_se
### Option: SSLCertLocation
# Location of SSL client certificates.
-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
+diff -ur zabbix-6.0.33.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.33/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-6.0.33.orig/src/go/cmd/zabbix_web_service/config.go 2024-08-16 22:28:37.140589587 +0200
++++ zabbix-6.0.33/src/go/cmd/zabbix_web_service/config.go 2024-08-16 22:28:57.064954415 +0200
@@ -25,7 +25,7 @@
ListenPort string `conf:"optional,range=1024:32767,default=10053"`
AllowedIP string `conf:"optional"`
@@ -124,9 +124,9 @@ diff -ur zabbix-6.0.30.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.3
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
+diff -ur zabbix-6.0.33.orig/src/go/conf/mock_server.conf zabbix-6.0.33/src/go/conf/mock_server.conf
+--- zabbix-6.0.33.orig/src/go/conf/mock_server.conf 2024-08-16 22:28:37.156589880 +0200
++++ zabbix-6.0.33/src/go/conf/mock_server.conf 2024-08-16 22:28:57.064954415 +0200
@@ -18,7 +18,7 @@
# Default:
# LogFile=
@@ -136,9 +136,9 @@ diff -ur zabbix-6.0.30.orig/src/go/conf/mock_server.conf zabbix-6.0.30/src/go/co
### 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
+diff -ur zabbix-6.0.33.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.33/src/go/conf/zabbix_agent2.conf
+--- zabbix-6.0.33.orig/src/go/conf/zabbix_agent2.conf 2024-08-16 22:28:37.156589880 +0200
++++ zabbix-6.0.33/src/go/conf/zabbix_agent2.conf 2024-08-16 22:28:57.064954415 +0200
@@ -8,7 +8,7 @@
#
# Mandatory: no
@@ -174,9 +174,9 @@ diff -ur zabbix-6.0.30.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.30/src/go/
# 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
+diff -ur zabbix-6.0.33.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.33/src/go/conf/zabbix_web_service.conf
+--- zabbix-6.0.33.orig/src/go/conf/zabbix_web_service.conf 2024-08-16 22:28:37.156589880 +0200
++++ zabbix-6.0.33/src/go/conf/zabbix_web_service.conf 2024-08-16 22:28:57.064954415 +0200
@@ -18,7 +18,7 @@
#
# Mandatory: yes, if LogType is set to file, otherwise no
@@ -186,9 +186,9 @@ diff -ur zabbix-6.0.30.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.30/sr
### 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
+diff -ur zabbix-6.0.33.orig/src/go/internal/agent/options_nix.go zabbix-6.0.33/src/go/internal/agent/options_nix.go
+--- zabbix-6.0.33.orig/src/go/internal/agent/options_nix.go 2024-08-16 22:28:37.040587756 +0200
++++ zabbix-6.0.33/src/go/internal/agent/options_nix.go 2024-08-16 22:28:57.064954415 +0200
@@ -24,7 +24,7 @@
type AgentOptions struct {
@@ -198,9 +198,9 @@ diff -ur zabbix-6.0.30.orig/src/go/internal/agent/options_nix.go zabbix-6.0.30/s
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
+diff -ur zabbix-6.0.33.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.33/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-6.0.33.orig/src/go/pkg/pidfile/pidfile_nix.go 2024-08-16 22:28:37.140589587 +0200
++++ zabbix-6.0.33/src/go/pkg/pidfile/pidfile_nix.go 2024-08-16 22:28:57.064954415 +0200
@@ -31,7 +31,7 @@
func createPidFile(pid int, path string) (file *os.File, err error) {
@@ -210,9 +210,9 @@ diff -ur zabbix-6.0.30.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.30/src/
}
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
+diff -ur zabbix-6.0.33.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.33/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-6.0.33.orig/src/zabbix_agent/zabbix_agentd.c 2024-08-16 22:28:37.036587683 +0200
++++ zabbix-6.0.33/src/zabbix_agent/zabbix_agentd.c 2024-08-16 22:28:57.064954415 +0200
@@ -609,7 +609,7 @@
CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, DEFAULT_LOAD_MODULE_PATH);
@@ -222,9 +222,9 @@ diff -ur zabbix-6.0.30.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.30/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.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
+diff -ur zabbix-6.0.33.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.33/src/zabbix_java/lib/logback.xml
+--- zabbix-6.0.33.orig/src/zabbix_java/lib/logback.xml 2024-08-16 22:28:36.988586803 +0200
++++ zabbix-6.0.33/src/zabbix_java/lib/logback.xml 2024-08-16 22:28:57.064954415 +0200
@@ -2,10 +2,10 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -238,9 +238,9 @@ diff -ur zabbix-6.0.30.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.30/src/za
<minIndex>1</minIndex>
<maxIndex>3</maxIndex>
</rollingPolicy>
-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
+diff -ur zabbix-6.0.33.orig/src/zabbix_java/settings.sh zabbix-6.0.33/src/zabbix_java/settings.sh
+--- zabbix-6.0.33.orig/src/zabbix_java/settings.sh 2024-08-16 22:28:36.992586877 +0200
++++ zabbix-6.0.33/src/zabbix_java/settings.sh 2024-08-16 22:28:57.064954415 +0200
@@ -24,7 +24,7 @@
# Default:
# PID_FILE=
@@ -250,10 +250,10 @@ diff -ur zabbix-6.0.30.orig/src/zabbix_java/settings.sh zabbix-6.0.30/src/zabbix
### Option: zabbix.startPollers
# Number of worker threads to start.
-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 @@
+diff -ur zabbix-6.0.33.orig/src/zabbix_proxy/proxy.c zabbix-6.0.33/src/zabbix_proxy/proxy.c
+--- zabbix-6.0.33.orig/src/zabbix_proxy/proxy.c 2024-08-16 22:28:37.036587683 +0200
++++ zabbix-6.0.33/src/zabbix_proxy/proxy.c 2024-08-16 22:28:57.064954415 +0200
+@@ -524,7 +524,7 @@
CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
if (NULL == CONFIG_PID_FILE)
@@ -262,10 +262,10 @@ diff -ur zabbix-6.0.30.orig/src/zabbix_proxy/proxy.c zabbix-6.0.30/src/zabbix_pr
if (NULL == CONFIG_TMPDIR)
CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
-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 @@
+diff -ur zabbix-6.0.33.orig/src/zabbix_server/server.c zabbix-6.0.33/src/zabbix_server/server.c
+--- zabbix-6.0.33.orig/src/zabbix_server/server.c 2024-08-16 22:28:37.028587536 +0200
++++ zabbix-6.0.33/src/zabbix_server/server.c 2024-08-16 22:28:57.064954415 +0200
+@@ -589,7 +589,7 @@
CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
if (NULL == CONFIG_PID_FILE)
@@ -274,9 +274,9 @@ diff -ur zabbix-6.0.30.orig/src/zabbix_server/server.c zabbix-6.0.30/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.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
+diff -ur zabbix-6.0.33.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.33/ui/include/classes/core/CConfigFile.php
+--- zabbix-6.0.33.orig/ui/include/classes/core/CConfigFile.php 2024-08-16 22:28:36.816583654 +0200
++++ zabbix-6.0.33/ui/include/classes/core/CConfigFile.php 2024-08-16 22:28:57.064954415 +0200
@@ -25,7 +25,7 @@
const CONFIG_ERROR = 2;
const CONFIG_VAULT_ERROR = 3;
@@ -286,9 +286,9 @@ diff -ur zabbix-6.0.30.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.3
private static $supported_db_types = [
ZBX_DB_MYSQL => true,
-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
+diff -ur zabbix-6.0.33.orig/ui/include/classes/core/ZBase.php zabbix-6.0.33/ui/include/classes/core/ZBase.php
+--- zabbix-6.0.33.orig/ui/include/classes/core/ZBase.php 2024-08-16 22:28:36.816583654 +0200
++++ zabbix-6.0.33/ui/include/classes/core/ZBase.php 2024-08-16 22:28:57.064954415 +0200
@@ -380,7 +380,7 @@
* @throws Exception
*/
@@ -307,9 +307,9 @@ diff -ur zabbix-6.0.30.orig/ui/include/classes/core/ZBase.php zabbix-6.0.30/ui/i
$config = new CConfigFile($configFile);
$this->config = $config->load();
}
-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
+diff -ur zabbix-6.0.33.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.33/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-6.0.33.orig/ui/include/classes/setup/CSetupWizard.php 2024-08-16 22:28:36.792583215 +0200
++++ zabbix-6.0.33/ui/include/classes/setup/CSetupWizard.php 2024-08-16 22:28:57.064954415 +0200
@@ -273,7 +273,7 @@
// make zabbix.conf.php downloadable
header('Content-Type: application/x-httpd-php');
diff --git a/zabbix.spec b/zabbix.spec
index c5a468b..c313785 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -24,12 +24,12 @@
Summary: Zabbix - network monitoring software
Summary(pl.UTF-8): Zabbix - oprogramowanie do monitorowania sieci
Name: zabbix
-Version: 6.0.31
+Version: 6.0.33
Release: 1
License: GPL v2+
Group: Networking/Utilities
Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz
-# Source0-md5: f04833c9954a0aa97f51b3f859aa09e1
+# Source0-md5: 100fd4ef73de6918e65ea71166658521
Source1: %{name}-apache.conf
Source2: %{name}_agentd.init
Source3: %{name}_server.init