From 5e16a70d5a3dd527c551162e0f4ed22ca22485f4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 30 Nov 2024 16:46:30 -0700 Subject: [PATCH 01/12] Update to 6.0.36 CVE-2024-42330 rhbz#2329218, CVE-2024-42332 rhbz#2329221, CVE-2024-42333 rhbz#2329224 --- .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..5d80cd3 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#2329218, CVE-2024-42332 rhbz#2329221, + CVE-2024-42333 rhbz#2329224) + * Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 - Use alternatives name that systemd likes for units (bz#2305855) From 93711872fdc53d349989d3b5e3030a198c1a6760 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 30 Nov 2024 17:01:28 -0700 Subject: [PATCH 02/12] 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 03/12] 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 04/12] 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 From 8d0899c00d81945eb3d33c8a5836b1d161a939f9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 20 Jun 2025 16:18:49 -0500 Subject: [PATCH 05/12] 6.0.40 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 63927b4..6ba6629 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 883064e..73d382b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.39.tar.gz) = 046494cd24880d83c7a174482f1c1a29b5bf0cd6b39d1a0909ca628faf9d2a134a7fed728c8776dce877d4dcaf474ff20683ce95e8884b830d99b32e2962b7c1 +SHA512 (zabbix-6.0.40.tar.gz) = b15517b525a48766d6654676807b75fdb697563693955f0d2b59642a46496914320afc97487c40771c9cdaf23bc0e85b1163942fc0ef9bc1f487ec5d77c8f103 diff --git a/zabbix.spec b/zabbix.spec index 849e4c0..b2b48d5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.39 +Version: 6.0.40 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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) From 22d8d4bca96aec23f0e0ac730998f7e8575969e9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 19 Aug 2025 09:35:29 -0500 Subject: [PATCH 06/12] 6.0.41 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6ba6629..20e63b3 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 73d382b..342dca6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.40.tar.gz) = b15517b525a48766d6654676807b75fdb697563693955f0d2b59642a46496914320afc97487c40771c9cdaf23bc0e85b1163942fc0ef9bc1f487ec5d77c8f103 +SHA512 (zabbix-6.0.41.tar.gz) = 15fd2810a893d77f27cdcfd2cfd14a56b3fce11e8053a6828ed6005bac705602ebcce57ad4ea82d12555980541726dbb28cecd6f4c9891d6fb75205ede1a85a5 diff --git a/zabbix.spec b/zabbix.spec index b2b48d5..aea547b 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.40 +Version: 6.0.41 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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 From b7c1f29133e07b20410f8848053062ffc77718d8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 30 Sep 2025 11:04:29 -0500 Subject: [PATCH 07/12] 6.0.42 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 20e63b3..58e3d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 342dca6..f80594a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.41.tar.gz) = 15fd2810a893d77f27cdcfd2cfd14a56b3fce11e8053a6828ed6005bac705602ebcce57ad4ea82d12555980541726dbb28cecd6f4c9891d6fb75205ede1a85a5 +SHA512 (zabbix-6.0.42.tar.gz) = 3c1d945285bd7914567cbc65c986666ca0f71b112ee7755833b5926ea62b48a43fbb760a17874f8b8cb9ee40921441c188223db5ec7c54dcb7366ac3cae44143 diff --git a/zabbix.spec b/zabbix.spec index aea547b..830ca63 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.41 +Version: 6.0.42 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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 From b129c351b3d9d30e9a317182f229835a92aae4b8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 17 Dec 2025 08:50:27 -0600 Subject: [PATCH 08/12] 6.0.43 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 58e3d3b..5a92edb 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index f80594a..5a70f4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.42.tar.gz) = 3c1d945285bd7914567cbc65c986666ca0f71b112ee7755833b5926ea62b48a43fbb760a17874f8b8cb9ee40921441c188223db5ec7c54dcb7366ac3cae44143 +SHA512 (zabbix-6.0.43.tar.gz) = daa585622f6ce47019a072ceb0aea285d5af1bc397c72fb6ad8d9d7677a3d3274d2c617e8ab734cca0677981a0dc0d2eda665b35b89e21bd84d0d27c6ca26c33 diff --git a/zabbix.spec b/zabbix.spec index 830ca63..c768e5b 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.42 +Version: 6.0.43 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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 From 4dbb6e10a94bf0fd178dd764713c3273b43836e9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 11 Feb 2026 10:08:29 -0600 Subject: [PATCH 09/12] 6.0.44 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5a92edb..2f44f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 5a70f4c..3053003 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.43.tar.gz) = daa585622f6ce47019a072ceb0aea285d5af1bc397c72fb6ad8d9d7677a3d3274d2c617e8ab734cca0677981a0dc0d2eda665b35b89e21bd84d0d27c6ca26c33 +SHA512 (zabbix-6.0.44.tar.gz) = fceea560ed650ce32d2bf9c097e2c7df9431210644cd5833ea805f5b611269fd8b97c287a1e46af771d34d20be7df12488f44dcd546a1e3599cf861277f8806e diff --git a/zabbix.spec b/zabbix.spec index c768e5b..dd560a5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.43 +Version: 6.0.44 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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 From ffc271dd336d0dcf8bfbda44cd386e2b0b1130ad Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 10 Mar 2026 10:09:56 -0500 Subject: [PATCH 10/12] 6.0.45 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2f44f6f..e2503c3 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 3053003..efb9d68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.44.tar.gz) = fceea560ed650ce32d2bf9c097e2c7df9431210644cd5833ea805f5b611269fd8b97c287a1e46af771d34d20be7df12488f44dcd546a1e3599cf861277f8806e +SHA512 (zabbix-6.0.45.tar.gz) = 1252b6c46c1abb6a5c14b9ff09926875db76e4b241d2facae6b22bfbd9f20bcb471c11c41b825f097851bb54daa892d69ffecc0d6164ccfa79d8b18e7b859f83 diff --git a/zabbix.spec b/zabbix.spec index dd560a5..8882102 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.44 +Version: 6.0.45 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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 From 6a0918ba7f1792079845f67406ed3317fbee1302 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 6 May 2026 20:26:00 -0600 Subject: [PATCH 11/12] Update to 6.0.46 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e2503c3..2b43630 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index efb9d68..050fb53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.45.tar.gz) = 1252b6c46c1abb6a5c14b9ff09926875db76e4b241d2facae6b22bfbd9f20bcb471c11c41b825f097851bb54daa892d69ffecc0d6164ccfa79d8b18e7b859f83 +SHA512 (zabbix-6.0.46.tar.gz) = bcc4ffa3727886d0a45b846a3b5071e1e6e51bbebaa3342356185bdfd8639409afafa85686d2d4a37a4c932618179929d8980fefda2b9ce1c149f065dec29bc8 diff --git a/zabbix.spec b/zabbix.spec index 8882102..4ab1242 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.45 +Version: 6.0.46 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ fi %files web-pgsql %changelog +* 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 From 68628210156d7c5d14a547c758ba69675f6d41f3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 10 Jul 2026 08:47:11 -0600 Subject: [PATCH 12/12] Update to 6.0.47 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 2 +- zabbix.spec | 5 ++++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2b43630..31050ff 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ zabbix-1.8.2.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 050fb53..eb316c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.46.tar.gz) = bcc4ffa3727886d0a45b846a3b5071e1e6e51bbebaa3342356185bdfd8639409afafa85686d2d4a37a4c932618179929d8980fefda2b9ce1c149f065dec29bc8 +SHA512 (zabbix-6.0.47.tar.gz) = 919b66c21965c9e128308f9bc19960ad0f5fdc8b3179cfc51dc35344c6f05e28f0601a843c8eaa78f431777415f8487918b8d780ddf933b43ce1c55e0b55e894 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index c4ed15b..f838611 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -670,7 +670,7 @@ diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).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 = 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 diff --git a/zabbix.spec b/zabbix.spec index 4ab1242..f345f72 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.46 +Version: 6.0.47 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -825,6 +825,9 @@ 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