X-Git-Url: https://git.tld-linux.org/?p=packages%2Fzabbix.git;a=blobdiff_plain;f=sqlite3_dbname.patch;h=7129df8ba176e2da3857273230bb769f11ceef3f;hp=f6dcd6b52c925091074bc6647adad8953584fa42;hb=27651193f88117b91aad1d08cf54f1067fef3e4f;hpb=ccc85b787e14f0dc9552636a6afae5bceb0158c0

diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index f6dcd6b..7129df8 100644
--- 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.2.orig/conf/zabbix_proxy.conf zabbix-6.0.2/conf/zabbix_proxy.conf
+--- zabbix-6.0.2.orig/conf/zabbix_proxy.conf	2022-03-24 18:48:25.803355270 +0100
++++ zabbix-6.0.2/conf/zabbix_proxy.conf	2022-03-24 18:48:53.037418309 +0100
+@@ -153,6 +153,7 @@
  ### 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.
-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.2.orig/src/libs/zbxdb/db.c zabbix-6.0.2/src/libs/zbxdb/db.c
+--- zabbix-6.0.2.orig/src/libs/zbxdb/db.c	2022-03-24 18:48:25.580354753 +0100
++++ zabbix-6.0.2/src/libs/zbxdb/db.c	2022-03-24 18:48:53.037418309 +0100
+@@ -402,6 +402,7 @@
  	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
-@@ -836,6 +837,10 @@
+@@ -851,6 +852,10 @@
  	ZBX_UNUSED(ca);
  	ZBX_UNUSED(cipher);
  	ZBX_UNUSED(cipher_13);