7.4.14

The test repo was migrated to github due to Pagure being retired.
https://communityblog.fedoraproject.org/the-forge-is-our-new-home/

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -112,3 +112,15 @@ zabbix-1.8.2.tar.gz
 /zabbix-7.2.9.tar.gz
 /zabbix-7.2.10.tar.gz
 /zabbix-7.2.11.tar.gz
+/zabbix-7.4.1.tar.gz
+/zabbix-7.4.2.tar.gz
+/zabbix-7.4.3.tar.gz
+/zabbix-7.4.4.tar.gz
+/zabbix-7.4.5.tar.gz
+/zabbix-7.4.6.tar.gz
+/zabbix-7.4.7.tar.gz
+/zabbix-7.4.8.tar.gz
+/zabbix-7.4.9.tar.gz
+/zabbix-7.4.12.tar.gz
+/zabbix-7.4.13.tar.gz
+/zabbix-7.4.14.tar.gz

plans/dsp.fmf

@@ -0,0 +1,22 @@
+summary: DSP test suite
+discover:
+  - name: DSP_test
+    how: fmf
+    url: https://github.com/fedora-selinux/DSP_test.git
+    ref: main
+
+execute:
+    how: tmt
+
+environment:
+    trigger: FedoraCI
+    # DSP_test specific variables:
+    TEST_RPM: "zabbix-selinux"
+    TEST_POLICY: "zabbix"
+
+prepare:
+    how: install
+    package:
+        - zabbix-selinux
+        - autoconf
+        - automake

sources

@@ -1 +1 @@
-SHA512 (zabbix-7.2.11.tar.gz) = 6ddf058f822acbc133543dbc15253335cd48f25ccd5cf50641e9109ba3df1c98c1a211ce510f4ad3ebf9c221e7acbdb8619f3aa39c0d2d5d6e189a75b55bafcd
+SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6

tests/tests-DSP.yml

@@ -1,37 +0,0 @@
-- hosts: localhost
-
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-      - repo: https://pagure.io/DSP_test.git
-        dest: DSP_test
-        version: master
-
-    tests:
-    - DSP_test
-    environment:
-      # RPM package containing the policy module
-      TEST_RPM: zabbix-selinux
-      # policy module name
-      TEST_POLICY: zabbix
-      # policy sources will be extracted from corresponding .src.rpm
-      # policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz") 
-      # or empty string if policy sources are not inside a tar archive
-      POLICY_TAR: ''
-      # path to policy sources (in of the tar archive) -- <POLICY_TAR>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
-      # or path in the src.rpm if there is no tar archive -- <src.rpm>/<POLICY_PATH>/<TEST_POLICY>.(te|if|fc)
-      # can contain wildcards (e.g. for versions etc.)
-      POLICY_PATH: .
-
-    required_packages:
-    - policycoreutils
-    - selinux-policy
-    - selinux-policy-targeted
-    - setools-console
-    - libselinux-utils
-    - rpm
-    - tar
-    - git
-    - zabbix-selinux

zabbix-out-of-tree.patch

@@ -2,14 +2,6 @@ diff --git a/src/go/Makefile.am b/src/go/Makefile.am
 index 3e24aa0..308e34b 100644
 --- a/src/go/Makefile.am
 +++ b/src/go/Makefile.am
-@@ -67,6 +67,7 @@ clean: clean-go-build clean-sbom
- 
- clean-go-build:
- 	-$(GO) clean ./...
-+	-$(GO) clean $(srcdir)/...
- 	-rm -f bin/mock_server
- 	-rm -f bin/zabbix_agent2
- 	-rm -f bin/zabbix_web_service
 @@ -89,9 +90,9 @@ install-bin/zabbix_agent2: bin/zabbix_agent2
  	$(INSTALL) -d "$(DESTDIR)$(sbindir)"
  	$(INSTALL_PROGRAM) bin/zabbix_agent2 "$(DESTDIR)$(sbindir)"
@@ -32,99 +24,6 @@ index b217fb5..945a673 100644
  	$(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)"
 -	test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)"
 +	test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)"
