- updated to 6.0.30

[packages/zabbix.git] / sqlite3_dbname.patch

diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index f6dcd6b52c925091074bc6647adad8953584fa42..9091f59d6e5f958d2d29763225451b04c4beac33 100644 (file)
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -1,7 +1,7 @@
-diff -ur zabbix-5.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/conf/zabbix_proxy.conf
---- zabbix-5.4.3.orig/conf/zabbix_proxy.conf   2021-07-26 15:14:02.107383385 +0200
-+++ zabbix-5.4.3/conf/zabbix_proxy.conf        2021-07-26 15:18:42.151383385 +0200
-@@ -160,6 +160,7 @@
+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.
  #     For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
  ### Option: DBName
  #     Database name.
  #     For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.


@@ -9,10 +9,10 @@ diff -ur zabbix-5.4.3.orig/conf/zabbix_proxy.conf zabbix-5.4.3/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.
  #     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-5.4.3.orig/src/libs/zbxdb/db.c zabbix-5.4.3/src/libs/zbxdb/db.c
---- zabbix-5.4.3.orig/src/libs/zbxdb/db.c      2021-07-19 16:04:10.000000000 +0200
-+++ zabbix-5.4.3/src/libs/zbxdb/db.c   2021-07-26 15:17:02.917383385 +0200
-@@ -388,6 +388,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;
        unsigned int    i = 0;
  #elif defined(HAVE_SQLITE3)
        char            *p, *path = NULL;


@@ -20,7 +20,7 @@ diff -ur zabbix-5.4.3.orig/src/libs/zbxdb/db.c zabbix-5.4.3/src/libs/zbxdb/db.c
  #endif
  
  #ifndef HAVE_MYSQL
  #endif
  
  #ifndef HAVE_MYSQL

-@@ -836,6 +837,10 @@
+@@ -878,6 +879,10 @@

        ZBX_UNUSED(ca);
        ZBX_UNUSED(cipher);
        ZBX_UNUSED(cipher_13);
        ZBX_UNUSED(ca);
        ZBX_UNUSED(cipher);
        ZBX_UNUSED(cipher_13);