- updated to 7.0.12

diff --git a/agent2.patch b/agent2.patch
index bdb7fd19d2ddd1421585cebbea20aeaebb761e32..a0a659f9e76d6b53f61f0f5d203acccc237b5536 100644 (file)
--- a/agent2.patch
+++ b/agent2.patch
@@ -1,7 +1,7 @@
-diff -ur zabbix-7.0.6.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go zabbix-7.0.6/src/go/cmd/zabbix_agent2/zabbix_agent2.go
---- zabbix-7.0.6.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go        2024-12-10 12:22:49.427410715 +0100
-+++ zabbix-7.0.6/src/go/cmd/zabbix_agent2/zabbix_agent2.go     2024-12-10 12:24:02.008246701 +0100
-@@ -541,7 +541,7 @@
+diff -ur zabbix-7.0.12.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go zabbix-7.0.12/src/go/cmd/zabbix_agent2/zabbix_agent2.go
+--- zabbix-7.0.12.orig/src/go/cmd/zabbix_agent2/zabbix_agent2.go       2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/go/cmd/zabbix_agent2/zabbix_agent2.go    2025-04-22 20:44:19.019312572 +0200
+@@ -559,7 +559,7 @@
                                Shorthand:   "f",
                                Description: "Run Zabbix agent in foreground",
                        },

diff --git a/always_compile_ipc.patch b/always_compile_ipc.patch
index 24f2c965e11f26c430681f0fcbb75ecfeb79c4b1..8b6ffbad8e60103bae6f742cd9f5ce44b7b384c6 100644 (file)
--- a/always_compile_ipc.patch
+++ b/always_compile_ipc.patch
@@ -1,7 +1,7 @@
-diff -ur zabbix-7.0.6.orig/configure.ac zabbix-7.0.6/configure.ac
---- zabbix-7.0.6.orig/configure.ac     2024-12-10 12:22:14.815012054 +0100
-+++ zabbix-7.0.6/configure.ac  2024-12-10 12:22:33.803230757 +0100
-@@ -1550,7 +1550,7 @@
+diff -ur zabbix-7.0.12.orig/configure.ac zabbix-7.0.12/configure.ac
+--- zabbix-7.0.12.orig/configure.ac    2025-04-22 11:06:29.000000000 +0200
++++ zabbix-7.0.12/configure.ac 2025-04-22 20:43:39.655190923 +0200
+@@ -1587,7 +1587,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 55437d06e43e8405992a23882b9d0f1e7f7c4b04..7679438fd4af5a1da3c58044ee491a77617c5243 100644 (file)
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -1,6 +1,6 @@
-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
+diff -ur zabbix-7.0.12.orig/conf/zabbix_proxy.conf zabbix-7.0.12/conf/zabbix_proxy.conf
+--- zabbix-7.0.12.orig/conf/zabbix_proxy.conf  2025-04-22 20:41:46.254840486 +0200
++++ zabbix-7.0.12/conf/zabbix_proxy.conf       2025-04-22 20:42:57.395060327 +0200
 @@ -155,6 +155,7 @@
  ### Option: DBName
  #     Database name.
@@ -9,10 +9,10 @@ diff -ur zabbix-7.0.9.orig/conf/zabbix_proxy.conf zabbix-7.0.9/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-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 @@
+diff -ur zabbix-7.0.12.orig/src/libs/zbxdb/db.c zabbix-7.0.12/src/libs/zbxdb/db.c
+--- zabbix-7.0.12.orig/src/libs/zbxdb/db.c     2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/src/libs/zbxdb/db.c  2025-04-22 20:42:57.395060327 +0200
+@@ -432,7 +432,7 @@
        const char      *values[ZBX_DB_MAX_PARAMS + 1];
        unsigned int    i = 0;
  #elif defined(HAVE_SQLITE3)
@@ -21,8 +21,8 @@ diff -ur zabbix-7.0.9.orig/src/libs/zbxdb/db.c zabbix-7.0.9/src/libs/zbxdb/db.c
  #endif
  
        /* Allow executing statements during a connection initialization. Make sure to mark transaction as failed. */