-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,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.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
-+JUNIT = $(srcdir)/tests/junit-4.8.2.jar
- 
- ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
- 
- all: $(ZJG)
- 
--$(ZJG): class src/com/zabbix/gateway/*.java
--	$(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java
-+$(ZJG): class $(srcdir)/src/com/zabbix/gateway/*.java
-+	$(JAVAC) -d class/src -classpath $(LIB) $(srcdir)/src/com/zabbix/gateway/*.java
- 	$(JAR) cf $(ZJG) -C class/src .
- 
- test: class
- 	echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
- 	chmod 600 tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
--	$(JAVAC) tests/com/zabbix/gateway/jmx_test_beans/*.java
--	$(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/gateway/*.java
-+	$(JAVAC) tests/com/zabbix/gateway/jmx_$(srcdir)/test_beans/*.java
-+	$(JAVAC) -d class/tests -classpath class/src:$(JUNIT) $(srcdir)/tests/com/zabbix/gateway/*.java
- 	java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner
- 
- class:
-diff --git a/src/zabbix_js/Makefile.am b/src/zabbix_js/Makefile.am
-index 1e4fd93..2110656 100644
---- a/src/zabbix_js/Makefile.am
-+++ b/src/zabbix_js/Makefile.am
-@@ -5,30 +5,30 @@
- zabbix_js_SOURCES = zabbix_js.c
- 
- zabbix_js_LDADD = \
--	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
--	$(top_srcdir)/src/libs/zbxembed/libzbxembed.a \
--	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
--	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
--	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
--	$(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \
--	$(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \
--	$(top_srcdir)/src/libs/zbxprof/libzbxprof.a \
--	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
--	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
--	$(top_srcdir)/src/libs/zbxip/libzbxip.a \
--	$(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \
--	$(top_srcdir)/src/libs/zbxhash/libzbxhash.a \
--	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
--	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
--	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
--	$(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \
--	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
--	$(top_srcdir)/src/libs/zbxstr/libzbxstr.a \
--	$(top_srcdir)/src/libs/zbxnum/libzbxnum.a \
--	$(top_srcdir)/src/libs/zbxtime/libzbxtime.a \
--	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
--	$(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \
--	$(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a
-+	$(top_builddir)/src/libs/zbxlog/libzbxlog.a \
-+	$(top_builddir)/src/libs/zbxembed/libzbxembed.a \
-+	$(top_builddir)/src/libs/zbxjson/libzbxjson.a \
-+	$(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \
-+	$(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \
-+	$(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \
-+	$(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \
-+	$(top_builddir)/src/libs/zbxprof/libzbxprof.a \
-+	$(top_builddir)/src/libs/zbxnix/libzbxnix.a \
-+	$(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \
-+	$(top_builddir)/src/libs/zbxip/libzbxip.a \
-+	$(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \
-+	$(top_builddir)/src/libs/zbxhash/libzbxhash.a \
-+	$(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \
-+	$(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \
-+	$(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \
-+	$(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \
-+	$(top_builddir)/src/libs/zbxxml/libzbxxml.a \
-+	$(top_builddir)/src/libs/zbxstr/libzbxstr.a \
-+	$(top_builddir)/src/libs/zbxnum/libzbxnum.a \
-+	$(top_builddir)/src/libs/zbxtime/libzbxtime.a \
-+	$(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \
-+	$(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \
-+	$(top_builddir)/src/libs/zbxcurl/libzbxcurl.a
- 
- zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS)
- 
 diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
 index b56f8a8..44800a0 100644
 --- a/src/zabbix_proxy/Makefile.am
@@ -157,3 +56,102 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac
  
  AC_CANONICAL_BUILD
  AC_CANONICAL_HOST
+--- zabbix-7.4.3/src/go/Makefile.am~	2025-10-01 09:49:27.351910250 -0500
++++ zabbix-7.4.3/src/go/Makefile.am	2025-10-01 10:33:26.662210424 -0500
+@@ -64,6 +64,7 @@
+ clean-go-build:
+ 	-$(GO) clean ./...
+ 	-$(GO) clean -cache
++	-$(GO) clean $(srcdir)/...
+ 	-rm -f bin/mock_server
+ 	-rm -f bin/zabbix_agent2
+ 	-rm -f bin/zabbix_web_service
+--- a/src/zabbix_java/Makefile.am~	2026-07-07 09:04:30.341683492 -0500
++++ b/src/zabbix_java/Makefile.am	2026-07-09 10:47:55.481651595 -0500
+@@ -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.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:$(srcdir)lib/dnsjava-3.6.4.jar
+ 
+-JUNIT = tests/junit-4.8.2.jar
++JUNIT = $(srcdir)tests/junit-4.8.2.jar
+ 
+ ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
+ 
+ all: $(ZJG)
+ 
+-$(ZJG): class src/com/zabbix/gateway/*.java
+-	$(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java
++$(ZJG): class $(srcdir)src/com/zabbix/gateway/*.java
++	$(JAVAC) -d class/src -classpath $(LIB) $(srcdir)src/com/zabbix/gateway/*.java
+ 	$(JAR) cf $(ZJG) -C class/src .
+ 
+ test: class
+ 	echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
+ 	chmod 600 tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password
+-	$(JAVAC) tests/com/zabbix/gateway/jmx_test_beans/*.java
+-	$(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/gateway/*.java
++	$(JAVAC) tests/com/zabbix/gateway/jmx_$(srcdir)/test_beans/*.java
++	$(JAVAC) -d class/tests -classpath class/src:$(JUNIT) $(srcdir)tests/com/zabbix/gateway/*.java
+ 	java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner
+ 
+ class:
+--- a/src/zabbix_js/Makefile.am.orig	2026-07-09 10:49:49.036634968 -0500
++++ b/src/zabbix_js/Makefile.am	2026-07-09 10:50:03.475753570 -0500
+@@ -5,30 +5,30 @@
+ zabbix_js_SOURCES = zabbix_js.c
+ 
+ zabbix_js_LDADD = \
+-	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
+-	$(top_srcdir)/src/libs/zbxembed/libzbxembed.a \
+-	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+-	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
+-	$(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \
+-	$(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \
+-	$(top_srcdir)/src/libs/zbxprof/libzbxprof.a \
+-	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+-	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
+-	$(top_srcdir)/src/libs/zbxip/libzbxip.a \
+-	$(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \
+-	$(top_srcdir)/src/libs/zbxhash/libzbxhash.a \
+-	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
+-	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
+-	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
+-	$(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \
+-	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
+-	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
+-	$(top_srcdir)/src/libs/zbxstr/libzbxstr.a \
+-	$(top_srcdir)/src/libs/zbxnum/libzbxnum.a \
+-	$(top_srcdir)/src/libs/zbxtime/libzbxtime.a \
+-	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
+-	$(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \
+-	$(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a
++	$(top_builddir)/src/libs/zbxlog/libzbxlog.a \
++	$(top_builddir)/src/libs/zbxembed/libzbxembed.a \
++	$(top_builddir)/src/libs/zbxjson/libzbxjson.a \
++	$(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \
++	$(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \
++	$(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \
++	$(top_builddir)/src/libs/zbxprof/libzbxprof.a \
++	$(top_builddir)/src/libs/zbxnix/libzbxnix.a \
++	$(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \
++	$(top_builddir)/src/libs/zbxip/libzbxip.a \
++	$(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \
++	$(top_builddir)/src/libs/zbxhash/libzbxhash.a \
++	$(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \
++	$(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \
++	$(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \
++	$(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \
++	$(top_builddir)/src/libs/zbxxml/libzbxxml.a \
++	$(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \
++	$(top_builddir)/src/libs/zbxstr/libzbxstr.a \
++	$(top_builddir)/src/libs/zbxnum/libzbxnum.a \
++	$(top_builddir)/src/libs/zbxtime/libzbxtime.a \
++	$(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \
++	$(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \
++	$(top_builddir)/src/libs/zbxcurl/libzbxcurl.a
+ 
+ zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS)
+ 

zabbix.spec

@@ -16,7 +16,7 @@
 
 Name:           zabbix
 Epoch:          1
-Version:        7.2.11
+Version:        7.4.14
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -43,7 +43,7 @@ Summary:        Open-source monitoring solution for your IT infrastructure
 # ui/vendor/paragonie/constant_time_encoding/src/*.php: MIT License
 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
 URL:            https://www.zabbix.com
-Source0:        https://cdn.zabbix.com/zabbix/sources/stable/7.2/zabbix-%{version}.tar.gz
+Source0:        https://cdn.zabbix.com/zabbix/sources/stable/7.4/zabbix-%{version}.tar.gz
 Source1:        %{srcname}-web.conf
 Source2:        %{srcname}-php-fpm.conf
 Source5:        %{srcname}-logrotate.in
@@ -839,6 +839,60 @@ fi
 %files web-pgsql
 
 %changelog
+* Tue Aug 25 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.14-1
+- 7.4.14
+
+* Thu Aug 20 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.13-1
+- 7.4.13
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.4.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Thu Jul 09 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.12-1
+- 7.4.12
+
+* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1:7.4.9-3
+- Rebuilt for openssl 4.0
+
+* Mon Apr 13 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.9-2
+- Openssl rebuild
+
+* Thu Apr 09 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.9-1
+- 7.4.9
+
+* Fri Mar 13 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.8-1
+- 7.4.8
+
+* Fri Feb 13 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.7-1
+- 7.4.7
+
+* Fri Jan 23 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 1:7.4.6-3
+- Rebuilt for net-snmp 5.9.5.2
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.4.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Thu Dec 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.6-1
+- 7.4.6
+
+* Mon Nov 03 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.5-1
+- 7.4.5
+
+* Wed Oct 29 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.4-1
+- 7.4.4
+
+* Wed Oct 01 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.3-1
+- 7.4.3
+
+* Mon Aug 25 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.2-1
+- 7.4.2
+
+* Thu Jul 31 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.4.1-1
+- 7.4.1
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Tue Jul 22 2025 Gwyn Ciesla <gwync@protonmail.com> - 1:7.2.11-1
 - 7.2.11