X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=sqlite3_dbname.patch;h=9091f59d6e5f958d2d29763225451b04c4beac33;hb=52cee109ffe4e4aa9f5816dbcacf6cdbf52e27db;hp=0288f6a9f04387532e72d30f5f0f6a2b02168b6a;hpb=4523bfffb57a373581cdf4a1f86ebd4e56216bde;p=packages%2Fzabbix.git

diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 0288f6a..9091f59 100644
--- 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.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.
 +#	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.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;
@@ -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);