-@@ -851,11 +851,16 @@
-       ZBX_PG_READ_ONLY_RECOVERABLE = cfg->read_only_recoverable;
+@@ -867,11 +867,16 @@
+ 
  out:
  #elif defined(HAVE_SQLITE3)
 +      if (!strchr(cfg->config_dbname, '/') && !strchr(cfg->config_dbname, ':')) {
@@ -40,7 +40,7 @@ diff -ur zabbix-7.0.9.orig/src/libs/zbxdb/db.c zabbix-7.0.9/src/libs/zbxdb/db.c
  #endif
        {
                zbx_db_errlog(ERR_Z3001, 0, sqlite3_errmsg(conn), cfg->config_dbname);
-@@ -896,6 +901,7 @@
+@@ -912,6 +917,7 @@
  
        zbx_free(path);
  out:

diff --git a/tld.patch b/tld.patch
index b1b0138406833355a39a826f2b9c0c6a8a2e59c4..7085551b2a1c22f75fcc1639ba5e667df52e80cf 100644 (file)
--- a/tld.patch
+++ b/tld.patch
@@ -1,6 +1,6 @@
-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
+diff -ur zabbix-7.0.12.orig/conf/zabbix_agentd.conf zabbix-7.0.12/conf/zabbix_agentd.conf
+--- zabbix-7.0.12.orig/conf/zabbix_agentd.conf 2025-04-17 08:10:28.000000000 +0200
++++ zabbix-7.0.12/conf/zabbix_agentd.conf      2025-04-22 20:41:46.254840486 +0200
 @@ -8,7 +8,7 @@
  #
  # Mandatory: no
@@ -36,9 +36,9 @@ diff -ur zabbix-7.0.9.orig/conf/zabbix_agentd.conf zabbix-7.0.9/conf/zabbix_agen
  
  ####### USER-DEFINED MONITORED PARAMETERS #######
  
-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
+diff -ur zabbix-7.0.12.orig/conf/zabbix_proxy.conf zabbix-7.0.12/conf/zabbix_proxy.conf
+--- zabbix-7.0.12.orig/conf/zabbix_proxy.conf  2025-04-22 11:06:26.000000000 +0200
++++ zabbix-7.0.12/conf/zabbix_proxy.conf       2025-04-22 20:41:46.254840486 +0200
 @@ -81,7 +81,7 @@
  # Default:
  # LogFile=
@@ -74,9 +74,9 @@ diff -ur zabbix-7.0.9.orig/conf/zabbix_proxy.conf zabbix-7.0.9/conf/zabbix_proxy
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-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
+diff -ur zabbix-7.0.12.orig/conf/zabbix_server.conf zabbix-7.0.12/conf/zabbix_server.conf
+--- zabbix-7.0.12.orig/conf/zabbix_server.conf 2025-04-22 11:06:26.000000000 +0200
++++ zabbix-7.0.12/conf/zabbix_server.conf      2025-04-22 20:41:46.254840486 +0200
 @@ -35,7 +35,7 @@
  # Default:
  # LogFile=
@@ -112,9 +112,9 @@ diff -ur zabbix-7.0.9.orig/conf/zabbix_server.conf zabbix-7.0.9/conf/zabbix_serv
  
  ### Option: SSLCertLocation
  #     Location of SSL client certificates.
-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
+diff -ur zabbix-7.0.12.orig/src/go/cmd/zabbix_web_service/config.go zabbix-7.0.12/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-7.0.12.orig/src/go/cmd/zabbix_web_service/config.go 2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/go/cmd/zabbix_web_service/config.go      2025-04-22 20:41:46.254840486 +0200
 @@ -20,7 +20,7 @@
        ListenPort          string `conf:"optional,range=1024:32767,default=10053"`
        AllowedIP           string `conf:"optional"`
@@ -124,9 +124,9 @@ diff -ur zabbix-7.0.9.orig/src/go/cmd/zabbix_web_service/config.go zabbix-7.0.9/
        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.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
+diff -ur zabbix-7.0.12.orig/src/go/conf/mock_server.conf zabbix-7.0.12/src/go/conf/mock_server.conf
+--- zabbix-7.0.12.orig/src/go/conf/mock_server.conf    2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/go/conf/mock_server.conf 2025-04-22 20:41:46.258840498 +0200
 @@ -18,7 +18,7 @@
  # Default:
  # LogFile=
@@ -136,9 +136,9 @@ diff -ur zabbix-7.0.9.orig/src/go/conf/mock_server.conf zabbix-7.0.9/src/go/conf
  
  ### Option: DebugLevel
  #     Specifies debug level:
-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
+diff -ur zabbix-7.0.12.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.12/src/go/conf/zabbix_agent2.conf
+--- zabbix-7.0.12.orig/src/go/conf/zabbix_agent2.conf  2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/go/conf/zabbix_agent2.conf       2025-04-22 20:41:46.258840498 +0200
 @@ -8,7 +8,7 @@
  #
  # Mandatory: no
@@ -157,7 +157,7 @@ diff -ur zabbix-7.0.9.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.9/src/go/co
  
  ### Option: LogFileSize
  #     Maximum size of log file in MB.
-@@ -282,9 +282,7 @@
+@@ -284,9 +284,7 @@
  # Default:
  # Include=
  
@@ -168,7 +168,7 @@ diff -ur zabbix-7.0.9.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.9/src/go/co
  
  ### Option:PluginTimeout
  #     Timeout for connections with external plugins.
-@@ -487,7 +485,7 @@
+@@ -489,7 +487,7 @@
  # ForceActiveChecksOnStart=0
  
  # Include configuration files for plugins
@@ -177,9 +177,9 @@ diff -ur zabbix-7.0.9.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.9/src/go/co
  
  ####### For advanced users - TLS ciphersuite selection criteria #######
  
-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
+diff -ur zabbix-7.0.12.orig/src/go/conf/zabbix_web_service.conf zabbix-7.0.12/src/go/conf/zabbix_web_service.conf
+--- zabbix-7.0.12.orig/src/go/conf/zabbix_web_service.conf     2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/go/conf/zabbix_web_service.conf  2025-04-22 20:41:46.258840498 +0200
 @@ -18,7 +18,7 @@
  #
  # Mandatory: yes, if LogType is set to file, otherwise no
@@ -189,9 +189,9 @@ diff -ur zabbix-7.0.9.orig/src/go/conf/zabbix_web_service.conf zabbix-7.0.9/src/
  
  ### Option: LogFileSize
  #     Maximum size of log file in MB.
-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
+diff -ur zabbix-7.0.12.orig/src/go/internal/agent/options_nix.go zabbix-7.0.12/src/go/internal/agent/options_nix.go
+--- zabbix-7.0.12.orig/src/go/internal/agent/options_nix.go    2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/src/go/internal/agent/options_nix.go 2025-04-22 20:41:46.258840498 +0200
 @@ -19,7 +19,7 @@
  
  type AgentOptions struct {
@@ -201,9 +201,9 @@ diff -ur zabbix-7.0.9.orig/src/go/internal/agent/options_nix.go zabbix-7.0.9/src
        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.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
+diff -ur zabbix-7.0.12.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-7.0.12/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-7.0.12.orig/src/go/pkg/pidfile/pidfile_nix.go       2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/go/pkg/pidfile/pidfile_nix.go    2025-04-22 20:41:46.258840498 +0200
 @@ -26,7 +26,7 @@
  
  func createPidFile(pid int, path string) (file *os.File, err error) {
@@ -213,9 +213,9 @@ diff -ur zabbix-7.0.9.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-7.0.9/src/go
        }
  
        flockT := syscall.Flock_t{
-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
+diff -ur zabbix-7.0.12.orig/src/zabbix_agent/zabbix_agentd.c zabbix-7.0.12/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-7.0.12.orig/src/zabbix_agent/zabbix_agentd.c        2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/src/zabbix_agent/zabbix_agentd.c     2025-04-22 20:41:46.258840498 +0200
 @@ -695,7 +695,7 @@
                config_load_module_path = zbx_strdup(config_load_module_path, DEFAULT_LOAD_MODULE_PATH);
  
@@ -225,9 +225,9 @@ diff -ur zabbix-7.0.9.orig/src/zabbix_agent/zabbix_agentd.c zabbix-7.0.9/src/zab
  #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.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
+diff -ur zabbix-7.0.12.orig/src/zabbix_java/lib/logback.xml zabbix-7.0.12/src/zabbix_java/lib/logback.xml
+--- zabbix-7.0.12.orig/src/zabbix_java/lib/logback.xml 2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/zabbix_java/lib/logback.xml      2025-04-22 20:41:46.258840498 +0200
 @@ -2,10 +2,10 @@
  
        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -241,9 +241,9 @@ diff -ur zabbix-7.0.9.orig/src/zabbix_java/lib/logback.xml zabbix-7.0.9/src/zabb
                        <minIndex>1</minIndex>
                        <maxIndex>3</maxIndex>
                </rollingPolicy>
-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
+diff -ur zabbix-7.0.12.orig/src/zabbix_java/settings.sh zabbix-7.0.12/src/zabbix_java/settings.sh
+--- zabbix-7.0.12.orig/src/zabbix_java/settings.sh     2025-04-17 08:10:29.000000000 +0200
++++ zabbix-7.0.12/src/zabbix_java/settings.sh  2025-04-22 20:41:46.258840498 +0200
 @@ -24,7 +24,7 @@
  # Default:
  # PID_FILE=
@@ -253,9 +253,9 @@ diff -ur zabbix-7.0.9.orig/src/zabbix_java/settings.sh zabbix-7.0.9/src/zabbix_j
  
  ### Option: zabbix.startPollers
  #     Number of worker threads to start.
-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
+diff -ur zabbix-7.0.12.orig/src/zabbix_proxy/proxy.c zabbix-7.0.12/src/zabbix_proxy/proxy.c
+--- zabbix-7.0.12.orig/src/zabbix_proxy/proxy.c        2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/src/zabbix_proxy/proxy.c     2025-04-22 20:41:46.258840498 +0200
 @@ -544,7 +544,7 @@
                zbx_config_snmptrap_file = zbx_strdup(zbx_config_snmptrap_file, "/tmp/zabbix_traps.tmp");
  
@@ -265,9 +265,9 @@ diff -ur zabbix-7.0.9.orig/src/zabbix_proxy/proxy.c zabbix-7.0.9/src/zabbix_prox
  
        if (NULL == zbx_config_tmpdir)
                zbx_config_tmpdir = zbx_strdup(zbx_config_tmpdir, "/tmp");
-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
+diff -ur zabbix-7.0.12.orig/src/zabbix_server/server.c zabbix-7.0.12/src/zabbix_server/server.c
+--- zabbix-7.0.12.orig/src/zabbix_server/server.c      2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/src/zabbix_server/server.c   2025-04-22 20:41:46.258840498 +0200
 @@ -644,7 +644,7 @@
                zbx_config_snmptrap_file = zbx_strdup(zbx_config_snmptrap_file, "/tmp/zabbix_traps.tmp");
  
@@ -277,9 +277,9 @@ diff -ur zabbix-7.0.9.orig/src/zabbix_server/server.c zabbix-7.0.9/src/zabbix_se
  
        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.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
+diff -ur zabbix-7.0.12.orig/ui/include/classes/core/CConfigFile.php zabbix-7.0.12/ui/include/classes/core/CConfigFile.php
+--- zabbix-7.0.12.orig/ui/include/classes/core/CConfigFile.php 2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/ui/include/classes/core/CConfigFile.php      2025-04-22 20:41:46.258840498 +0200
 @@ -20,7 +20,7 @@
        const CONFIG_ERROR = 2;
        const CONFIG_VAULT_ERROR = 3;
@@ -289,9 +289,9 @@ diff -ur zabbix-7.0.9.orig/ui/include/classes/core/CConfigFile.php zabbix-7.0.9/
  
        private static $supported_db_types = [
                ZBX_DB_MYSQL => true,
-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
+diff -ur zabbix-7.0.12.orig/ui/include/classes/core/ZBase.php zabbix-7.0.12/ui/include/classes/core/ZBase.php
+--- zabbix-7.0.12.orig/ui/include/classes/core/ZBase.php       2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/ui/include/classes/core/ZBase.php    2025-04-22 20:41:46.258840498 +0200
 @@ -392,7 +392,7 @@
         * @throws Exception
         */
@@ -310,9 +310,9 @@ diff -ur zabbix-7.0.9.orig/ui/include/classes/core/ZBase.php zabbix-7.0.9/ui/inc
  
                $config = new CConfigFile($configFile);
  
-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
+diff -ur zabbix-7.0.12.orig/ui/include/classes/setup/CSetupWizard.php zabbix-7.0.12/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-7.0.12.orig/ui/include/classes/setup/CSetupWizard.php       2025-04-22 11:06:27.000000000 +0200
++++ zabbix-7.0.12/ui/include/classes/setup/CSetupWizard.php    2025-04-22 20:41:46.258840498 +0200
 @@ -117,7 +117,7 @@
                        }
                }

diff --git a/zabbix.spec b/zabbix.spec
index 0d828a319ced032997c4b7ef8b88db27d1b7eeea..87e408e1faf4582ea9fa7bacceef38ff463c261d 100644 (file)
--- 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:       7.0.11
+Version:       7.0.12
 Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       https://cdn.zabbix.com/zabbix/sources/stable/7.0/%{name}-%{version}.tar.gz
-# Source0-md5: c6948c5b5d8f81fc7633b633b02851d7
+# Source0-md5: affab4ac8905f429501944acf22afca8
 Source1:       %{name}-apache.conf
 Source2:       %{name}_agentd.init
 Source3:       %{name}_server.init
@@ -278,11 +278,11 @@ This package provides the Zabbix Java Gateway.
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
 
 %build
 %{__libtoolize}