X-Git-Url: https://git.tld-linux.org/?p=packages%2Fzabbix.git;a=blobdiff_plain;f=sqlite3_dbname.patch;fp=sqlite3_dbname.patch;h=a7eae77b3fa118cb40503c2f01692d9fbe41a21b;hp=7129df8ba176e2da3857273230bb769f11ceef3f;hb=96ef8ffbef5ee8a1c610fabea058c6accd925618;hpb=b2a43eada44b4c8be5aad316e39f8d1786cf3a74 diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch index 7129df8..a7eae77 100644 --- a/sqlite3_dbname.patch +++ b/sqlite3_dbname.patch @@ -1,6 +1,6 @@ -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 +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. @@ -9,10 +9,10 @@ diff -ur zabbix-6.0.2.orig/conf/zabbix_proxy.conf zabbix-6.0.2/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-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 @@ +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-6.0.2.orig/src/libs/zbxdb/db.c zabbix-6.0.2/src/libs/zbxdb/db.c #endif #ifndef HAVE_MYSQL -@@ -851,6 +852,10 @@ +@@ -878,6 +879,10 @@ ZBX_UNUSED(ca); ZBX_UNUSED(cipher); ZBX_UNUSED(cipher_13);