From 6c0aff9ef9a24a64d5656209ee2c400981e186e4 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Wed, 29 Jan 2025 02:13:01 +0800
Subject: [PATCH] 7.0.9

---
 zabbix-7.0.8.tar.gz => zabbix-7.0.9.tar.gz |  4 +--
 zabbix-out-of-tree.patch                   |  7 +++--
 zabbix.spec                                | 35 +++-------------------
 3 files changed, 10 insertions(+), 36 deletions(-)
 rename zabbix-7.0.8.tar.gz => zabbix-7.0.9.tar.gz (32%)

diff --git a/zabbix-7.0.8.tar.gz b/zabbix-7.0.9.tar.gz
similarity index 32%
rename from zabbix-7.0.8.tar.gz
rename to zabbix-7.0.9.tar.gz
index f00fe01..5565bad 100644
--- a/zabbix-7.0.8.tar.gz
+++ b/zabbix-7.0.9.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5587f227f0128d0806e55c96581f6234d6a71bedefda9099164c0b5f25a67582
-size 44231377
+oid sha256:8d7755576f30b5d6099ff5e3574549fc248229c017f9753828565174125069f6
+size 44626987
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch
index 901d716..82acd43 100644
--- a/zabbix-out-of-tree.patch
+++ b/zabbix-out-of-tree.patch
@@ -36,13 +36,14 @@ diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am
 index 43f8f19..48214c9 100644
 --- a/src/zabbix_java/Makefile.am
 +++ b/src/zabbix_java/Makefile.am
-@@ -9,22 +9,22 @@ EXTRA_DIST = \
+@@ -9,23 +9,23 @@
  	startup.sh
  
  ZJG = bin/zabbix-java-gateway-$(VERSION).jar
--LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.2.9.jar:lib/logback-classic-1.2.9.jar:lib/slf4j-api-1.7.32.jar
+-LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.5.16.jar:lib/logback-classic-1.5.16.jar:lib/slf4j-api-2.0.16.jar
++LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.5.16.jar:$(srcdir)/lib/logback-classic-1.5.16.jar:$(srcdir)/lib/slf4j-api-2.0.16.jar
+ 
 -JUNIT = tests/junit-4.8.2.jar
-+LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.2.3.jar:$(srcdir)/lib/logback-classic-1.2.3.jar:$(srcdir)/lib/slf4j-api-1.7.30.jar
 +JUNIT = $(srcdir)/tests/junit-4.8.2.jar
  
  ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
diff --git a/zabbix.spec b/zabbix.spec
index ec49b9e..2015975 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -14,7 +14,7 @@
 #%%global prerelease rc2
 
 Name:           zabbix
-Version:        7.0.8
+Version:        7.0.9
 Release:        1
 Summary:        Open-source monitoring solution for your IT infrastructure
 License:        AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC
@@ -524,24 +524,12 @@ fi
 :
 
 %post server-mysql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
-    %{name}-server %{_sbindir}/%{name}_server_mysql 10 \
-        --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
-            %{_unitdir}/zabbix-server-mysql.service
-# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives.
 %{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
     %{name}-server %{_sbindir}/%{name}_server_mysql 10 \
         --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
             %{_unitdir}/zabbix-server-mysql.service
 
 %post server-pgsql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
-    %{name}-server %{_sbindir}/%{name}_server_pgsql 10 \
-        --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
-            %{_unitdir}/zabbix-server-pgsql.service
-# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives.
 %{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \
     %{name}-server %{_sbindir}/%{name}_server_pgsql 10 \
         --slave %{_unitdir}/zabbix-server.service %{name}-server.service \
@@ -558,36 +546,18 @@ fi
 :
 
 %post proxy-mysql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
-    %{name}-proxy %{_sbindir}/%{name}_proxy_mysql 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
-            %{_unitdir}/zabbix-proxy-mysql.service
-# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives. Remove in F45
 %{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
     %{name}-proxy %{_sbindir}/%{name}_proxy_mysql 10 \
         --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-mysql.service
 
 %post proxy-pgsql
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
-    %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
-            %{_unitdir}/zabbix-proxy-pgsql.service
-# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives. Remove in F45
 %{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
     %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql 10 \
         --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
             %{_unitdir}/zabbix-proxy-pgsql.service
 
 %post proxy-sqlite3
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
-    %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 10 \
-        --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
-            %{_unitdir}/zabbix-proxy-sqlite3.service
-# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2
-# due to a bug in alternatives. Remove in F45
 %{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \
     %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 10 \
         --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \
@@ -798,6 +768,9 @@ fi
 %files web-pgsql
 
 %changelog
+* Wed Jan 29 2025 Funda Wang <fundawang@yeah.net> - 7.0.9-1
+- update to 7.0.9
+
 * Mon Jan 06 2025 Funda Wang <fundawang@yeah.net> - 7.0.8-1
 - update to 7.0.8
 
-- 
Gitee