diff --git a/.gitignore b/.gitignore index 9e7b9a4..31050ff 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,13 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.29.tar.gz /zabbix-6.0.30.tar.gz /zabbix-6.0.33.tar.gz +/zabbix-6.0.36.tar.gz +/zabbix-6.0.39.tar.gz +/zabbix-6.0.40.tar.gz +/zabbix-6.0.41.tar.gz +/zabbix-6.0.42.tar.gz +/zabbix-6.0.43.tar.gz +/zabbix-6.0.44.tar.gz +/zabbix-6.0.45.tar.gz +/zabbix-6.0.46.tar.gz +/zabbix-6.0.47.tar.gz diff --git a/sources b/sources index 0ef4001..eb316c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.33.tar.gz) = 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d +SHA512 (zabbix-6.0.47.tar.gz) = 919b66c21965c9e128308f9bc19960ad0f5fdc8b3179cfc51dc35344c6f05e28f0601a843c8eaa78f431777415f8487918b8d780ddf933b43ce1c55e0b55e894 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index cd7012c..f838611 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -666,13 +666,14 @@ diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.25/src/ diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_java/Makefile.am --- zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree 2023-12-13 01:17:17.072075499 -0700 +++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-04 13:32:00.118044618 -0700 -@@ -9,22 +9,22 @@ EXTRA_DIST = \ +@@ -9,23 +9,23 @@ EXTRA_DIST = \ 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/dnsjava-3.6.4.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 5750081..f345f72 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.33 -Release: 2%{?dist} +Version: 6.0.47 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -825,6 +825,37 @@ fi %files web-pgsql %changelog +* Fri Jul 10 2026 Orion Poplawski - 1:6.0.47-1 +- Update to 6.0.47 + +* Thu May 07 2026 Orion Poplawski - 1:6.0.46-1 +- Update to 6.0.46 + +* Tue Mar 10 2026 Gwyn Ciesla - 1:6.0.45-1 +- 6.0.45 + +* Wed Feb 11 2026 Gwyn Ciesla - 1:6.0.44-1 +- 6.0.44 + +* Wed Dec 17 2025 Gwyn Ciesla - 1:6.0.43-1 +- 6.0.43 + +* Tue Sep 30 2025 Gwyn Ciesla - 1:6.0.42-1 +- 6.0.42 + +* Tue Aug 19 2025 Gwyn Ciesla - 1:6.0.41-1 +- 6.0.41 + +* Fri Jun 20 2025 Gwyn Ciesla - 1:6.0.40-1 +- 6.0.40 + +* Wed Apr 02 2025 Orion Poplawski - 1:6.0.39-1 +- Update to 6.0.39 (CVE-2024-45700, CVE-2024-36469, CVE-2024-42325, CVE-2024-45699) + +* Sat Nov 30 2024 Orion Poplawski - 1:6.0.36-1 +- Update to 6.0.36 (CVE-2024-42330 rhbz#2329219, CVE-2024-42332 rhbz#2329222, + CVE-2024-42333 rhbz#2329225) + * Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 - Use alternatives name that systemd likes for units (bz#2305855)