[packages/zabbix/dev-5.4.3] Up to 5.4.3

glen glen at pld-linux.org
Tue Aug 24 12:33:22 CEST 2021


commit 0f0220be4ebfb2afe3c87ecdec65989650add3eb
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Aug 24 12:21:38 2021 +0300

    Up to 5.4.3

 sqlite3_dbname.patch | 13 ++++++-------
 zabbix.spec          |  9 +++++----
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index a753121..ea61060 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -18,12 +18,13 @@
 Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
-Version:	5.2.3
+Version:	5.4.3
 Release:	0.1
 License:	GPL v2+
 Group:		Networking/Utilities
-Source0:	https://cdn.zabbix.com/zabbix/sources/stable/5.2/%{name}-%{version}.tar.gz
-# Source0-md5:	20445897eb25c65a1ed1b62db7c5f04b
+# https://www.zabbix.com/download_sources
+Source0:	https://cdn.zabbix.com/zabbix/sources/stable/5.4/%{name}-%{version}.tar.gz
+# Source0-md5:	5dccb536c164e45c7d5c1a5a9d64be43
 Source1:	%{name}-apache.conf
 Source2:	%{name}_server.service
 Source3:	%{name}_agentd.service
@@ -34,7 +35,7 @@ Source7:	%{name}_agentd.init
 Patch0:		config.patch
 Patch1:		sqlite3_dbname.patch
 Patch2:		always_compile_ipc.patch
-URL:		http://zabbix.sourceforge.net/
+URL:		https://www.zabbix.com/
 BuildRequires:	OpenIPMI-devel
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.15
diff --git a/sqlite3_dbname.patch b/sqlite3_dbname.patch
index 3123a82..7c7e052 100644
--- a/sqlite3_dbname.patch
+++ b/sqlite3_dbname.patch
@@ -1,14 +1,13 @@
-diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_proxy.conf zabbix-5.2.3/conf/zabbix_proxy.conf
---- zabbix-5.2.3.org/conf/zabbix_proxy.conf	2021-08-24 11:18:51.673409490 +0200
-+++ zabbix-5.2.3/conf/zabbix_proxy.conf	2021-08-24 11:18:52.353444791 +0200
-@@ -158,6 +158,7 @@ PidFile=/var/run/zabbix/zabbix_proxy.pid
+--- zabbix-5.4.3/conf/zabbix_proxy.conf~	2021-08-24 12:51:15.000000000 +0300
++++ zabbix-5.4.3/conf/zabbix_proxy.conf	2021-08-24 12:52:01.573388850 +0300
+@@ -160,6 +160,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
+ #	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 -urNp -x '*.orig' zabbix-5.2.3.org/src/libs/zbxdb/db.c zabbix-5.2.3/src/libs/zbxdb/db.c
 --- zabbix-5.2.3.org/src/libs/zbxdb/db.c	2020-12-14 11:27:17.000000000 +0100
 +++ zabbix-5.2.3/src/libs/zbxdb/db.c	2021-08-24 11:18:52.356778296 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/0f0220be4ebfb2afe3c87ecdec65989650add3eb



More information about the pld-cvs-commit mailing list