From 52cee109ffe4e4aa9f5816dbcacf6cdbf52e27db Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 10 Jun 2024 00:32:51 +0200 Subject: [PATCH] - updated to 6.0.30 --- always_compile_ipc.patch | 8 +-- go.patch | 26 ++++----- sqlite3_dbname.patch | 14 ++--- tld.patch | 112 +++++++++++++++++++-------------------- zabbix.spec | 4 +- 5 files changed, 82 insertions(+), 82 deletions(-) diff --git a/always_compile_ipc.patch b/always_compile_ipc.patch index f03e46b..1a67d36 100644 --- a/always_compile_ipc.patch +++ b/always_compile_ipc.patch @@ -1,7 +1,7 @@ -diff -ur zabbix-6.0.25.orig/configure.ac zabbix-6.0.25/configure.ac ---- zabbix-6.0.25.orig/configure.ac 2024-01-10 22:41:08.948976927 +0100 -+++ zabbix-6.0.25/configure.ac 2024-01-10 22:41:22.992152959 +0100 -@@ -1542,7 +1542,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 @@ AM_CONDITIONAL(HAVE_SSH2, [test "x$have_ssh" = "xyes (libssh2)"]) dnl Check if Zabbix internal IPC services are used diff --git a/go.patch b/go.patch index 8114b3c..7bd7477 100644 --- a/go.patch +++ b/go.patch @@ -1,23 +1,23 @@ -diff -ur zabbix-6.0.25.orig/src/go/Makefile.am zabbix-6.0.25/src/go/Makefile.am ---- zabbix-6.0.25.orig/src/go/Makefile.am 2024-01-10 22:42:34.543049852 +0100 -+++ zabbix-6.0.25/src/go/Makefile.am 2024-01-10 22:42:40.817128498 +0100 +diff -ur zabbix-6.0.30.orig/src/go/Makefile.am zabbix-6.0.30/src/go/Makefile.am +--- zabbix-6.0.30.orig/src/go/Makefile.am 2024-06-13 13:35:04.929039431 +0200 ++++ zabbix-6.0.30/src/go/Makefile.am 2024-06-13 14:02:09.087986478 +0200 @@ -49,10 +49,10 @@ all: build - zabbix.com/cmd/zabbix_agent2: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -mod=vendor -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_agent2 + golang.zabbix.com/agent2/cmd/zabbix_agent2: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_agent2 ++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -mod=vendor -tags="${AGENT_GOTAGS}" -ldflags="${AGENT_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_agent2 - zabbix.com/cmd/zabbix_web_service: -- go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service -+ go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin zabbix.com/cmd/zabbix_web_service + golang.zabbix.com/agent2/cmd/zabbix_web_service: +- go build -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_web_service ++ go build -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" -o bin golang.zabbix.com/agent2/cmd/zabbix_web_service build: ${TARGETS} @@ -73,8 +73,8 @@ -rm -f sbom-zws.xml - install-zabbix.com/cmd/zabbix_agent2: + install-golang.zabbix.com/agent2/cmd/zabbix_agent2: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} + CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${DESTDIR}${GOBIN} \ @@ -28,9 +28,9 @@ diff -ur zabbix-6.0.25.orig/src/go/Makefile.am zabbix-6.0.25/src/go/Makefile.am @@ -83,7 +83,7 @@ done - install-zabbix.com/cmd/zabbix_web_service: -- GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service -+ GOBIN=${DESTDIR}${GOBIN} go install -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service + install-golang.zabbix.com/agent2/cmd/zabbix_web_service: +- GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service ++ GOBIN=${DESTDIR}${GOBIN} go install -mod=vendor -ldflags="${WEBSERVICE_GOLDFLAGS}" golang.zabbix.com/agent2/cmd/zabbix_web_service install-exec-local: ${INSTALL_TARGETS} diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch index a7eae77..9091f59 100644 --- a/sqlite3_dbname.patch +++ b/sqlite3_dbname.patch @@ -1,6 +1,6 @@ -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 2024-01-10 22:40:29.918487677 +0100 -+++ zabbix-6.0.25/conf/zabbix_proxy.conf 2024-01-10 22:40:47.909713197 +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-06-13 13:32:41.691019740 +0200 ++++ zabbix-6.0.30/conf/zabbix_proxy.conf 2024-06-13 13:32:53.907191988 +0200 @@ -153,6 +153,7 @@ ### Option: DBName # Database name. @@ -9,10 +9,10 @@ diff -ur zabbix-6.0.25.orig/conf/zabbix_proxy.conf zabbix-6.0.25/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.25.orig/src/libs/zbxdb/db.c zabbix-6.0.25/src/libs/zbxdb/db.c ---- zabbix-6.0.25.orig/src/libs/zbxdb/db.c 2024-01-10 22:40:29.956488153 +0100 -+++ zabbix-6.0.25/src/libs/zbxdb/db.c 2024-01-10 22:40:47.909713197 +0100 -@@ -419,6 +419,7 @@ +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 @@ unsigned int i = 0; #elif defined(HAVE_SQLITE3) char *p, *path = NULL; diff --git a/tld.patch b/tld.patch index 22f8dd9..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-11 00:18:54.065715198 +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-11 00:18:54.065715198 +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-11 00:18:54.065715198 +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,9 +112,9 @@ 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/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 +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"` @@ -124,9 +124,9 @@ diff -ur zabbix-6.0.25.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.2 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 +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= @@ -136,9 +136,9 @@ diff -ur zabbix-6.0.25.orig/src/go/conf/mock_server.conf zabbix-6.0.25/src/go/co ### 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 +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 @@ -174,9 +174,9 @@ diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.25/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.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 +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 @@ -186,9 +186,9 @@ diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.25/sr ### 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 +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 { @@ -198,9 +198,9 @@ diff -ur zabbix-6.0.25.orig/src/go/internal/agent/options_nix.go zabbix-6.0.25/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.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 +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) { @@ -210,10 +210,10 @@ diff -ur zabbix-6.0.25.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.25/src/ } 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 @@ +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) @@ -222,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-11 00:18:54.066715211 +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 @@ @@ -238,9 +238,9 @@ diff -ur zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.25/src/za 1 3 -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 +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= @@ -250,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-11 00:18:54.067715224 +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) @@ -262,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-11 00:18:54.067715224 +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) @@ -274,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-11 00:18:54.067715224 +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; @@ -286,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-11 00:18:54.139716136 +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 */ @@ -307,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-11 00:18:54.139716136 +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).'"'); @@ -319,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); diff --git a/zabbix.spec b/zabbix.spec index 2f4fe8c..b044a85 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.29 +Version: 6.0.30 Release: 1 License: GPL v2+ Group: Networking/Utilities Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz -# Source0-md5: 73314d5d61722baf9236a4755f07a100 +# Source0-md5: 7f553e63c07f330996ad06ea87ea2f38 Source1: %{name}-apache.conf Source2: %{name}_agentd.init Source3: %{name}_server.init -- 2.45.1