[packages/zabbix] up to 7.0.18

[atler]

commit 1c6f49ce81ebe1b6a14390fd558f03d240c288b4
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Aug 25 22:49:23 2025 +0200

    up to 7.0.18

 config.patch | 15 +++------------
 zabbix.spec  |  8 ++++----
 2 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index f0b4d25..3d21d25 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -24,15 +24,15 @@
 Summary:	Zabbix - network monitoring software
 Summary(pl.UTF-8):	Zabbix - oprogramowanie do monitorowania sieci
 Name:		zabbix
-Version:	7.0.17
+Version:	7.0.18
 Release:	1
 License:	GPL v2+
 Group:		Networking/Utilities
 # https://www.zabbix.com/download_sources
 Source0:	https://cdn.zabbix.com/zabbix/sources/stable/7.0/%{name}-%{version}.tar.gz
-# Source0-md5:	cde1d4c03d3bdaf90370e0528e04157e
+# Source0-md5:	bbf3ccdf14271eb5ef2735e397f766b1
 Source100:	go-vendor.tar.xz
-# Source100-md5:	2399a3e07b1a2d6b30c453e45d4e8eff
+# Source100-md5:	240a1fdb9597530f38676156f1d8ec83
 Source1:	%{name}-apache.conf
 Source2:	%{name}_server.service
 Source3:	%{name}_agentd.service
@@ -61,7 +61,7 @@ BuildRequires:	iksemel-devel
 %{?with_java:%buildrequires_jdk}
 BuildRequires:	rpm-build >= 4.6
 %{?with_java:BuildRequires:	rpm-pld-macros-javaprov}
-%{?with_agent2:BuildRequires:	golang >= 1.19}
+%{?with_agent2:BuildRequires:	golang >= 1.23}
 BuildRequires:	libevent-devel
 BuildRequires:	libssh2-devel
 BuildRequires:	libtool
diff --git a/config.patch b/config.patch
index 9b29abd..83a87a6 100644
--- a/config.patch
+++ b/config.patch
@@ -18,15 +18,12 @@ diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_agentd.conf zabbix-5.2.3/con
  
  ### Option: LogFileSize
  #	Maximum size of log file in MB.
-@@ -304,7 +305,7 @@ Hostname=Zabbix server
+@@ -546,4 +546,4 @@ Hostname=Zabbix server
  
  # Include=/usr/local/etc/zabbix_agentd.userparams.conf
  # Include=/usr/local/etc/zabbix_agentd.conf.d/
 -# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
 +Include=/etc/zabbix/zabbix_agentd.conf.d/*.conf
- 
- ####### USER-DEFINED MONITORED PARAMETERS #######
- 
 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	2020-12-21 10:47:57.000000000 +0100
 +++ zabbix-5.2.3/conf/zabbix_proxy.conf	2021-08-24 11:18:50.376675510 +0200
@@ -48,15 +45,12 @@ diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_proxy.conf zabbix-5.2.3/conf
  
  ### Option: SocketDir
  #	IPC socket directory.
-@@ -586,7 +586,7 @@ LogSlowQueries=3000
+@@ -1050,4 +1050,4 @@ StatsAllowedIP=127.0.0.1
  
  # Include=/usr/local/etc/zabbix_proxy.general.conf
  # Include=/usr/local/etc/zabbix_proxy.conf.d/
 -# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
 +Include=/etc/zabbix/zabbix_proxy.conf.d/*.conf
- 
- ### Option: SSLCertLocation
- #	Location of SSL client certificates.
 diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_server.conf zabbix-5.2.3/conf/zabbix_server.conf
 --- zabbix-5.2.3.org/conf/zabbix_server.conf	2020-12-21 10:47:57.000000000 +0100
 +++ zabbix-5.2.3/conf/zabbix_server.conf	2021-08-24 11:18:50.376675510 +0200
@@ -78,15 +72,12 @@ diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_server.conf zabbix-5.2.3/con
  
  ### Option: SocketDir
  #	IPC socket directory.
-@@ -620,7 +620,7 @@ LogSlowQueries=3000
+@@ -1124,4 +1124,4 @@ EnableGlobalScripts=0
  
  # Include=/usr/local/etc/zabbix_server.general.conf
  # Include=/usr/local/etc/zabbix_server.conf.d/
 -# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
 +Include=/etc/zabbix/zabbix_server.conf.d/*.conf
- 
- ### Option: SSLCertLocation
- #	Location of SSL client certificates.
 diff -urNp -x '*.orig' zabbix-5.2.3.org/src/zabbix_java/lib/logback.xml zabbix-5.2.3/src/zabbix_java/lib/logback.xml
 --- zabbix-5.2.3.org/src/zabbix_java/lib/logback.xml	2020-12-14 11:27:17.000000000 +0100
 +++ zabbix-5.2.3/src/zabbix_java/lib/logback.xml	2021-08-24 11:18:50.376675510 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/1c6f49ce81ebe1b6a14390fd558f03d240c288b4