diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index cf2dbe2..011aa04 100644 --- a/.gitignore +++ b/.gitignore @@ -112,15 +112,7 @@ 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 +/zabbix-7.2.12.tar.gz +/zabbix-7.2.13.tar.gz +/zabbix-7.2.14.tar.gz +/zabbix-7.2.15.tar.gz diff --git a/plans/dsp.fmf b/plans/dsp.fmf deleted file mode 100644 index 9fefb8a..0000000 --- a/plans/dsp.fmf +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/sources b/sources index 5e8c08d..432d010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6 +SHA512 (zabbix-7.2.15.tar.gz) = 8ceb2dcdd0b4306139ed0b78d584a3e92e16c6ffa8210e10ea3e28f84686984ce616de9c73347e02e52eac4ac47436588b7a1d9342f49917fc61c796d754cbe5 diff --git a/tests/tests-DSP.yml b/tests/tests-DSP.yml new file mode 100644 index 0000000..498df08 --- /dev/null +++ b/tests/tests-DSP.yml @@ -0,0 +1,37 @@ +- 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) -- //.(te|if|fc) + # or path in the src.rpm if there is no tar archive -- //.(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 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index b584193..48ddc52 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -2,6 +2,14 @@ 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)" @@ -24,6 +32,99 @@ 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 @@ -56,102 +157,3 @@ 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) - diff --git a/zabbix.spec b/zabbix.spec index d01b2d9..29a5177 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.14 +Version: 7.2.15 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.4/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.2/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -839,59 +839,17 @@ fi %files web-pgsql %changelog -* Tue Aug 25 2026 Gwyn Ciesla - 1:7.4.14-1 -- 7.4.14 +* Wed Dec 17 2025 Gwyn Ciesla - 1:7.2.15-1 +- 7.2.15 -* Thu Aug 20 2026 Gwyn Ciesla - 1:7.4.13-1 -- 7.4.13 +* Wed Oct 29 2025 Gwyn Ciesla - 1:7.2.14-1 +- 7.2.14 -* Fri Jul 17 2026 Fedora Release Engineering - 1:7.4.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild +* Wed Oct 01 2025 Gwyn Ciesla - 1:7.2.13-1 +- 7.2.13 -* Thu Jul 09 2026 Gwyn Ciesla - 1:7.4.12-1 -- 7.4.12 - -* Sat Jun 13 2026 Yaakov Selkowitz - 1:7.4.9-3 -- Rebuilt for openssl 4.0 - -* Mon Apr 13 2026 Gwyn Ciesla - 1:7.4.9-2 -- Openssl rebuild - -* Thu Apr 09 2026 Gwyn Ciesla - 1:7.4.9-1 -- 7.4.9 - -* Fri Mar 13 2026 Gwyn Ciesla - 1:7.4.8-1 -- 7.4.8 - -* Fri Feb 13 2026 Gwyn Ciesla - 1:7.4.7-1 -- 7.4.7 - -* Fri Jan 23 2026 Benjamin A. Beasley - 1:7.4.6-3 -- Rebuilt for net-snmp 5.9.5.2 - -* Sat Jan 17 2026 Fedora Release Engineering - 1:7.4.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Dec 18 2025 Gwyn Ciesla - 1:7.4.6-1 -- 7.4.6 - -* Mon Nov 03 2025 Gwyn Ciesla - 1:7.4.5-1 -- 7.4.5 - -* Wed Oct 29 2025 Gwyn Ciesla - 1:7.4.4-1 -- 7.4.4 - -* Wed Oct 01 2025 Gwyn Ciesla - 1:7.4.3-1 -- 7.4.3 - -* Mon Aug 25 2025 Gwyn Ciesla - 1:7.4.2-1 -- 7.4.2 - -* Thu Jul 31 2025 Gwyn Ciesla - 1:7.4.1-1 -- 7.4.1 - -* Fri Jul 25 2025 Fedora Release Engineering - 1:7.2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Tue Aug 19 2025 Gwyn Ciesla - 1:7.2.12-1 +- 7.2.12 * Tue Jul 22 2025 Gwyn Ciesla - 1:7.2.11-1 - 7.2.11