-diff -ur zabbix-7.0.6.orig/conf/zabbix_proxy.conf zabbix-7.0.6/conf/zabbix_proxy.conf
---- zabbix-7.0.6.orig/conf/zabbix_proxy.conf 2024-12-10 12:17:18.747601117 +0100
-+++ zabbix-7.0.6/conf/zabbix_proxy.conf 2024-12-10 12:17:42.211871784 +0100
+diff -ur zabbix-7.0.9.orig/conf/zabbix_proxy.conf zabbix-7.0.9/conf/zabbix_proxy.conf
+--- zabbix-7.0.9.orig/conf/zabbix_proxy.conf 2025-02-19 23:20:18.415880580 +0100
++++ zabbix-7.0.9/conf/zabbix_proxy.conf 2025-02-19 23:20:30.804033423 +0100
@@ -155,6 +155,7 @@
### Option: DBName
# Database name.
# 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-7.0.6.orig/src/libs/zbxdb/db.c zabbix-7.0.6/src/libs/zbxdb/db.c
---- zabbix-7.0.6.orig/src/libs/zbxdb/db.c 2024-12-10 12:17:18.787601578 +0100
-+++ zabbix-7.0.6/src/libs/zbxdb/db.c 2024-12-10 12:21:21.482397768 +0100
+diff -ur zabbix-7.0.9.orig/src/libs/zbxdb/db.c zabbix-7.0.9/src/libs/zbxdb/db.c
+--- zabbix-7.0.9.orig/src/libs/zbxdb/db.c 2025-02-19 23:20:18.455881073 +0100
++++ zabbix-7.0.9/src/libs/zbxdb/db.c 2025-02-19 23:22:56.329828919 +0100
@@ -436,7 +436,7 @@
const char *values[ZBX_DB_MAX_PARAMS + 1];
unsigned int i = 0;
#endif
/* Allow executing statements during a connection initialization. Make sure to mark transaction as failed. */
-@@ -851,10 +851,15 @@
+@@ -851,11 +851,16 @@
ZBX_PG_READ_ONLY_RECOVERABLE = cfg->read_only_recoverable;
out:
#elif defined(HAVE_SQLITE3)
+ dbpath = zbx_strdup(NULL, cfg->config_dbname);
+ }
#ifdef HAVE_FUNCTION_SQLITE3_OPEN_V2
-- if (SQLITE_OK != sqlite3_open_v2(cfg->config_dbname, &conn, SQLITE_OPEN_READWRITE, NULL))
-+ if (SQLITE_OK != sqlite3_open_v2(dbpath, &conn, SQLITE_OPEN_READWRITE, NULL))
+- if (SQLITE_OK != sqlite3_open_v2(cfg->config_dbname, &conn, SQLITE_OPEN_READWRITE |
++ if (SQLITE_OK != sqlite3_open_v2(dbpath, &conn, SQLITE_OPEN_READWRITE |
+ SQLITE_OPEN_CREATE, NULL))
#else
- if (SQLITE_OK != sqlite3_open(cfg->config_dbname, &conn))
+ if (SQLITE_OK != sqlite3_open(dbpath, &conn))
#endif
{
zbx_db_errlog(ERR_Z3001, 0, sqlite3_errmsg(conn), cfg->config_dbname);
-@@ -895,6 +900,7 @@
+@@ -896,6 +901,7 @@
zbx_free(path);
out:
-diff -ur zabbix-7.0.6.orig/conf/zabbix_agentd.conf zabbix-7.0.6/conf/zabbix_agentd.conf
---- zabbix-7.0.6.orig/conf/zabbix_agentd.conf 2024-12-10 12:00:50.196197734 +0100
-+++ zabbix-7.0.6/conf/zabbix_agentd.conf 2024-12-10 12:02:03.545043839 +0100
+diff -ur zabbix-7.0.9.orig/conf/zabbix_agentd.conf zabbix-7.0.9/conf/zabbix_agentd.conf
+--- zabbix-7.0.9.orig/conf/zabbix_agentd.conf 2025-02-19 23:19:28.355262931 +0100
++++ zabbix-7.0.9/conf/zabbix_agentd.conf 2025-02-19 23:19:39.667402504 +0100
@@ -8,7 +8,7 @@
#
# Mandatory: no
####### USER-DEFINED MONITORED PARAMETERS #######
-diff -ur zabbix-7.0.6.orig/conf/zabbix_proxy.conf zabbix-7.0.6/conf/zabbix_proxy.conf
---- zabbix-7.0.6.orig/conf/zabbix_proxy.conf 2024-12-10 12:00:50.196197734 +0100
-+++ zabbix-7.0.6/conf/zabbix_proxy.conf 2024-12-10 12:02:03.545043839 +0100
+diff -ur zabbix-7.0.9.orig/conf/zabbix_proxy.conf zabbix-7.0.9/conf/zabbix_proxy.conf
+--- zabbix-7.0.9.orig/conf/zabbix_proxy.conf 2025-02-19 23:19:28.355262931 +0100
++++ zabbix-7.0.9/conf/zabbix_proxy.conf 2025-02-19 23:19:39.723403192 +0100
@@ -81,7 +81,7 @@
# Default:
# LogFile=
### Option: SocketDir
# IPC socket directory.
-@@ -667,15 +667,12 @@
+@@ -669,15 +669,12 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
### Option: SSLCertLocation
# Location of SSL client certificates.
-diff -ur zabbix-7.0.6.orig/conf/zabbix_server.conf zabbix-7.0.6/conf/zabbix_server.conf
---- zabbix-7.0.6.orig/conf/zabbix_server.conf 2024-12-10 12:00:50.196197734 +0100
-+++ zabbix-7.0.6/conf/zabbix_server.conf 2024-12-10 12:02:03.545043839 +0100
+diff -ur zabbix-7.0.9.orig/conf/zabbix_server.conf zabbix-7.0.9/conf/zabbix_server.conf
+--- zabbix-7.0.9.orig/conf/zabbix_server.conf 2025-02-19 23:19:28.355262931 +0100
++++ zabbix-7.0.9/conf/zabbix_server.conf 2025-02-19 23:19:39.723403192 +0100
@@ -35,7 +35,7 @@
# Default:
# LogFile=
### Option: SocketDir
# IPC socket directory.
-@@ -698,15 +698,12 @@
+@@ -701,15 +701,12 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
### Option: SSLCertLocation
# Location of SSL client certificates.
-diff -ur zabbix-7.0.6.orig/src/go/cmd/zabbix_web_service/config.go zabbix-7.0.6/src/go/cmd/zabbix_web_service/config.go
---- zabbix-7.0.6.orig/src/go/cmd/zabbix_web_service/config.go 2024-12-10 12:00:50.420200318 +0100
-+++ zabbix-7.0.6/src/go/cmd/zabbix_web_service/config.go 2024-12-10 12:02:03.545043839 +0100
+diff -ur zabbix-7.0.9.orig/src/go/cmd/zabbix_web_service/config.go zabbix-7.0.9/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-7.0.9.orig/src/go/cmd/zabbix_web_service/config.go 2025-02-19 23:19:28.651266583 +0100
++++ zabbix-7.0.9/src/go/cmd/zabbix_web_service/config.go 2025-02-19 23:19:39.723403192 +0100
@@ -20,7 +20,7 @@
ListenPort string `conf:"optional,range=1024:32767,default=10053"`
AllowedIP string `conf:"optional"`
LogFileSize int `conf:"optional,range=0:1024,default=1"`
Timeout int `conf:"optional,range=1:30,default=10"`
DebugLevel int `conf:"range=0:5,default=3"`
-diff -ur zabbix-7.0.6.orig/src/go/conf/mock_server.conf zabbix-7.0.6/src/go/conf/mock_server.conf
---- zabbix-7.0.6.orig/src/go/conf/mock_server.conf 2024-12-10 12:00:50.436200502 +0100
-+++ zabbix-7.0.6/src/go/conf/mock_server.conf 2024-12-10 12:02:03.545043839 +0100
+diff -ur zabbix-7.0.9.orig/src/go/conf/mock_server.conf zabbix-7.0.9/src/go/conf/mock_server.conf
+--- zabbix-7.0.9.orig/src/go/conf/mock_server.conf 2025-02-19 23:19:28.667266780 +0100
++++ zabbix-7.0.9/src/go/conf/mock_server.conf 2025-02-19 23:19:39.723403192 +0100
@@ -18,7 +18,7 @@
# Default:
# LogFile=
### Option: DebugLevel
# Specifies debug level:
-diff -ur zabbix-7.0.6.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.6/src/go/conf/zabbix_agent2.conf
---- zabbix-7.0.6.orig/src/go/conf/zabbix_agent2.conf 2024-12-10 12:00:50.436200502 +0100
-+++ zabbix-7.0.6/src/go/conf/zabbix_agent2.conf 2024-12-10 12:09:28.638178189 +0100
+diff -ur zabbix-7.0.9.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.9/src/go/conf/zabbix_agent2.conf
+--- zabbix-7.0.9.orig/src/go/conf/zabbix_agent2.conf 2025-02-19 23:19:28.667266780 +0100
++++ zabbix-7.0.9/src/go/conf/zabbix_agent2.conf 2025-02-19 23:19:39.723403192 +0100
@@ -8,7 +8,7 @@
#
# Mandatory: no
####### For advanced users - TLS ciphersuite selection criteria #######
-diff -ur zabbix-7.0.6.orig/src/go/conf/zabbix_web_service.conf zabbix-7.0.6/src/go/conf/zabbix_web_service.conf
---- zabbix-7.0.6.orig/src/go/conf/zabbix_web_service.conf 2024-12-10 12:00:50.436200502 +0100
-+++ zabbix-7.0.6/src/go/conf/zabbix_web_service.conf 2024-12-10 12:02:03.545043839 +0100
+diff -ur zabbix-7.0.9.orig/src/go/conf/zabbix_web_service.conf zabbix-7.0.9/src/go/conf/zabbix_web_service.conf
+--- zabbix-7.0.9.orig/src/go/conf/zabbix_web_service.conf 2025-02-19 23:19:28.667266780 +0100
++++ zabbix-7.0.9/src/go/conf/zabbix_web_service.conf 2025-02-19 23:19:39.723403192 +0100
@@ -18,7 +18,7 @@
#
# Mandatory: yes, if LogType is set to file, otherwise no
### Option: LogFileSize
# Maximum size of log file in MB.
-diff -ur zabbix-7.0.6.orig/src/go/internal/agent/options_nix.go zabbix-7.0.6/src/go/internal/agent/options_nix.go
---- zabbix-7.0.6.orig/src/go/internal/agent/options_nix.go 2024-12-10 12:00:50.276198656 +0100
-+++ zabbix-7.0.6/src/go/internal/agent/options_nix.go 2024-12-10 12:02:03.549043886 +0100
+diff -ur zabbix-7.0.9.orig/src/go/internal/agent/options_nix.go zabbix-7.0.9/src/go/internal/agent/options_nix.go
+--- zabbix-7.0.9.orig/src/go/internal/agent/options_nix.go 2025-02-19 23:19:28.439263968 +0100
++++ zabbix-7.0.9/src/go/internal/agent/options_nix.go 2025-02-19 23:19:39.723403192 +0100
@@ -19,7 +19,7 @@
type AgentOptions struct {
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-7.0.6.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-7.0.6/src/go/pkg/pidfile/pidfile_nix.go
---- zabbix-7.0.6.orig/src/go/pkg/pidfile/pidfile_nix.go 2024-12-10 12:00:50.412200225 +0100
-+++ zabbix-7.0.6/src/go/pkg/pidfile/pidfile_nix.go 2024-12-10 12:02:03.549043886 +0100
+diff -ur zabbix-7.0.9.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-7.0.9/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-7.0.9.orig/src/go/pkg/pidfile/pidfile_nix.go 2025-02-19 23:19:28.647266534 +0100
++++ zabbix-7.0.9/src/go/pkg/pidfile/pidfile_nix.go 2025-02-19 23:19:39.723403192 +0100
@@ -26,7 +26,7 @@
func createPidFile(pid int, path string) (file *os.File, err error) {
}
flockT := syscall.Flock_t{
-diff -ur zabbix-7.0.6.orig/src/zabbix_agent/zabbix_agentd.c zabbix-7.0.6/src/zabbix_agent/zabbix_agentd.c
---- zabbix-7.0.6.orig/src/zabbix_agent/zabbix_agentd.c 2024-12-10 12:00:50.272198610 +0100
-+++ zabbix-7.0.6/src/zabbix_agent/zabbix_agentd.c 2024-12-10 12:08:32.585531605 +0100
+diff -ur zabbix-7.0.9.orig/src/zabbix_agent/zabbix_agentd.c zabbix-7.0.9/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-7.0.9.orig/src/zabbix_agent/zabbix_agentd.c 2025-02-19 23:19:28.431263869 +0100
++++ zabbix-7.0.9/src/zabbix_agent/zabbix_agentd.c 2025-02-19 23:19:39.723403192 +0100
@@ -695,7 +695,7 @@
config_load_module_path = zbx_strdup(config_load_module_path, DEFAULT_LOAD_MODULE_PATH);
#endif
if (NULL == log_file_cfg.log_type_str)
log_file_cfg.log_type_str = zbx_strdup(log_file_cfg.log_type_str, ZBX_OPTION_LOGTYPE_FILE);
-diff -ur zabbix-7.0.6.orig/src/zabbix_java/lib/logback.xml zabbix-7.0.6/src/zabbix_java/lib/logback.xml
---- zabbix-7.0.6.orig/src/zabbix_java/lib/logback.xml 2024-12-10 12:00:50.212197918 +0100
-+++ zabbix-7.0.6/src/zabbix_java/lib/logback.xml 2024-12-10 12:02:03.549043886 +0100
+diff -ur zabbix-7.0.9.orig/src/zabbix_java/lib/logback.xml zabbix-7.0.9/src/zabbix_java/lib/logback.xml
+--- zabbix-7.0.9.orig/src/zabbix_java/lib/logback.xml 2025-02-19 23:19:28.371263128 +0100
++++ zabbix-7.0.9/src/zabbix_java/lib/logback.xml 2025-02-19 23:19:39.723403192 +0100
@@ -2,10 +2,10 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<minIndex>1</minIndex>
<maxIndex>3</maxIndex>
</rollingPolicy>
-diff -ur zabbix-7.0.6.orig/src/zabbix_java/settings.sh zabbix-7.0.6/src/zabbix_java/settings.sh
---- zabbix-7.0.6.orig/src/zabbix_java/settings.sh 2024-12-10 12:00:50.212197918 +0100
-+++ zabbix-7.0.6/src/zabbix_java/settings.sh 2024-12-10 12:02:03.549043886 +0100
+diff -ur zabbix-7.0.9.orig/src/zabbix_java/settings.sh zabbix-7.0.9/src/zabbix_java/settings.sh
+--- zabbix-7.0.9.orig/src/zabbix_java/settings.sh 2025-02-19 23:19:28.371263128 +0100
++++ zabbix-7.0.9/src/zabbix_java/settings.sh 2025-02-19 23:19:39.827404477 +0100
@@ -24,7 +24,7 @@
# Default:
# PID_FILE=
### Option: zabbix.startPollers
# Number of worker threads to start.
-diff -ur zabbix-7.0.6.orig/src/zabbix_proxy/proxy.c zabbix-7.0.6/src/zabbix_proxy/proxy.c
---- zabbix-7.0.6.orig/src/zabbix_proxy/proxy.c 2024-12-10 12:00:50.276198656 +0100
-+++ zabbix-7.0.6/src/zabbix_proxy/proxy.c 2024-12-10 12:02:52.397607378 +0100
+diff -ur zabbix-7.0.9.orig/src/zabbix_proxy/proxy.c zabbix-7.0.9/src/zabbix_proxy/proxy.c
+--- zabbix-7.0.9.orig/src/zabbix_proxy/proxy.c 2025-02-19 23:19:28.435263918 +0100
++++ zabbix-7.0.9/src/zabbix_proxy/proxy.c 2025-02-19 23:19:39.827404477 +0100
@@ -544,7 +544,7 @@
zbx_config_snmptrap_file = zbx_strdup(zbx_config_snmptrap_file, "/tmp/zabbix_traps.tmp");
if (NULL == zbx_config_tmpdir)
zbx_config_tmpdir = zbx_strdup(zbx_config_tmpdir, "/tmp");
-diff -ur zabbix-7.0.6.orig/src/zabbix_server/server.c zabbix-7.0.6/src/zabbix_server/server.c
---- zabbix-7.0.6.orig/src/zabbix_server/server.c 2024-12-10 12:00:50.264198518 +0100
-+++ zabbix-7.0.6/src/zabbix_server/server.c 2024-12-10 12:11:11.387363440 +0100
+diff -ur zabbix-7.0.9.orig/src/zabbix_server/server.c zabbix-7.0.9/src/zabbix_server/server.c
+--- zabbix-7.0.9.orig/src/zabbix_server/server.c 2025-02-19 23:19:28.427263819 +0100
++++ zabbix-7.0.9/src/zabbix_server/server.c 2025-02-19 23:19:39.827404477 +0100
@@ -644,7 +644,7 @@
zbx_config_snmptrap_file = zbx_strdup(zbx_config_snmptrap_file, "/tmp/zabbix_traps.tmp");
if (NULL == zbx_config_alert_scripts_path)
zbx_config_alert_scripts_path = zbx_strdup(zbx_config_alert_scripts_path, DEFAULT_ALERT_SCRIPTS_PATH);
-diff -ur zabbix-7.0.6.orig/ui/include/classes/core/CConfigFile.php zabbix-7.0.6/ui/include/classes/core/CConfigFile.php
---- zabbix-7.0.6.orig/ui/include/classes/core/CConfigFile.php 2024-12-10 12:00:50.032195842 +0100
-+++ zabbix-7.0.6/ui/include/classes/core/CConfigFile.php 2024-12-10 12:02:03.549043886 +0100
+diff -ur zabbix-7.0.9.orig/ui/include/classes/core/CConfigFile.php zabbix-7.0.9/ui/include/classes/core/CConfigFile.php
+--- zabbix-7.0.9.orig/ui/include/classes/core/CConfigFile.php 2025-02-19 23:19:28.091259674 +0100
++++ zabbix-7.0.9/ui/include/classes/core/CConfigFile.php 2025-02-19 23:19:39.827404477 +0100
@@ -20,7 +20,7 @@
const CONFIG_ERROR = 2;
const CONFIG_VAULT_ERROR = 3;
private static $supported_db_types = [
ZBX_DB_MYSQL => true,
-diff -ur zabbix-7.0.6.orig/ui/include/classes/core/ZBase.php zabbix-7.0.6/ui/include/classes/core/ZBase.php
---- zabbix-7.0.6.orig/ui/include/classes/core/ZBase.php 2024-12-10 12:00:50.032195842 +0100
-+++ zabbix-7.0.6/ui/include/classes/core/ZBase.php 2024-12-10 12:12:16.044109281 +0100
+diff -ur zabbix-7.0.9.orig/ui/include/classes/core/ZBase.php zabbix-7.0.9/ui/include/classes/core/ZBase.php
+--- zabbix-7.0.9.orig/ui/include/classes/core/ZBase.php 2025-02-19 23:19:28.087259625 +0100
++++ zabbix-7.0.9/ui/include/classes/core/ZBase.php 2025-02-19 23:19:39.827404477 +0100
@@ -392,7 +392,7 @@
* @throws Exception
*/
$config = new CConfigFile($configFile);
-diff -ur zabbix-7.0.6.orig/ui/include/classes/setup/CSetupWizard.php zabbix-7.0.6/ui/include/classes/setup/CSetupWizard.php
---- zabbix-7.0.6.orig/ui/include/classes/setup/CSetupWizard.php 2024-12-10 12:00:50.004195519 +0100
-+++ zabbix-7.0.6/ui/include/classes/setup/CSetupWizard.php 2024-12-10 12:14:52.725916691 +0100
+diff -ur zabbix-7.0.9.orig/ui/include/classes/setup/CSetupWizard.php zabbix-7.0.9/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-7.0.9.orig/ui/include/classes/setup/CSetupWizard.php 2025-02-19 23:19:28.023258835 +0100
++++ zabbix-7.0.9/ui/include/classes/setup/CSetupWizard.php 2025-02-19 23:19:39.827404477 +0100
@@ -117,7 +117,7 @@
}
}