commit 98ab823af8a3a9b7e1e32c5c976f69eb017f5ee7
Author: Elan Ruusamäe <[email protected]>
Date: Tue Aug 24 12:21:38 2021 +0300
Up to 5.4.3
go-destdir.patch | 16 ++++++++++------
sqlite3_dbname.patch | 13 ++++++-------
zabbix.spec | 10 ++++++----
3 files changed, 22 insertions(+), 17 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index e1c5e2c..235d65d 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -19,12 +19,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
@@ -36,7 +37,7 @@ Patch0: config.patch
Patch1: sqlite3_dbname.patch
Patch2: always_compile_ipc.patch
Patch3: go-destdir.patch
-URL: http://zabbix.sourceforge.net/
+URL: https://www.zabbix.com/
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
BuildRequires: automake >= 1:1.15
@@ -593,6 +594,7 @@ ln -sf zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
%defattr(644,root,root,755)
%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/zabbix_agent2.conf
%attr(755,root,root) %{_sbindir}/zabbix_agent2
+%{_mandir}/man8/zabbix_agent2.8*
%endif
%files frontend-php
diff --git a/go-destdir.patch b/go-destdir.patch
index 019e3a9..d66e19b 100644
--- a/go-destdir.patch
+++ b/go-destdir.patch
@@ -1,11 +1,15 @@
---- zabbix-5.2.3/src/go/Makefile.am~ 2020-12-14 12:27:17.000000000 +0200
-+++ zabbix-5.2.3/src/go/Makefile.am 2021-08-24 15:25:21.065256983 +0300
-@@ -26,7 +26,7 @@
+--- zabbix-5.4.3/src/go/Makefile.am~ 2021-07-19 17:04:10.000000000 +0300
++++ zabbix-5.4.3/src/go/Makefile.am 2021-08-24 14:54:36.169315447 +0300
+@@ -52,11 +52,11 @@
rm -f bin/zabbix_agent2 bin/mock_server
- install:
+ install-zabbix.com/cmd/zabbix_agent2:
- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \
+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}"
GOBIN=$(DESTDIR)${GOBIN} \
- go install -ldflags="${GOLDFLAGS}" zabbix.com/cmd/zabbix_agent2
- test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp
"conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@"
+ go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
+ install-zabbix.com/cmd/zabbix_web_service:
+- GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}"
zabbix.com/cmd/zabbix_web_service
++ GOBIN=$(DESTDIR)${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}"
zabbix.com/cmd/zabbix_web_service
+
+ install-exec-local: ${INSTALL_TARGETS}
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/98ab823af8a3a9b7e1e32c5c976f69eb017f5ee7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
