diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index cf2dbe2..63927b4 100644 --- a/.gitignore +++ b/.gitignore @@ -101,26 +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 -/zabbix-7.0.4.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 -/zabbix-7.2.5.tar.gz -/zabbix-7.2.9.tar.gz -/zabbix-7.2.10.tar.gz -/zabbix-7.2.11.tar.gz -/zabbix-7.4.1.tar.gz -/zabbix-7.4.2.tar.gz -/zabbix-7.4.3.tar.gz -/zabbix-7.4.4.tar.gz -/zabbix-7.4.5.tar.gz -/zabbix-7.4.6.tar.gz -/zabbix-7.4.7.tar.gz -/zabbix-7.4.8.tar.gz -/zabbix-7.4.9.tar.gz -/zabbix-7.4.12.tar.gz -/zabbix-7.4.13.tar.gz -/zabbix-7.4.14.tar.gz +/zabbix-6.0.36.tar.gz +/zabbix-6.0.39.tar.gz diff --git a/plans/dsp.fmf b/plans/dsp.fmf deleted file mode 100644 index 9fefb8a..0000000 --- a/plans/dsp.fmf +++ /dev/null @@ -1,22 +0,0 @@ -summary: DSP test suite -discover: - - name: DSP_test - how: fmf - url: https://github.com/fedora-selinux/DSP_test.git - ref: main - -execute: - how: tmt - -environment: - trigger: FedoraCI - # DSP_test specific variables: - TEST_RPM: "zabbix-selinux" - TEST_POLICY: "zabbix" - -prepare: - how: install - package: - - zabbix-selinux - - autoconf - - automake diff --git a/sources b/sources index 5e8c08d..883064e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6 +SHA512 (zabbix-6.0.39.tar.gz) = 046494cd24880d83c7a174482f1c1a29b5bf0cd6b39d1a0909ca628faf9d2a134a7fed728c8776dce877d4dcaf474ff20683ce95e8884b830d99b32e2962b7c1 diff --git a/tests/tests-DSP.yml b/tests/tests-DSP.yml new file mode 100644 index 0000000..498df08 --- /dev/null +++ b/tests/tests-DSP.yml @@ -0,0 +1,37 @@ +- hosts: localhost + + roles: + - role: standard-test-beakerlib + tags: + - classic + repositories: + - repo: https://pagure.io/DSP_test.git + dest: DSP_test + version: master + + tests: + - DSP_test + environment: + # RPM package containing the policy module + TEST_RPM: zabbix-selinux + # policy module name + TEST_POLICY: zabbix + # policy sources will be extracted from corresponding .src.rpm + # policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz") + # or empty string if policy sources are not inside a tar archive + POLICY_TAR: '' + # path to policy sources (in of the tar archive) -- //.(te|if|fc) + # or path in the src.rpm if there is no tar archive -- //.(te|if|fc) + # can contain wildcards (e.g. for versions etc.) + POLICY_PATH: . + + required_packages: + - policycoreutils + - selinux-policy + - selinux-policy-targeted + - setools-console + - libselinux-utils + - rpm + - tar + - git + - zabbix-selinux diff --git a/zabbix-config.patch b/zabbix-config.patch index 5d61074..9d58fc6 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,8 +1,7 @@ -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 { +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 { const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; @@ -11,11 +10,10 @@ index d7ad93a..88b7d5f 100644 private static $supported_db_types = [ ZBX_DB_MYSQL => true, -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 { +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 { * @throws Exception */ protected function setMaintenanceMode() { @@ -24,24 +22,23 @@ index 51b2165..e57e5a8 100644 if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -405,7 +405,7 @@ class ZBase { +@@ -381,7 +381,7 @@ class ZBase { * Load zabbix config file. */ - protected function loadConfigFile(): void { -- $configFile = $this->root_dir.CConfigFile::CONFIG_FILE_PATH; + protected function loadConfigFile() { +- $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; - $config = new CConfigFile($configFile); - -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 { + $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 { // 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::getRootDir().CConfigFile::CONFIG_FILE_PATH); +- $config = new CConfigFile(APP::getInstance()->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 4f9f49a..8a157ce 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -1,21 +1,7 @@ -diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go -index b7ddff4..063eb02 100644 ---- a/src/go/pkg/tls/tls.go -+++ b/src/go/pkg/tls/tls.go -@@ -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 = "PROFILE=SYSTEM"; - - if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) - goto out; -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 +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) goto out; } } @@ -24,7 +10,7 @@ index 40394a3..b2eb0f0 100644 { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of certificate" " ciphersuites:"); -@@ -1302,7 +1302,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type +@@ -3014,7 +3014,7 @@ void zbx_tls_init_child(void) goto out; } } @@ -33,7 +19,7 @@ index 40394a3..b2eb0f0 100644 { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of PSK ciphersuites:"); goto out; -@@ -1360,7 +1360,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type +@@ -3070,7 +3070,7 @@ void zbx_tls_init_child(void) goto out; } } diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index b584193..c4ed15b 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,82 +1,680 @@ -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 -@@ -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 = \ +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 + + clean-go-build: +- -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 = \ 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 --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 --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-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]) +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 --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 ++ + bin_PROGRAMS = zabbix_get - AC_CANONICAL_BUILD - AC_CANONICAL_HOST ---- zabbix-7.4.3/src/go/Makefile.am~ 2025-10-01 09:49:27.351910250 -0500 -+++ zabbix-7.4.3/src/go/Makefile.am 2025-10-01 10:33:26.662210424 -0500 -@@ -64,6 +64,7 @@ - clean-go-build: - -$(GO) clean ./... - -$(GO) clean -cache -+ -$(GO) clean $(srcdir)/... - -rm -f bin/mock_server - -rm -f bin/zabbix_agent2 - -rm -f bin/zabbix_web_service ---- a/src/zabbix_java/Makefile.am~ 2026-07-07 09:04:30.341683492 -0500 -+++ b/src/zabbix_java/Makefile.am 2026-07-09 10:47:55.481651595 -0500 -@@ -9,23 +9,23 @@ + 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 +@@ -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/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 +-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 ++JUNIT = $(srcdir)/tests/junit-4.8.2.jar ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java @@ -84,8 +682,8 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac -$(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 ++$(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 @@ -94,64 +692,430 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac - $(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 ++ $(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 @@ +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 + 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/zbxthreads/libzbxthreads.a \ -- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \ -- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ +- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ +- $(top_srcdir)/src/libs/zbxsys/libzbxsys.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/zbxip/libzbxip.a \ -- $(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \ -- $(top_srcdir)/src/libs/zbxhash/libzbxhash.a \ +- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.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_srcdir)/src/libs/zbxxml/libzbxxml.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/zbxthreads/libzbxthreads.a \ -+ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \ -+ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ ++ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ ++ $(top_builddir)/src/libs/zbxsys/libzbxsys.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/zbxip/libzbxip.a \ -+ $(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \ -+ $(top_builddir)/src/libs/zbxhash/libzbxhash.a \ ++ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.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 ++ $(top_builddir)/src/libs/zbxxml/libzbxxml.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: + $(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: + $(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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libzbxodbc.a + + 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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libzbxpinger.a + + 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 d01b2d9..849e4c0 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,34 +16,14 @@ Name: zabbix Epoch: 1 -Version: 7.4.14 +Version: 6.0.39 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 -# 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 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://www.zabbix.com -Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.4/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -70,14 +50,16 @@ Patch0: %{srcname}-config.patch Patch1: %{srcname}-out-of-tree.patch # Enforce Fedora Crypto Policy Patch2: %{srcname}-crypto-policy.patch -# Add to sscanf check -# https://support.zabbix.com/browse/ZBX-21946 -Patch3: %{srcname}-configure-sscanf.patch +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 @@ -176,11 +158,10 @@ 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 -Provides: user(zabbixsrv) -Provides: group(zabbixsrv) %description server Zabbix server common files @@ -191,6 +172,7 @@ 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} @@ -203,6 +185,7 @@ 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} @@ -212,6 +195,7 @@ 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,6 +208,7 @@ 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 @@ -238,6 +223,7 @@ 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 @@ -249,6 +235,7 @@ 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 @@ -260,6 +247,7 @@ 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 @@ -276,9 +264,9 @@ Requires: php-json Requires: php-ldap Requires: php-mbstring Requires: php-xml -# jquery 3.6.0 and jquery-ui 1.13.2 in the sources +# jquery 3.3.1 and jquery-ui 1.12.1 in the sources Requires: js-jquery >= 3.6.0 -Provides: bundled(js-jquery-ui) = 1.13.2 +Provides: bundled(js-jquery-ui) = 1.12.1 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype Requires: dejavu-sans-fonts @@ -394,11 +382,6 @@ 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,7 +784,6 @@ 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 @@ -839,102 +825,12 @@ fi %files web-pgsql %changelog -* Tue Aug 25 2026 Gwyn Ciesla - 1:7.4.14-1 -- 7.4.14 +* Wed Apr 02 2025 Orion Poplawski - 1:6.0.39-1 +- Update to 6.0.39 (CVE-2024-45700, CVE-2024-36469, CVE-2024-42325, CVE-2024-45699) -* 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 - -* Thu Jul 09 2026 Gwyn Ciesla - 1:7.4.12-1 -- 7.4.12 - -* Sat Jun 13 2026 Yaakov Selkowitz - 1:7.4.9-3 -- Rebuilt for openssl 4.0 - -* Mon Apr 13 2026 Gwyn Ciesla - 1:7.4.9-2 -- Openssl rebuild - -* Thu Apr 09 2026 Gwyn Ciesla - 1:7.4.9-1 -- 7.4.9 - -* Fri Mar 13 2026 Gwyn Ciesla - 1:7.4.8-1 -- 7.4.8 - -* Fri Feb 13 2026 Gwyn Ciesla - 1:7.4.7-1 -- 7.4.7 - -* Fri Jan 23 2026 Benjamin A. Beasley - 1:7.4.6-3 -- Rebuilt for net-snmp 5.9.5.2 - -* Sat Jan 17 2026 Fedora Release Engineering - 1:7.4.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Dec 18 2025 Gwyn Ciesla - 1:7.4.6-1 -- 7.4.6 - -* Mon Nov 03 2025 Gwyn Ciesla - 1:7.4.5-1 -- 7.4.5 - -* Wed Oct 29 2025 Gwyn Ciesla - 1:7.4.4-1 -- 7.4.4 - -* Wed Oct 01 2025 Gwyn Ciesla - 1:7.4.3-1 -- 7.4.3 - -* Mon Aug 25 2025 Gwyn Ciesla - 1:7.4.2-1 -- 7.4.2 - -* Thu Jul 31 2025 Gwyn Ciesla - 1:7.4.1-1 -- 7.4.1 - -* Fri Jul 25 2025 Fedora Release Engineering - 1:7.2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 +* Sat Nov 30 2024 Orion Poplawski - 1:6.0.36-1 +- Update to 6.0.36 (CVE-2024-42330 rhbz#2329219, CVE-2024-42332 rhbz#2329222, + CVE-2024-42333 rhbz#2329225) * Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 - Use alternatives name that systemd likes for units (bz#2305855)