From 0ff9a4461a3617298a978f0019d18aeac9dacb2b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 19 Aug 2024 12:32:52 -0600 Subject: [PATCH 01/34] Update to 7.0.3 License changed upstream to AGPL-3.0-only, note other licenses in source --- .gitignore | 2 + sources | 2 +- zabbix-config.patch | 39 +- zabbix-crypto-policy.patch | 30 +- zabbix-out-of-tree.patch | 1119 +++--------------------------------- zabbix.spec | 51 +- 6 files changed, 158 insertions(+), 1085 deletions(-) diff --git a/.gitignore b/.gitignore index 9e7b9a4..ed37cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,5 @@ 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-7.0.2.tar.gz +/zabbix-7.0.3.tar.gz diff --git a/sources b/sources index 0ef4001..de4962e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.33.tar.gz) = 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d +SHA512 (zabbix-7.0.3.tar.gz) = 22149415712017c2fb504972c9673623ea710842611644a934a9f555685a73e516ecbad566048b5ec05ba6404000687feee0815e7b2c8a04fb8fd154c9539671 diff --git a/zabbix-config.patch b/zabbix-config.patch index 9d58fc6..5d61074 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,7 +1,8 @@ -diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0.2/ui/include/classes/core/CConfigFile.php ---- zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config 2022-03-23 08:38:25.049013803 -0600 -+++ zabbix-6.0.2/ui/include/classes/core/CConfigFile.php 2022-03-23 08:39:25.001657019 -0600 -@@ -25,7 +25,7 @@ class CConfigFile { +diff --git a/ui/include/classes/core/CConfigFile.php b/ui/include/classes/core/CConfigFile.php +index d7ad93a..88b7d5f 100644 +--- a/ui/include/classes/core/CConfigFile.php ++++ b/ui/include/classes/core/CConfigFile.php +@@ -20,7 +20,7 @@ class CConfigFile { const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; @@ -10,10 +11,11 @@ diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0. private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/include/classes/core/ZBase.php ---- zabbix-6.0.2/ui/include/classes/core/ZBase.php.config 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/ui/include/classes/core/ZBase.php 2022-03-23 08:38:25.052013836 -0600 -@@ -368,7 +368,7 @@ class ZBase { +diff --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php +index 51b2165..e57e5a8 100644 +--- a/ui/include/classes/core/ZBase.php ++++ b/ui/include/classes/core/ZBase.php +@@ -392,7 +392,7 @@ class ZBase { * @throws Exception */ protected function setMaintenanceMode() { @@ -22,23 +24,24 @@ diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/i if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -381,7 +381,7 @@ class ZBase { +@@ -405,7 +405,7 @@ class ZBase { * Load zabbix config file. */ - protected function loadConfigFile() { -- $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH; + protected function loadConfigFile(): void { +- $configFile = $this->root_dir.CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; + $config = new CConfigFile($configFile); - $this->config = $config->load(); - } -diff -up zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php ---- zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php 2022-03-23 08:38:25.054013857 -0600 -@@ -271,7 +271,7 @@ class CSetupWizard extends CForm { + +diff --git a/ui/include/classes/setup/CSetupWizard.php b/ui/include/classes/setup/CSetupWizard.php +index 8574868..79d0c72 100644 +--- a/ui/include/classes/setup/CSetupWizard.php ++++ b/ui/include/classes/setup/CSetupWizard.php +@@ -328,7 +328,7 @@ class CSetupWizard extends CForm { // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); -- $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH); +- $config = new CConfigFile(APP::getRootDir().CConfigFile::CONFIG_FILE_PATH); + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH); $config->config = [ 'DB' => [ diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index 8a157ce..cf06a65 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -1,7 +1,21 @@ -diff -up zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy zabbix-5.0.2/src/libs/zbxcrypto/tls.c ---- zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy 2020-07-06 03:54:32.000000000 -0600 -+++ zabbix-5.0.2/src/libs/zbxcrypto/tls.c 2020-07-18 21:22:13.125099598 -0600 -@@ -2932,7 +2932,7 @@ void zbx_tls_init_child(void) +diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go +index be8cf4a..e68b435 100644 +--- a/src/go/pkg/tls/tls.go ++++ b/src/go/pkg/tls/tls.go +@@ -393,7 +393,7 @@ static void *tls_new_context(const char *ca_file, const char *crl_file, const ch + goto out; + #endif + +- if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) ++ if (1 != SSL_CTX_set_cipher_list(ctx, "PROFILES=SYSTEM")) + goto out; + + ret = 0; +diff --git a/src/libs/zbxcomms/tls_openssl.c b/src/libs/zbxcomms/tls_openssl.c +index 40394a3..b2eb0f0 100644 +--- a/src/libs/zbxcomms/tls_openssl.c ++++ b/src/libs/zbxcomms/tls_openssl.c +@@ -1212,7 +1212,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type goto out; } } @@ -10,21 +24,21 @@ diff -up zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy zabbix-5.0.2/src/li { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of certificate" " ciphersuites:"); -@@ -3014,7 +3014,7 @@ void zbx_tls_init_child(void) +@@ -1302,7 +1302,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type goto out; } } - else if (1 != SSL_CTX_set_cipher_list(ctx_psk, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILE=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILES=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of PSK ciphersuites:"); goto out; -@@ -3070,7 +3070,7 @@ void zbx_tls_init_child(void) +@@ -1360,7 +1360,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type goto out; } } - else if (1 != SSL_CTX_set_cipher_list(ctx_all, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILE=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILES=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of all ciphersuites:"); goto out; diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index cd7012c..901d716 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,671 +1,41 @@ -diff -up zabbix-6.0.25/src/go/Makefile.am.out-of-tree zabbix-6.0.25/src/go/Makefile.am ---- zabbix-6.0.25/src/go/Makefile.am.out-of-tree 2024-01-04 13:32:00.055044909 -0700 -+++ zabbix-6.0.25/src/go/Makefile.am 2024-01-04 13:37:56.640412586 -0700 -@@ -59,7 +59,7 @@ build: ${TARGETS} - clean: clean-go-build clean-sbom +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)/... + -$(GO) clean ./... ++ -$(GO) clean $(srcdir)/... -rm -f bin/mock_server -rm -f bin/zabbix_agent2 -rm -f bin/zabbix_web_service -@@ -76,8 +76,8 @@ install-zabbix.com/cmd/zabbix_agent2: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} - $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" -- test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -- for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \ -+ test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -+ for cfg in $(top_srcdir)conf/zabbix_agent2.d/plugins.d/*.conf; do \ - test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ - cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ - done -@@ -151,7 +151,7 @@ sbom-mod: sbom-mod.json - sbom: sbom-apps sbom-mod - - check: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... - style: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... - format: -diff -up zabbix-6.0.25/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxalgo/Makefile.am.out-of-tree 2023-12-13 01:17:33.180166583 -0700 -+++ zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-04 13:32:00.057044900 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalgo.a - - if SERVER -diff -up zabbix-6.0.25/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.25/src/libs/zbxaudit/Makefile.am.out-of-tree 2023-12-13 01:17:33.184166606 -0700 -+++ zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-04 13:32:00.058044895 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxaudit.a - - libzbxaudit_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.25/src/libs/zbxavailability/Makefile.am.out-of-tree 2023-12-13 01:17:33.184166606 -0700 -+++ zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-04 13:32:00.059044890 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxavailability.a - - libzbxavailability_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommon/Makefile.am.out-of-tree 2023-12-13 01:17:33.188166628 -0700 -+++ zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-04 13:32:00.061044881 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcommon.a - - libzbxcommon_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 -+++ zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-04 13:32:00.062044877 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcommshigh.a - - libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcomms/Makefile.am.out-of-tree 2023-12-13 01:17:33.188166628 -0700 -+++ zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-04 13:32:00.063044872 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcomms.a - - libzbxcomms_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcompress/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 -+++ zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-04 13:32:00.063044872 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcompress.a - - libzbxcompress_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxconf/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 -+++ zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-04 13:32:00.064044867 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxconf.a - - libzbxconf_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 -+++ zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-04 13:32:00.065044863 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcrypto.a - - libzbxcrypto_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 -+++ zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-04 13:32:00.065044863 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbcache.a - - libzbxdbcache_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2023-12-13 01:17:33.200166696 -0700 -+++ zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-04 13:32:00.066044858 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - if DBSCHEMA - dbschema.c: $(top_srcdir)/create/src/schema.tmpl - $(top_srcdir)/create/bin/gen_schema.pl c > dbschema.c -diff -up zabbix-6.0.25/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdb/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 -+++ zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-04 13:32:00.066044858 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdb.a - - libzbxdb_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2023-12-13 01:17:33.204166719 -0700 -+++ zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-04 13:32:00.067044854 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbupgrade.a - - libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdiag/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 -+++ zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-04 13:32:00.068044849 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a - - libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.25/src/libs/zbxembed/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 -+++ zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-04 13:32:00.068044849 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxembed.a - - libzbxembed_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.25/src/libs/zbxeval/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 -+++ zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-04 13:32:00.069044844 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxeval.a - - libzbxeval_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.25/src/libs/zbxexec/Makefile.am.out-of-tree 2023-12-13 01:17:17.040075318 -0700 -+++ zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-04 13:32:00.070044840 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxexec.a - - libzbxexec_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxha/Makefile.am ---- zabbix-6.0.25/src/libs/zbxha/Makefile.am.out-of-tree 2023-12-13 01:17:29.108143557 -0700 -+++ zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-04 13:32:00.071044835 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxha.a - - libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhistory/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-04 13:32:00.072044830 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhistory.a - - libzbxhistory_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhttp/Makefile.am.out-of-tree 2023-12-13 01:17:17.044075341 -0700 -+++ zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-04 13:32:00.073044826 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttp.a - - libzbxhttp_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-04 13:32:00.074044821 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxicmpping.a - - libzbxicmpping_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-04 13:32:00.075044817 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxipcservice.a - - libzbxipcservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.25/src/libs/zbxjson/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 -+++ zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-04 13:32:00.076044812 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxjson.a - - libzbxjson_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.25/src/libs/zbxlog/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 -+++ zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-04 13:32:00.077044807 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlog.a - - libzbxlog_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmedia/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-04 13:32:00.078044803 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmedia.a - - libzbxmedia_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmemory/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-04 13:32:00.079044798 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmemory.a - - libzbxmemory_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmodules/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 -+++ zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-04 13:32:00.082044784 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmodules.a - - libzbxmodules_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxnix/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-04 13:32:00.083044780 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxnix.a - - libzbxnix_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxprof/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxprof/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprof/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 -+++ zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-04 13:32:00.083044780 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxprof.a - - libzbxprof_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 -+++ zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-04 13:32:00.084044775 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxprometheus.a - - libzbxprometheus_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxregexp/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 -+++ zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-04 13:32:00.085044770 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxregexp.a - - libzbxregexp_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.25/src/libs/zbxrtc/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 -+++ zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-04 13:32:00.085044770 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = \ - libzbxrtc.a \ - libzbxrtc_service.a \ -diff -up zabbix-6.0.25/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxself/Makefile.am ---- zabbix-6.0.25/src/libs/zbxself/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 -+++ zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-04 13:32:00.086044766 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxself.a libzbxself_server.a libzbxself_proxy.a - - libzbxself_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.25/src/libs/zbxserver/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 -+++ zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-04 13:32:00.087044761 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a - - libzbxserver_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxservice/Makefile.am.out-of-tree 2023-12-13 01:17:17.056075408 -0700 -+++ zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-04 13:32:00.087044761 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxservice.a - - libzbxservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2023-12-13 01:17:29.120143625 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-04 13:32:00.088044757 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libagentsysinfo.a - - libagentsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2024-01-04 13:32:00.089044752 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-04 13:34:08.285453006 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-04 13:32:00.090044747 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a - - libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.091044743 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-04 13:35:35.946050650 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2024-01-04 13:32:00.093044733 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-04 13:36:03.172925688 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2024-01-04 13:32:00.095044724 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-04 13:34:22.857386127 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-04 13:32:00.097044715 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - DIST_SUBDIRS = \ - agent \ - common \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.098044710 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-04 13:34:53.065247481 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.099044706 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-04 13:34:38.921312399 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2024-01-04 13:32:00.103044687 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-04 13:35:51.154980846 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2024-01-04 13:32:00.104044683 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-04 13:35:04.864193319 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2023-12-13 01:17:33.228166854 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-04 13:32:00.106044673 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libsimplesysinfo.a - - libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2024-01-04 13:32:00.107044669 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-04 13:35:19.524126021 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2024-01-04 13:32:00.108044664 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-04 13:36:27.379816202 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsys/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 -+++ zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-04 13:32:00.110044655 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsys.a - - libzbxsys_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtasks/Makefile.am.out-of-tree 2023-12-13 01:17:17.064075454 -0700 -+++ zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-04 13:32:00.110044655 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtasks.a - - libzbxtasks_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtrends/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-04 13:32:00.111044650 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = \ - libzbxtrends.a \ - libzbxtrends_baseline.a -diff -up zabbix-6.0.25/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.25/src/libs/zbxvault/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-04 13:32:00.113044641 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvault.a - - libzbxvault_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.25/src/libs/zbxxml/Makefile.am.out-of-tree 2023-12-13 01:17:17.068075476 -0700 -+++ zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-04 13:32:00.114044637 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxxml.a - - libzbxxml_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-04 13:32:00.114044637 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlogfiles.a - - libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_agent/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-04 13:32:00.116044627 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - logfiles - -@@ -79,4 +81,4 @@ zabbix_agentd_CFLAGS = \ +@@ -89,9 +90,9 @@ install-bin/zabbix_agent2: bin/zabbix_agent2 + $(INSTALL) -d "$(DESTDIR)$(sbindir)" + $(INSTALL_PROGRAM) bin/zabbix_agent2 "$(DESTDIR)$(sbindir)" + $(INSTALL) -d "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)" +- $(INSTALL_DATA) conf/zabbix_agent2.conf "$(DESTDIR)$(sysconfdir)" ++ $(INSTALL_DATA) $(top_srcdir)/src/go/conf/zabbix_agent2.conf "$(DESTDIR)$(sysconfdir)" + $(INSTALL) -d "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)" +- (cd conf/zabbix_agent2.d/plugins.d && \ ++ (cd $(top_srcdir)/conf/zabbix_agent2.d/plugins.d && \ + for _f in *.conf; do \ + $(INSTALL_DATA) $${_f} "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)"; \ + done) +diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am +index b217fb5..945a673 100644 +--- a/src/zabbix_agent/Makefile.am ++++ b/src/zabbix_agent/Makefile.am +@@ -69,4 +69,4 @@ zabbix_agentd_CFLAGS = \ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d" $(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 -up zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_get/Makefile.am ---- zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-04 13:32:00.117044623 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_get - - zabbix_get_SOURCES = \ -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 +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,22 +9,22 @@ EXTRA_DIST = \ startup.sh @@ -695,426 +65,93 @@ diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.25/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_js/Makefile.am ---- zabbix-6.0.25/src/zabbix_js/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-04 13:32:00.119044613 -0700 -@@ -1,26 +1,28 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_js - +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/zbxprof/libzbxprof.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/zbxsys/libzbxsys.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/zbxcommon/libzbxcommon.a \ - $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ -- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.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/zbxxml/libzbxxml.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/zbxprof/libzbxprof.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/zbxsys/libzbxsys.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/zbxcommon/libzbxcommon.a \ + $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ -+ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.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/zbxxml/libzbxxml.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 -up zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-04 13:32:00.119044613 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdatasender.a - - libzbxdatasender_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-04 13:32:00.120044609 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxheart.a - - libzbxheart_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-04 13:32:00.121044604 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-04 13:32:00.122044600 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - heart \ - housekeeper \ -@@ -112,4 +114,4 @@ install-data-hook: +diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am +index b56f8a8..44800a0 100644 +--- a/src/zabbix_proxy/Makefile.am ++++ b/src/zabbix_proxy/Makefile.am +@@ -151,4 +151,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" + test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-04 13:32:00.123044595 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxyconfig.a - - libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-04 13:32:00.125044586 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_sender/Makefile.am ---- zabbix-6.0.25/src/zabbix_sender/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-04 13:32:00.126044581 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_sender - - zabbix_sender_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-04 13:32:00.127044576 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalerter.a - - libzbxalerter_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/availability/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-04 13:32:00.128044572 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libavailability.a - - libavailability_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-04 13:32:00.128044572 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbconfig.a - - libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-04 13:32:00.129044567 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbsyncer.a - - libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-04 13:32:00.130044563 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiscoverer.a - - libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-04 13:32:00.131044558 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxescalator.a - - libzbxescalator_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ha/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-04 13:32:00.132044553 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxha.a - - libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-04 13:32:00.133044549 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-04 13:32:00.137044530 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttppoller.a - - libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-04 13:32:00.140044516 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libipmi.a - - libipmi_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/lld/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-04 13:32:00.140044516 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlld.a - - libzbxlld_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-04 13:32:00.141044512 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - alerter \ - dbsyncer \ -@@ -151,4 +153,4 @@ install-data-hook: +diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am +index 0a55934..a7f6a28 100644 +--- a/src/zabbix_server/Makefile.am ++++ b/src/zabbix_server/Makefile.am +@@ -186,4 +186,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am.out-of-tree 2023-12-13 01:17:29.148143783 -0700 -+++ zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-04 13:32:00.142044507 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +--- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600 ++++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600 +@@ -24,7 +24,7 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxodbc.a + AC_CONFIG_HEADERS(include/common/config.h) - libzbxodbc_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am.out-of-tree 2023-12-13 01:17:33.248166967 -0700 -+++ zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-04 13:32:00.143044503 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +-AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include']) ++AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include']) -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpinger.a + AC_CANONICAL_HOST - libzbxpinger_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/poller/Makefile.am.out-of-tree 2023-12-13 01:17:33.248166967 -0700 -+++ zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-04 13:32:00.143044503 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a - - libzbxpoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 -+++ zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-04 13:32:00.144044498 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libpreprocessor.a - - libpreprocessor_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 -+++ zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-04 13:32:00.146044489 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxypoller.a - - libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 -+++ zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-04 13:32:00.150044470 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxreporter.a - - libzbxreporter_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-04 13:32:00.151044466 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxscripts.a - - libzbxscripts_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-04 13:32:00.152044461 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxselfmon.a - - libzbxselfmon_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/service/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-04 13:32:00.153044456 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libservice.a - - libservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-04 13:32:00.157044438 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsnmptrapper.a - - libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-04 13:32:00.157044438 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/timer/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-04 13:32:00.158044433 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtimer.a - - libzbxtimer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-04 13:32:00.160044424 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a - - libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-04 13:32:00.160044424 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvmware.a - - libzbxvmware_a_SOURCES = \ diff --git a/zabbix.spec b/zabbix.spec index 5750081..8b57445 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,14 +16,34 @@ Name: zabbix Epoch: 1 -Version: 6.0.33 -Release: 2%{?dist} +Version: 7.0.3 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +# TODO - Note additional licenses in src/go when we start building with go +# src/libs/zbxembed/duktape.c: MIT License +# src/libs/zbxembed/duktape.h: MIT License +# src/libs/zbxgetopt/getopt.c: GNU General Public License v2.0 or later +# src/libs/zbxhash/md5.c: zlib License +# ui/vendor/composer/LICENSE: MIT License +# ui/js/vendors/D3/LICENSE: ISC License +# ui/js/vendors/Leaflet/LICENSE: BSD 2-Clause License +# ui/js/vendors/Leaflet.markercluster/LICENSE: MIT License +# ui/js/vendors/jQueryUI/LICENSE: MIT License +# ui/js/vendors/qrcode/LICENSE: MIT License +# ui/vendor/duosecurity/duo_universal_php/LICENSE: BSD 3-Clause License +# ui/vendor/firebase/php-jwt/LICENSE: BSD 3-Clause License +# ui/vendor/onelogin/php-saml/LICENSE: MIT License +# ui/vendor/paragonie/constant_time_encoding/LICENSE.txt: MIT License +# ui/vendor/pragmarx/google2fa/LICENSE.md: MIT License +# ui/vendor/symfony/deprecation-contracts/LICENSE: MIT License +# ui/vendor/symfony/polyfill-ctype/LICENSE: MIT License +# ui/vendor/symfony/yaml/LICENSE: MIT License +# ui/assets/styles/vendors/Leaflet/LICENSE: BSD 2-Clause License +# 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/6.0/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -50,16 +70,14 @@ Patch0: %{srcname}-config.patch Patch1: %{srcname}-out-of-tree.patch # Enforce Fedora Crypto Policy Patch2: %{srcname}-crypto-policy.patch -Patch3: %{srcname}-configure-sscanf.patch +# Add to sscanf check +# https://support.zabbix.com/browse/ZBX-21946 +Patch3: %{srcname}-configure-sscanf.patch # Patch1 patches automake files so we need to autoreconf BuildRequires: libtool BuildRequires: make -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: mariadb-connector-c-devel -%else -BuildRequires: mysql-devel -%endif BuildRequires: libpq-devel BuildRequires: sqlite-devel BuildRequires: net-snmp-devel @@ -172,7 +190,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-mysql Requires: %{name}-server = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} @@ -185,7 +202,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-server = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-pgsql Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} @@ -223,7 +239,6 @@ Requires: %{name}-proxy = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-mysql Provides: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives %description proxy-mysql @@ -235,7 +250,6 @@ Requires: %{name}-proxy = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-pgsql Provides: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives %description proxy-pgsql @@ -247,7 +261,6 @@ Requires: %{name}-proxy = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-sqlite3 Provides: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives %description proxy-sqlite3 @@ -264,9 +277,9 @@ Requires: php-json Requires: php-ldap Requires: php-mbstring Requires: php-xml -# jquery 3.3.1 and jquery-ui 1.12.1 in the sources +# jquery 3.6.0 and jquery-ui 1.13.2 in the sources Requires: js-jquery >= 3.6.0 -Provides: bundled(js-jquery-ui) = 1.12.1 +Provides: bundled(js-jquery-ui) = 1.13.2 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype Requires: dejavu-sans-fonts @@ -825,6 +838,10 @@ fi %files web-pgsql %changelog +* Sat Aug 24 2024 Orion Poplawski - 1:7.0.3-1 +- Update to 7.0.3 +- License changed upstream to AGPL-3.0-only, note other licenses in source + * Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 - Use alternatives name that systemd likes for units (bz#2305855) From 22167b38b7321adfa6e37ef6f1c5ef466c7a6ae2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 25 Sep 2024 21:41:09 -0600 Subject: [PATCH 02/34] Update to 7.0.4 --- .gitignore | 1 + sources | 2 +- zabbix-crypto-policy.patch | 14 +++++++------- zabbix.spec | 5 ++++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ed37cb9..58a7a92 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.33.tar.gz /zabbix-7.0.2.tar.gz /zabbix-7.0.3.tar.gz +/zabbix-7.0.4.tar.gz diff --git a/sources b/sources index de4962e..d8c6cb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.3.tar.gz) = 22149415712017c2fb504972c9673623ea710842611644a934a9f555685a73e516ecbad566048b5ec05ba6404000687feee0815e7b2c8a04fb8fd154c9539671 +SHA512 (zabbix-7.0.4.tar.gz) = 4c4b05d2371a2e78c0b419e467ecb261911096b3603b52aab296aa40ab86cdb4e7006703c9aa5a63f0cfee93bc5320c402b083b45497cdd5d804ed7e774f291e diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index cf06a65..c81adb0 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -1,16 +1,16 @@ diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go -index be8cf4a..e68b435 100644 +index b7ddff4..063eb02 100644 --- a/src/go/pkg/tls/tls.go +++ b/src/go/pkg/tls/tls.go -@@ -393,7 +393,7 @@ static void *tls_new_context(const char *ca_file, const char *crl_file, const ch - goto out; +@@ -406,6 +406,8 @@ static void *tls_new_context(const char *ca_file, const char *crl_file, const ch #endif + if (NULL != cipher) + ciphers = cipher; ++ else ++ ciphers = "PROFILES=SYSTEM"; -- if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) -+ if (1 != SSL_CTX_set_cipher_list(ctx, "PROFILES=SYSTEM")) + if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) goto out; - - ret = 0; diff --git a/src/libs/zbxcomms/tls_openssl.c b/src/libs/zbxcomms/tls_openssl.c index 40394a3..b2eb0f0 100644 --- a/src/libs/zbxcomms/tls_openssl.c diff --git a/zabbix.spec b/zabbix.spec index 8b57445..a7dd07e 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.0.3 +Version: 7.0.4 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Thu Sep 26 2024 Orion Poplawski - 1:7.0.4-1 +- Update to 7.0.4 + * Sat Aug 24 2024 Orion Poplawski - 1:7.0.3-1 - Update to 7.0.3 - License changed upstream to AGPL-3.0-only, note other licenses in source From 70dbeedb8a771b5a1996a037bf12430a4336d7a4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 6 Oct 2024 19:46:22 -0600 Subject: [PATCH 03/34] Fix typo in crypto policy patch that broke SSL connections --- zabbix-crypto-policy.patch | 6 +++--- zabbix.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index c81adb0..4f9f49a 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -7,7 +7,7 @@ index b7ddff4..063eb02 100644 if (NULL != cipher) ciphers = cipher; + else -+ ciphers = "PROFILES=SYSTEM"; ++ ciphers = "PROFILE=SYSTEM"; if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) goto out; @@ -29,7 +29,7 @@ index 40394a3..b2eb0f0 100644 } } - else if (1 != SSL_CTX_set_cipher_list(ctx_psk, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILES=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILE=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of PSK ciphersuites:"); goto out; @@ -38,7 +38,7 @@ index 40394a3..b2eb0f0 100644 } } - else if (1 != SSL_CTX_set_cipher_list(ctx_all, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILES=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILE=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of all ciphersuites:"); goto out; diff --git a/zabbix.spec b/zabbix.spec index a7dd07e..0458f59 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Mon Oct 07 2024 Orion Poplawski - 1:7.0.4-2 +- Fix typo in crypto policy patch that broke SSL connections + * Thu Sep 26 2024 Orion Poplawski - 1:7.0.4-1 - Update to 7.0.4 From 4f152bb914863a6b686722bd055c947cc6d49075 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 22 Oct 2024 07:52:57 -0600 Subject: [PATCH 04/34] Update to 7.0.5 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 58a7a92..3cacd56 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.2.tar.gz /zabbix-7.0.3.tar.gz /zabbix-7.0.4.tar.gz +/zabbix-7.0.5.tar.gz diff --git a/sources b/sources index d8c6cb8..5ed4b16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.4.tar.gz) = 4c4b05d2371a2e78c0b419e467ecb261911096b3603b52aab296aa40ab86cdb4e7006703c9aa5a63f0cfee93bc5320c402b083b45497cdd5d804ed7e774f291e +SHA512 (zabbix-7.0.5.tar.gz) = 4538dd76c8c9518e2238afb67b355cdbb6a7094a6a2b9a6705d9cba0b0515ae0797e593538514469cbf74c4eed2ce142d7f815f8ad90a311cc9c1f7c92f05744 diff --git a/zabbix.spec b/zabbix.spec index 0458f59..ce6f6e5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.0.4 -Release: 2%{?dist} +Version: 7.0.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Tue Oct 22 2024 Orion Poplawski - 1:7.0.5-1 +- Update to 7.0.5 + * Mon Oct 07 2024 Orion Poplawski - 1:7.0.4-2 - Fix typo in crypto policy patch that broke SSL connections From 6ee862cdc31d4385708faa7a5fafc654f42f7357 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 30 Nov 2024 16:56:44 -0700 Subject: [PATCH 05/34] Update to 7.0.6 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3cacd56..cd93590 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.3.tar.gz /zabbix-7.0.4.tar.gz /zabbix-7.0.5.tar.gz +/zabbix-7.0.6.tar.gz diff --git a/sources b/sources index 5ed4b16..9368fb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.5.tar.gz) = 4538dd76c8c9518e2238afb67b355cdbb6a7094a6a2b9a6705d9cba0b0515ae0797e593538514469cbf74c4eed2ce142d7f815f8ad90a311cc9c1f7c92f05744 +SHA512 (zabbix-7.0.6.tar.gz) = ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa diff --git a/zabbix.spec b/zabbix.spec index ce6f6e5..7b07ec2 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.0.5 +Version: 7.0.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Sat Nov 30 2024 Orion Poplawski - 1:7.0.6-1 +- Update to 7.0.6 + * Tue Oct 22 2024 Orion Poplawski - 1:7.0.5-1 - Update to 7.0.5 From 51402e148153028b047d2e14bb819e5a363b7696 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Dec 2024 20:34:19 -0700 Subject: [PATCH 06/34] Update to 7.2.0 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 13 +++++++------ zabbix.spec | 7 +++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cd93590..f70518b 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.4.tar.gz /zabbix-7.0.5.tar.gz /zabbix-7.0.6.tar.gz +/zabbix-7.2.0.tar.gz diff --git a/sources b/sources index 9368fb5..5079626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.6.tar.gz) = ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa +SHA512 (zabbix-7.2.0.tar.gz) = be8f3a7f58af15ab5b0ee5e47666fdf7888937d99bbe8f491be1ab668f3812237c652f4ebbdbdcfd747a9b90fe489ffbbe2c199468ab19c618f4e3bda12cc5fb diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 901d716..170e636 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -144,14 +144,15 @@ index 0a55934..a7f6a28 100644 $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" ---- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600 -+++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600 -@@ -24,7 +24,7 @@ - - AC_CONFIG_HEADERS(include/common/config.h) +diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac +--- zabbix-7.2.0/configure.ac.out-of-tree 2024-12-09 04:53:54.274588489 -0700 ++++ zabbix-7.2.0/configure.ac 2024-12-11 20:31:44.684746169 -0700 +@@ -22,7 +22,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([src/zabbix_server/server.c]) + AC_CONFIG_HEADERS([include/common/config.h]) -AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include']) +AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include']) + AC_CANONICAL_BUILD AC_CANONICAL_HOST - diff --git a/zabbix.spec b/zabbix.spec index 7b07ec2..4cd916b 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.0.6 +Version: 7.2.0 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.0/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 @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Thu Dec 12 2024 Orion Poplawski - 1:7.2.0-1 +- Update to 7.2.0 + * Sat Nov 30 2024 Orion Poplawski - 1:7.0.6-1 - Update to 7.0.6 From 469b5b2420df4da39aa6330aeaece2c2a34f7fe5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 6 Jan 2025 08:16:54 -0700 Subject: [PATCH 07/34] Update to 7.2.2 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f70518b..37ce90c 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.5.tar.gz /zabbix-7.0.6.tar.gz /zabbix-7.2.0.tar.gz +/zabbix-7.2.2.tar.gz diff --git a/sources b/sources index 5079626..0136b87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.0.tar.gz) = be8f3a7f58af15ab5b0ee5e47666fdf7888937d99bbe8f491be1ab668f3812237c652f4ebbdbdcfd747a9b90fe489ffbbe2c199468ab19c618f4e3bda12cc5fb +SHA512 (zabbix-7.2.2.tar.gz) = 98e4a21c4235dee36e050cfc1506cbef5cd5c9409ee6bb3cac663346826a80dd2c59c6f5e6cfaeb770975785b19689d4775b0eee407093a12ed6f1169621aa1f diff --git a/zabbix.spec b/zabbix.spec index 4cd916b..7a24506 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.2.0 +Version: 7.2.2 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Mon Jan 06 2025 Orion Poplawski - 1:7.2.2-1 +- Update to 7.2.2 + * Thu Dec 12 2024 Orion Poplawski - 1:7.2.0-1 - Update to 7.2.0 From 33312afaccfcbe055a3f5cd72e6ad9be318ebfb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:40:04 +0000 Subject: [PATCH 08/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 7a24506..df6c876 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:7.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 06 2025 Orion Poplawski - 1:7.2.2-1 - Update to 7.2.2 From ac9d4d8a64ccce93a960c6da079eaa165949c28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:14 +0100 Subject: [PATCH 09/34] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- zabbix.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index df6c876..f5aae4d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -176,7 +176,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires: fping Requires: traceroute -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -211,7 +210,6 @@ Zabbix server compiled to use PostgreSQL %package agent Summary: Zabbix agent Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -224,7 +222,6 @@ Summary: Zabbix proxy common files BuildArch: noarch Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -395,6 +392,11 @@ sed -i \ # Install README file install -m 0644 -p %{SOURCE16} . +# Create a sysusers.d config file +cat >zabbix.sysusers.conf < /dev/null || groupadd -r zabbix -getent passwd zabbix > /dev/null || \ - useradd -r -g zabbix -d %{_sharedstatedir}/zabbix -s /sbin/nologin \ - -c "Zabbix Monitoring System" zabbix -: %post agent %systemd_post zabbix-agent.service @@ -797,6 +795,7 @@ fi %{_unitdir}/zabbix-agent.service %{_sbindir}/zabbix_agentd %{_mandir}/man8/zabbix_agentd.8* +%{_sysusersdir}/zabbix.conf %files proxy %doc misc/snmptrap/zabbix_trap_receiver.pl @@ -838,6 +837,9 @@ fi %files web-pgsql %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:7.2.2-3 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 1:7.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 64b349486e8b4c9ed85367a96b7d692ca4f51340 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 2 Apr 2025 16:39:36 -0600 Subject: [PATCH 10/34] Update to 7.2.5 (CVE-2024-36469, CVE-2024-42325, CVE-2024-45700) --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 7 ++++--- zabbix.spec | 7 +++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 37ce90c..f7bb5b9 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.6.tar.gz /zabbix-7.2.0.tar.gz /zabbix-7.2.2.tar.gz +/zabbix-7.2.5.tar.gz diff --git a/sources b/sources index 0136b87..3dd08a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.2.tar.gz) = 98e4a21c4235dee36e050cfc1506cbef5cd5c9409ee6bb3cac663346826a80dd2c59c6f5e6cfaeb770975785b19689d4775b0eee407093a12ed6f1169621aa1f +SHA512 (zabbix-7.2.5.tar.gz) = a1bee511bee868f2f289518ac84f156acaf2adb5640dbb44a259359a5ffd5a8ce793504e1a25124b91eb329af16341571a2492e15720ffdda822ec05d4855a22 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 170e636..48ddc52 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -36,13 +36,14 @@ 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,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 diff --git a/zabbix.spec b/zabbix.spec index f5aae4d..e501228 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.2.2 -Release: 3%{?dist} +Version: 7.2.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -837,6 +837,9 @@ fi %files web-pgsql %changelog +* Wed Apr 02 2025 Orion Poplawski - 1:7.2.5-1 +- Update to 7.2.5 (CVE-2024-36469, CVE-2024-42325, CVE-2024-45700) + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:7.2.2-3 - Add sysusers.d config file to allow rpm to create users/groups automatically From 19a5a7ebeac8275c480361b6d3945ba28de01181 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 9 Apr 2025 12:05:05 -0500 Subject: [PATCH 11/34] Add user/group provides to -server to fix FTI --- zabbix.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index e501228..28ec6e6 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -179,6 +179,8 @@ Requires: traceroute Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Provides: user(zabbixsrv) +Provides: group(zabbixsrv) %description server Zabbix server common files @@ -837,6 +839,9 @@ fi %files web-pgsql %changelog +* Wed Apr 09 2025 Gwyn Ciesla - 1:7.2.5-2 +- Add user/group provides to -server to fix FTI + * Wed Apr 02 2025 Orion Poplawski - 1:7.2.5-1 - Update to 7.2.5 (CVE-2024-36469, CVE-2024-42325, CVE-2024-45700) From b48bf08356b50f7952c248ffc11583f5492ffc00 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 20 Jun 2025 14:34:05 -0500 Subject: [PATCH 12/34] 7.2.9 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f7bb5b9..99c8322 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.0.tar.gz /zabbix-7.2.2.tar.gz /zabbix-7.2.5.tar.gz +/zabbix-7.2.9.tar.gz diff --git a/sources b/sources index 3dd08a8..ff7e83c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.5.tar.gz) = a1bee511bee868f2f289518ac84f156acaf2adb5640dbb44a259359a5ffd5a8ce793504e1a25124b91eb329af16341571a2492e15720ffdda822ec05d4855a22 +SHA512 (zabbix-7.2.9.tar.gz) = 72e5e9d4d87af8a3008e961009704cfdb55ac2dec8de5f2768625df3be28ab13eb0ba7a55a0b2679977dd7cec1956774d4e2e1a14aa84509d7693508c20f7c71 diff --git a/zabbix.spec b/zabbix.spec index 28ec6e6..7d6d35c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.2.5 -Release: 2%{?dist} +Version: 7.2.9 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jun 20 2025 Gwyn Ciesla - 1:7.2.9-1 +- 7.2.9 + * Wed Apr 09 2025 Gwyn Ciesla - 1:7.2.5-2 - Add user/group provides to -server to fix FTI From 8c79fb4660a948d4458f1731a0a489d8a592598a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 27 Jun 2025 11:05:18 -0500 Subject: [PATCH 13/34] 7.2.10 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99c8322..60115df 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.2.tar.gz /zabbix-7.2.5.tar.gz /zabbix-7.2.9.tar.gz +/zabbix-7.2.10.tar.gz diff --git a/sources b/sources index ff7e83c..4810340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.9.tar.gz) = 72e5e9d4d87af8a3008e961009704cfdb55ac2dec8de5f2768625df3be28ab13eb0ba7a55a0b2679977dd7cec1956774d4e2e1a14aa84509d7693508c20f7c71 +SHA512 (zabbix-7.2.10.tar.gz) = 47f18b96a4bbca410d01ee877053fb96c02e6f596aff6ad6ff976842cf695b073e050f6028952c85965b8969dc0c3c12dd2afcebb11dcb14ad44972e7a85ba52 diff --git a/zabbix.spec b/zabbix.spec index 7d6d35c..07d7381 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.2.9 +Version: 7.2.10 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jun 27 2025 Gwyn Ciesla - 1:7.2.10-1 +- 7.2.10 + * Fri Jun 20 2025 Gwyn Ciesla - 1:7.2.9-1 - 7.2.9 From f0a29a829e0f888cb72c0abaeee3e00c28fbc935 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 22 Jul 2025 10:36:04 -0500 Subject: [PATCH 14/34] 7.2.11 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 60115df..76ed428 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.5.tar.gz /zabbix-7.2.9.tar.gz /zabbix-7.2.10.tar.gz +/zabbix-7.2.11.tar.gz diff --git a/sources b/sources index 4810340..31e6d62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.10.tar.gz) = 47f18b96a4bbca410d01ee877053fb96c02e6f596aff6ad6ff976842cf695b073e050f6028952c85965b8969dc0c3c12dd2afcebb11dcb14ad44972e7a85ba52 +SHA512 (zabbix-7.2.11.tar.gz) = 6ddf058f822acbc133543dbc15253335cd48f25ccd5cf50641e9109ba3df1c98c1a211ce510f4ad3ebf9c221e7acbdb8619f3aa39c0d2d5d6e189a75b55bafcd diff --git a/zabbix.spec b/zabbix.spec index 07d7381..6ff2de1 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.2.10 +Version: 7.2.11 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Tue Jul 22 2025 Gwyn Ciesla - 1:7.2.11-1 +- 7.2.11 + * Fri Jun 27 2025 Gwyn Ciesla - 1:7.2.10-1 - 7.2.10 From ed2d2f1c814778059b3412852639050eed160db6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:15:24 +0000 Subject: [PATCH 15/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 6ff2de1..00eaf4c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:7.2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Gwyn Ciesla - 1:7.2.11-1 - 7.2.11 From d685d7ddd2fc79fec07035c0b439cf644421a34e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 31 Jul 2025 14:29:24 -0500 Subject: [PATCH 16/34] 7.4.1 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 76ed428..0168ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ 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 diff --git a/sources b/sources index 31e6d62..d0db62f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.11.tar.gz) = 6ddf058f822acbc133543dbc15253335cd48f25ccd5cf50641e9109ba3df1c98c1a211ce510f4ad3ebf9c221e7acbdb8619f3aa39c0d2d5d6e189a75b55bafcd +SHA512 (zabbix-7.4.1.tar.gz) = 45765f21b0e71fe435eb1957bbf1111580221a5ecfb0cf7aed280573f0751bc14cd85bfe101a1199974e9df5b430fc19c71ffc937bd235cdeaf159988efc9987 diff --git a/zabbix.spec b/zabbix.spec index 00eaf4c..afa6288 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.2.11 -Release: 2%{?dist} +Version: 7.4.1 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -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,9 @@ fi %files web-pgsql %changelog +* 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 From 15702963d5686acf8327a309e3ab7bed26abf95c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 25 Aug 2025 10:17:41 -0500 Subject: [PATCH 17/34] 7.4.2 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0168ea0..a6ee1fe 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index d0db62f..15188c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.1.tar.gz) = 45765f21b0e71fe435eb1957bbf1111580221a5ecfb0cf7aed280573f0751bc14cd85bfe101a1199974e9df5b430fc19c71ffc937bd235cdeaf159988efc9987 +SHA512 (zabbix-7.4.2.tar.gz) = 3bf1f915c2cd5a59f1dd3afc10dd1a6e596840e576013839d6eae057cd327893f87cc5cec1d32b6a8ca8bd00735c0070327084aae01dc8d3399202f5a3e365c1 diff --git a/zabbix.spec b/zabbix.spec index afa6288..80605f7 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.1 +Version: 7.4.2 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From d630adcb769de2983108d18caf65c59046fb9df2 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Tue, 26 Aug 2025 09:55:47 +0200 Subject: [PATCH 18/34] tests/DSP: use TMT intead of STI STI is being obsoleted: https://fedoraproject.org/wiki/Changes/DisableSTI Signed-off-by: Vit Mojzis --- .fmf/version | 1 + plans/dsp.fmf | 22 ++++++++++++++++++++++ tests/tests-DSP.yml | 37 ------------------------------------- 3 files changed, 23 insertions(+), 37 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/dsp.fmf delete mode 100644 tests/tests-DSP.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/dsp.fmf b/plans/dsp.fmf new file mode 100644 index 0000000..464783d --- /dev/null +++ b/plans/dsp.fmf @@ -0,0 +1,22 @@ +summary: DSP test suite +discover: + - name: DSP_test + how: fmf + url: https://pagure.io/DSP_test.git + ref: master + +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/tests/tests-DSP.yml b/tests/tests-DSP.yml deleted file mode 100644 index 498df08..0000000 --- a/tests/tests-DSP.yml +++ /dev/null @@ -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) -- //.(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 From 60d93295d4dc2b01f5bbc12febcaa5f3e09489f3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Oct 2025 11:06:40 -0500 Subject: [PATCH 19/34] 7.4.3 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 18 ++++++++++-------- zabbix.spec | 5 ++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a6ee1fe..8517a66 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 15188c9..168511b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.2.tar.gz) = 3bf1f915c2cd5a59f1dd3afc10dd1a6e596840e576013839d6eae057cd327893f87cc5cec1d32b6a8ca8bd00735c0070327084aae01dc8d3399202f5a3e365c1 +SHA512 (zabbix-7.4.3.tar.gz) = ce4e9bb3ba8162c2df8c86ddee1713c296cf4deeb6fb97ee8fbc2857d550ba38c6c18305be954f8742098522f9cfca3a9fe715dc0808b549fb3390b85eb2e963 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 48ddc52..29f7da3 100644 --- a/zabbix-out-of-tree.patch +++ b/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)" @@ -157,3 +149,13 @@ 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 diff --git a/zabbix.spec b/zabbix.spec index 80605f7..99cf7ff 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.2 +Version: 7.4.3 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 0808d83ad8cc7a754b46c9333cc614e7edffa07b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Oct 2025 10:28:08 -0500 Subject: [PATCH 20/34] 7.4.4 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8517a66..6003b25 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 168511b..f654b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.3.tar.gz) = ce4e9bb3ba8162c2df8c86ddee1713c296cf4deeb6fb97ee8fbc2857d550ba38c6c18305be954f8742098522f9cfca3a9fe715dc0808b549fb3390b85eb2e963 +SHA512 (zabbix-7.4.4.tar.gz) = 2a4faebe2cec1861d784115b91a7b107790d157fa37a584007e81a3c8ba334d43d7647d57d602ab07a70707e8039815df33dabb022b92b33e4d208aaba5eb894 diff --git a/zabbix.spec b/zabbix.spec index 99cf7ff..24f25bc 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.3 +Version: 7.4.4 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 0bec2cefd71e83a56ff80a9bea6446f0d16c01e1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Nov 2025 10:09:31 -0600 Subject: [PATCH 21/34] 7.4.5 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6003b25..cd8280f 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index f654b5e..ae771ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.4.tar.gz) = 2a4faebe2cec1861d784115b91a7b107790d157fa37a584007e81a3c8ba334d43d7647d57d602ab07a70707e8039815df33dabb022b92b33e4d208aaba5eb894 +SHA512 (zabbix-7.4.5.tar.gz) = 0d8dbf3b2ac79074ec929e5ae6d4435081067222f1b00bd1f0104f776ac745eb563d48f544a1b991a6202ddc2dcf8f2eb5ebe08e70c50a77923eda552ca927ef diff --git a/zabbix.spec b/zabbix.spec index 24f25bc..35f6b2f 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.4 +Version: 7.4.5 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 021eed34082f302d0997e5b0db1498dff4e5e0b4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 18 Dec 2025 14:24:08 -0600 Subject: [PATCH 22/34] 7.4.6 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd8280f..b707fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ zabbix-1.8.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 diff --git a/sources b/sources index ae771ab..4a11399 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.5.tar.gz) = 0d8dbf3b2ac79074ec929e5ae6d4435081067222f1b00bd1f0104f776ac745eb563d48f544a1b991a6202ddc2dcf8f2eb5ebe08e70c50a77923eda552ca927ef +SHA512 (zabbix-7.4.6.tar.gz) = 2f593e210409c74974395bf163be127159136eac86216443122f5d2104cb85b5b652c6f445ed7408532b894f7ddbc3f1f060465f7797326f1198d3354f48e2e9 diff --git a/zabbix.spec b/zabbix.spec index 35f6b2f..5e76c0d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.5 +Version: 7.4.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From bfec638230a27a71c4099c9afff20fb35d37b6d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:05:21 +0000 Subject: [PATCH 23/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 5e76c0d..d1eec9c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From dcb907d6f3e1687076a2982c9484e386d78c0b9e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 23 Jan 2026 09:32:42 +0000 Subject: [PATCH 24/34] Rebuilt for net-snmp 5.9.5.2 --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index d1eec9c..00db79a 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 3d76032971ac359392b6f960b3814951ac4e4e32 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 13 Feb 2026 10:40:29 -0600 Subject: [PATCH 25/34] 7.4.7 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b707fa1..1db374e 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 4a11399..bf0e732 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.6.tar.gz) = 2f593e210409c74974395bf163be127159136eac86216443122f5d2104cb85b5b652c6f445ed7408532b894f7ddbc3f1f060465f7797326f1198d3354f48e2e9 +SHA512 (zabbix-7.4.7.tar.gz) = f2e42592d89c0f7fe39cb55f70fb07211d713c36448221a78a8cf9f7b426d5c830ac51fabac09adf477a12bc2eb1cc8c361922aa94e30bc36df1fd566c1a3c3d diff --git a/zabbix.spec b/zabbix.spec index 00db79a..3f58661 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.4.6 -Release: 3%{?dist} +Version: 7.4.7 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 05e9520e065917af55b51351497210a8e64bf56e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 13 Mar 2026 10:01:20 -0500 Subject: [PATCH 26/34] 7.4.8 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1db374e..f6843f2 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index bf0e732..b77b9c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.7.tar.gz) = f2e42592d89c0f7fe39cb55f70fb07211d713c36448221a78a8cf9f7b426d5c830ac51fabac09adf477a12bc2eb1cc8c361922aa94e30bc36df1fd566c1a3c3d +SHA512 (zabbix-7.4.8.tar.gz) = 7f123690832441575ea61b4e8500f39c0ec1aa94cad18a76f3972d658239b360c78485cfd4a52e3acda51ea87ab326184d2f531b3816533e531a1b8961582404 diff --git a/zabbix.spec b/zabbix.spec index 3f58661..6a1ea7c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.7 +Version: 7.4.8 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From c26fba9f423b1ddf1334e7822da7e5f4665abab8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 9 Apr 2026 11:32:43 -0500 Subject: [PATCH 27/34] 7.4.9 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f6843f2..bbc1a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index b77b9c9..e2da8ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.8.tar.gz) = 7f123690832441575ea61b4e8500f39c0ec1aa94cad18a76f3972d658239b360c78485cfd4a52e3acda51ea87ab326184d2f531b3816533e531a1b8961582404 +SHA512 (zabbix-7.4.9.tar.gz) = 981d12923e8343f8cf189a7aa8bda88912c240e31a73eeb61517c8d7fd1db27b29e8189f7478e9bc89c550f0968a070fe6f8573abbd3f58b319b4b1779517eb0 diff --git a/zabbix.spec b/zabbix.spec index 6a1ea7c..c14d234 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.8 +Version: 7.4.9 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From d887788c852bba54c7d35e2c34988a1811acea94 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 13 Apr 2026 10:03:15 -0500 Subject: [PATCH 28/34] Openssl rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index c14d234..eabbdd2 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 793044564c02f2da77c20ae33d7796864b26a9e3 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Mon, 1 Jun 2026 19:28:49 +0200 Subject: [PATCH 29/34] plans/dsp.fmf: Update the test repo URL The test repo was migrated to github due to Pagure being retired. https://communityblog.fedoraproject.org/the-forge-is-our-new-home/ --- plans/dsp.fmf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/dsp.fmf b/plans/dsp.fmf index 464783d..9fefb8a 100644 --- a/plans/dsp.fmf +++ b/plans/dsp.fmf @@ -2,8 +2,8 @@ summary: DSP test suite discover: - name: DSP_test how: fmf - url: https://pagure.io/DSP_test.git - ref: master + url: https://github.com/fedora-selinux/DSP_test.git + ref: main execute: how: tmt From 307797fb4aafe50c14ac85bda0c2a9681978c766 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:09:45 -0400 Subject: [PATCH 30/34] Rebuilt for openssl 4.0 --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index eabbdd2..6d87dd5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 58378901e3da0d99bef1a66fe341dc80f4f86d33 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 9 Jul 2026 11:51:13 -0500 Subject: [PATCH 31/34] 7.4.12 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 182 +++++++++++++++++++-------------------- zabbix.spec | 7 +- 4 files changed, 96 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index bbc1a7b..5d9666f 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index e2da8ea..ff25d9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.9.tar.gz) = 981d12923e8343f8cf189a7aa8bda88912c240e31a73eeb61517c8d7fd1db27b29e8189f7478e9bc89c550f0968a070fe6f8573abbd3f58b319b4b1779517eb0 +SHA512 (zabbix-7.4.12.tar.gz) = 1b1711a8a03e1bf0e62397a6b97981793d241461ae72b4d866a5263017fe4f715c2a670c57fe0e219f44ee56729bd660577348c3c32be93259940d27d08e319d diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 29f7da3..b584193 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -24,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 @@ -159,3 +66,92 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac -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 6d87dd5..5b40b6c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.4.9 -Release: 3%{?dist} +Version: 7.4.12 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* 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 From 4c30392e6451b7fa3c13277b1be77de861796ef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:37:52 +0000 Subject: [PATCH 32/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 5b40b6c..5ba1b9f 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1:7.4.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jul 09 2026 Gwyn Ciesla - 1:7.4.12-1 - 7.4.12 From 7f38ab7d855a374c0c60d05b9b1d46225286d444 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 20 Aug 2026 10:59:03 -0500 Subject: [PATCH 33/34] 7.4.13 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5d9666f..6372527 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index ff25d9e..8c9264b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.12.tar.gz) = 1b1711a8a03e1bf0e62397a6b97981793d241461ae72b4d866a5263017fe4f715c2a670c57fe0e219f44ee56729bd660577348c3c32be93259940d27d08e319d +SHA512 (zabbix-7.4.13.tar.gz) = 38d8971daac5583ee77fd07f9f118be70408f0e826b13b7578bf5e1866655b462807b083ad584a2c6e8e5ccfb8ce01d75cbd76867279818a3a62edc63a054ed4 diff --git a/zabbix.spec b/zabbix.spec index 5ba1b9f..79f56b8 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.4.12 -Release: 2%{?dist} +Version: 7.4.13 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Thu Aug 20 2026 Gwyn Ciesla - 1:7.4.13-1 +- 7.4.13 + * Fri Jul 17 2026 Fedora Release Engineering - 1:7.4.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 8ae98fdd832f0821e571ad056c10504a22a9d5c5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 25 Aug 2026 10:40:22 -0500 Subject: [PATCH 34/34] 7.4.14 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6372527..cf2dbe2 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ zabbix-1.8.2.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 diff --git a/sources b/sources index 8c9264b..5e8c08d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.13.tar.gz) = 38d8971daac5583ee77fd07f9f118be70408f0e826b13b7578bf5e1866655b462807b083ad584a2c6e8e5ccfb8ce01d75cbd76867279818a3a62edc63a054ed4 +SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6 diff --git a/zabbix.spec b/zabbix.spec index 79f56b8..d01b2d9 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.13 +Version: 7.4.14 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Tue Aug 25 2026 Gwyn Ciesla - 1:7.4.14-1 +- 7.4.14 + * Thu Aug 20 2026 Gwyn Ciesla - 1:7.4.13-1 - 7.4.13