summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--sources2
-rw-r--r--zabbix-out-of-tree.patch7
-rw-r--r--zabbix.spec11
4 files changed, 17 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 0ac77f8..7ddf1f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/zabbix-6.0.38.tar.gz
+/zabbix-6.0.40.tar.gz
+/zabbix-6.0.42.tar.gz
diff --git a/sources b/sources
index 23c90c6..768823e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec293f740ee50e32079825a7bc022abc zabbix-6.0.38.tar.gz
+bb700c1868495c4bbae4102292f60476 zabbix-6.0.42.tar.gz
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch
index 59d3e6d..b35dae3 100644
--- a/zabbix-out-of-tree.patch
+++ b/zabbix-out-of-tree.patch
@@ -667,13 +667,14 @@ diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am zabbix-6.0.25/src/zabbix_get/M
diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java/Makefile.am
--- zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:18:09.889569717 +0800
+++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:26:48.421352435 +0800
-@@ -9,22 +9,22 @@
+@@ -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 32e4ea6..18216c0 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -1,7 +1,7 @@
%global srcname zabbix
Name: zabbix
-Version: 6.0.38
+Version: 6.0.42
Release: 1
Summary: The Enterprise-class open source monitoring solution
License: GPLv2
@@ -683,6 +683,15 @@ fi
%files web-pgsql
%changelog
+* Fri Oct 03 2025 Funda Wang <fundawang@yeah.net> - 6.0.42-1
+- 6.0.42
+
+* Thu Jul 31 2025 Funda Wang <fundawang@yeah.net> - 6.0.40-1
+- 6.0.40
+
+* Thu Feb 27 2025 Funda Wang <fundawang@yeah.net> - 6.0.39-1
+- 6.0.39
+
* Wed Jan 29 2025 Funda Wang <fundawang@yeah.net> - 6.0.38-1
- 6.0.38