From 93711872fdc53d349989d3b5e3030a198c1a6760 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 30 Nov 2024 17:01:28 -0700 Subject: [PATCH 1/3] Update to 6.0.36 CVE-2024-42330 rhbz#2329219, CVE-2024-42332 rhbz#2329222, CVE-2024-42333 rhbz#2329225 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9e7b9a4..87bd734 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ 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 diff --git a/sources b/sources index 0ef4001..93d88e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.33.tar.gz) = 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d +SHA512 (zabbix-6.0.36.tar.gz) = d3997e8131bdb320700e8041c628b7b24e9b9db1bcaf60966ce58dc7501cd555094835a1382e4c2ee35c48a5eea79876ad7b51ed66a6d5928b739af19b060082 diff --git a/zabbix.spec b/zabbix.spec index 5750081..e68a1a3 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.36 +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,10 @@ fi %files web-pgsql %changelog +* 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) From 2df1fe8ba49de71818e78d0cf3e4ac153df25499 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 2 Apr 2025 17:28:26 -0600 Subject: [PATCH 2/3] Update to 6.0.39 (CVE-2024-45700, CVE-2024-36469, CVE-2024-42325, CVE-2024-45699) --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 87bd734..63927b4 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 93d88e2..883064e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.36.tar.gz) = d3997e8131bdb320700e8041c628b7b24e9b9db1bcaf60966ce58dc7501cd555094835a1382e4c2ee35c48a5eea79876ad7b51ed66a6d5928b739af19b060082 +SHA512 (zabbix-6.0.39.tar.gz) = 046494cd24880d83c7a174482f1c1a29b5bf0cd6b39d1a0909ca628faf9d2a134a7fed728c8776dce877d4dcaf474ff20683ce95e8884b830d99b32e2962b7c1 diff --git a/zabbix.spec b/zabbix.spec index e68a1a3..849e4c0 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.36 +Version: 6.0.39 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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) From b33e37e34e28e50609e5a879a2b1b908135fc39e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 2 Apr 2025 17:41:55 -0600 Subject: [PATCH 3/3] Update out-of-tree patch --- zabbix-out-of-tree.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index cd7012c..c4ed15b 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 = $(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