- updated to 6.0.29

[packages/zabbix.git] / sqlite3_dbname.patch

diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 0288f6a9f04387532e72d30f5f0f6a2b02168b6a..a7eae77b3fa118cb40503c2f01692d9fbe41a21b 100644 (file)
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -1,18 +1,18 @@
-diff -ur zabbix-5.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy.conf
---- zabbix-5.0.7.orig/conf/zabbix_proxy.conf   2021-01-03 20:22:59.543798240 +0100
-+++ zabbix-5.0.7/conf/zabbix_proxy.conf        2021-01-03 20:28:36.745798240 +0100
-@@ -158,6 +158,7 @@
+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.
  #     For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
 +#     If provided name does not contain '/' or ':' (no a path or special type) a .db file in /var/lib/zabbix will be used.
- #     Warning: do not attempt to use the same database Zabbix server is using.
- #
- # Mandatory: yes
-diff -ur zabbix-5.0.7.orig/src/libs/zbxdb/db.c zabbix-5.0.7/src/libs/zbxdb/db.c
---- zabbix-5.0.7.orig/src/libs/zbxdb/db.c      2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.0.7/src/libs/zbxdb/db.c   2021-01-03 20:30:32.174798240 +0100
-@@ -383,6 +383,7 @@
+ #     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 @@
        unsigned int    i = 0;
  #elif defined(HAVE_SQLITE3)
        char            *p, *path = NULL;
@@ -20,7 +20,7 @@ diff -ur zabbix-5.0.7.orig/src/libs/zbxdb/db.c zabbix-5.0.7/src/libs/zbxdb/db.c
  #endif
  
  #ifndef HAVE_MYSQL
-@@ -830,6 +831,10 @@
+@@ -878,6 +879,10 @@
        ZBX_UNUSED(ca);
        ZBX_UNUSED(cipher);
        ZBX_UNUSED(cipher_13);