From 96ef8ffbef5ee8a1c610fabea058c6accd925618 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 10 Jan 2024 23:01:40 +0100 Subject: [PATCH] - updated to 6.0.25 --- agent2.patch | 8 ++--- always_compile_ipc.patch | 10 +++--- go.patch | 12 +++---- sqlite3_dbname.patch | 16 ++++----- tld.patch | 78 ++++++++++++++++++++-------------------- zabbix.spec | 4 +-- 6 files changed, 64 insertions(+), 64 deletions(-) diff --git a/agent2.patch b/agent2.patch index e29ab11..de497dd 100644 --- a/agent2.patch +++ b/agent2.patch @@ -1,7 +1,7 @@ -diff -ur zabbix-6.0.19.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go zabbix-6.0.19/src/go/cmd/zabbix_agent2/zabbix_agent2.go ---- zabbix-6.0.19.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2023-06-27 09:11:01.000000000 +0200 -+++ zabbix-6.0.19/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2023-07-20 14:41:48.877278056 +0200 -@@ -220,7 +220,7 @@ +diff -ur zabbix-6.0.25.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go zabbix-6.0.25/src/go/cmd/zabbix_agent2/zabbix_agent2.go +--- zabbix-6.0.25.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2024-01-10 22:41:47.019454142 +0100 ++++ zabbix-6.0.25/src/go/cmd/zabbix_agent2/zabbix_agent2.go 2024-01-10 22:42:09.871740595 +0100 +@@ -230,7 +230,7 @@ var foregroundFlag bool const ( diff --git a/always_compile_ipc.patch b/always_compile_ipc.patch index 64773dc..f03e46b 100644 --- a/always_compile_ipc.patch +++ b/always_compile_ipc.patch @@ -1,8 +1,8 @@ -diff -ur zabbix-6.0.2.orig/configure.ac zabbix-6.0.2/configure.ac ---- zabbix-6.0.2.orig/configure.ac 2022-03-24 18:49:21.146483364 +0100 -+++ zabbix-6.0.2/configure.ac 2022-03-24 18:49:30.113504119 +0100 -@@ -1685,7 +1685,7 @@ - AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes") +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 @@ + AM_CONDITIONAL(HAVE_SSH2, [test "x$have_ssh" = "xyes (libssh2)"]) dnl Check if Zabbix internal IPC services are used -have_ipcservice="no" diff --git a/go.patch b/go.patch index 043a804..8114b3c 100644 --- a/go.patch +++ b/go.patch @@ -1,6 +1,6 @@ -diff -ur zabbix-6.0.19.orig/src/go/Makefile.am zabbix-6.0.19/src/go/Makefile.am ---- zabbix-6.0.19.orig/src/go/Makefile.am 2023-06-27 09:11:01.000000000 +0200 -+++ zabbix-6.0.19/src/go/Makefile.am 2023-07-20 16:29:58.932599626 +0200 +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 @@ -49,10 +49,10 @@ all: build @@ -14,8 +14,8 @@ diff -ur zabbix-6.0.19.orig/src/go/Makefile.am zabbix-6.0.19/src/go/Makefile.am build: ${TARGETS} -@@ -61,8 +61,8 @@ - rm -f bin/zabbix_agent2 bin/mock_server +@@ -73,8 +73,8 @@ + -rm -f sbom-zws.xml install-zabbix.com/cmd/zabbix_agent2: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ @@ -25,7 +25,7 @@ diff -ur zabbix-6.0.19.orig/src/go/Makefile.am zabbix-6.0.19/src/go/Makefile.am $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \ -@@ -71,7 +71,7 @@ +@@ -83,7 +83,7 @@ done install-zabbix.com/cmd/zabbix_web_service: diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch index 7129df8..a7eae77 100644 --- a/sqlite3_dbname.patch +++ b/sqlite3_dbname.patch @@ -1,6 +1,6 @@ -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-24 18:48:25.803355270 +0100 -+++ zabbix-6.0.2/conf/zabbix_proxy.conf 2022-03-24 18:48:53.037418309 +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 2024-01-10 22:40:29.918487677 +0100 ++++ zabbix-6.0.25/conf/zabbix_proxy.conf 2024-01-10 22:40:47.909713197 +0100 @@ -153,6 +153,7 @@ ### Option: DBName # Database name. @@ -9,10 +9,10 @@ diff -ur zabbix-6.0.2.orig/conf/zabbix_proxy.conf zabbix-6.0.2/conf/zabbix_proxy # 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.2.orig/src/libs/zbxdb/db.c zabbix-6.0.2/src/libs/zbxdb/db.c ---- zabbix-6.0.2.orig/src/libs/zbxdb/db.c 2022-03-24 18:48:25.580354753 +0100 -+++ zabbix-6.0.2/src/libs/zbxdb/db.c 2022-03-24 18:48:53.037418309 +0100 -@@ -402,6 +402,7 @@ +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 @@ unsigned int i = 0; #elif defined(HAVE_SQLITE3) char *p, *path = NULL; @@ -20,7 +20,7 @@ diff -ur zabbix-6.0.2.orig/src/libs/zbxdb/db.c zabbix-6.0.2/src/libs/zbxdb/db.c #endif #ifndef HAVE_MYSQL -@@ -851,6 +852,10 @@ +@@ -878,6 +879,10 @@ ZBX_UNUSED(ca); ZBX_UNUSED(cipher); ZBX_UNUSED(cipher_13); diff --git a/tld.patch b/tld.patch index 262093f..663fcd7 100644 --- 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 @@ @@ -140,9 +140,9 @@ diff -ur zabbix-6.0.2.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.2/src/zabb 1 3 -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'); diff --git a/zabbix.spec b/zabbix.spec index 181c106..1adc9a5 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.19 +Version: 6.0.25 Release: 1 License: GPL v2+ Group: Networking/Utilities Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/%{name}-%{version}.tar.gz -# Source0-md5: a57192d6bb17f9ca80a75f87d5462987 +# Source0-md5: 510cb7207048414b71b4fecc9aa50b6b Source1: %{name}-apache.conf Source2: %{name}_agentd.init Source3: %{name}_server.init -- 2.46.0