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/.gitignore b/.gitignore index 195cc30..cf2dbe2 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,47 @@ zabbix-1.8.2.tar.gz /zabbix-5.0.18.tar.gz /zabbix-5.0.19.tar.gz /zabbix-5.0.21.tar.gz +/zabbix-6.0.2.tar.gz +/zabbix-6.0.3.tar.gz +/zabbix-6.0.4.tar.gz +/zabbix-6.0.5.tar.gz +/zabbix-6.0.6.tar.gz +/zabbix-6.0.8.tar.gz +/zabbix-6.0.12.tar.gz +/zabbix-6.0.13.tar.gz +/zabbix-6.0.14.tar.gz +/zabbix-6.0.15.tar.gz +/zabbix-6.0.16.tar.gz +/zabbix-6.0.17.tar.gz +/zabbix-6.0.18.tar.gz +/zabbix-6.0.19.tar.gz +/zabbix-6.0.20.tar.gz +/zabbix-6.0.22.tar.gz +/zabbix-6.0.25.tar.gz +/zabbix-6.0.27.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 diff --git a/plans/dsp.fmf b/plans/dsp.fmf new file mode 100644 index 0000000..9fefb8a --- /dev/null +++ b/plans/dsp.fmf @@ -0,0 +1,22 @@ +summary: DSP test suite +discover: + - name: DSP_test + how: fmf + url: https://github.com/fedora-selinux/DSP_test.git + ref: main + +execute: + how: tmt + +environment: + trigger: FedoraCI + # DSP_test specific variables: + TEST_RPM: "zabbix-selinux" + TEST_POLICY: "zabbix" + +prepare: + how: install + package: + - zabbix-selinux + - autoconf + - automake diff --git a/sources b/sources index 7da9498..5e8c08d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-5.0.21.tar.gz) = 1c448fa5c2d8323c30793a923597c64e4aede3c3f0185bb0462e52677e955e8d75954d336baebe4226691cc186f2840402c8b2b1fe318c227c45541030b3bac3 +SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6 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 diff --git a/zabbix-config.patch b/zabbix-config.patch index 299b494..5d61074 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,19 +1,21 @@ -diff -up zabbix-5.0.6/ui/include/classes/core/CConfigFile.php.config zabbix-5.0.6/ui/include/classes/core/CConfigFile.php ---- zabbix-5.0.6/ui/include/classes/core/CConfigFile.php.config 2020-11-30 04:16:17.000000000 -0700 -+++ zabbix-5.0.6/ui/include/classes/core/CConfigFile.php 2020-12-13 14:45:24.690966761 -0700 -@@ -24,7 +24,7 @@ class CConfigFile { - const CONFIG_NOT_FOUND = 1; +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; - const CONFIG_FILE_PATH = '/conf/zabbix.conf.php'; + const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php'; private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff -up zabbix-5.0.6/ui/include/classes/core/ZBase.php.config zabbix-5.0.6/ui/include/classes/core/ZBase.php ---- zabbix-5.0.6/ui/include/classes/core/ZBase.php.config 2020-11-30 04:16:17.000000000 -0700 -+++ zabbix-5.0.6/ui/include/classes/core/ZBase.php 2020-12-13 14:45:24.691966769 -0700 -@@ -322,7 +322,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-5.0.6/ui/include/classes/core/ZBase.php.config zabbix-5.0.6/ui/i if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -335,7 +335,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-5.0.6/ui/include/classes/setup/CSetupWizard.php.config zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php ---- zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php.config 2020-11-30 04:16:17.000000000 -0700 -+++ zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php 2020-12-13 14:45:50.510168641 -0700 -@@ -678,7 +678,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-configure-sscanf.patch b/zabbix-configure-sscanf.patch new file mode 100644 index 0000000..8117635 --- /dev/null +++ b/zabbix-configure-sscanf.patch @@ -0,0 +1,17 @@ +sscanf needs for the prototype. Submitted upstream here: + + + +diff --git a/configure.ac b/configure.ac +index 0588004f9f89cdd5..bbc60e3a28369f9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -952,6 +952,7 @@ dnl FreeBSD 4.x does not support %llu + AC_MSG_CHECKING(for long long format) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++#include + int main() + { + uint64_t i; + diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index 8a157ce..4f9f49a 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 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 goto out; } } @@ -10,7 +24,7 @@ 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; } } @@ -19,7 +33,7 @@ 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 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; } } diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 051a55a..b584193 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,922 +1,82 @@ -diff -up zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxalgo/Makefile.am ---- zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxalgo/Makefile.am 2021-11-30 18:52:58.203303610 -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-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcommon/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcommon/Makefile.am 2021-11-30 18:52:58.203303610 -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-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcomms/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxcomms/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcompress/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcompress/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxconf/Makefile.am ---- zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxconf/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdb/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdb/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdiag/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdiag/Makefile.am 2021-11-30 18:52:58.204303618 -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-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxembed/Makefile.am ---- zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxembed/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxexec/Makefile.am ---- zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxexec/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxhistory/Makefile.am ---- zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxhistory/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxhttp/Makefile.am ---- zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxhttp/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am ---- zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am ---- zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxjson/Makefile.am ---- zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxjson/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxlog/Makefile.am ---- zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxlog/Makefile.am 2021-11-30 18:52:58.205303627 -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-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmedia/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxmedia/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmemory/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxmemory/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmodules/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxmodules/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxnix/Makefile.am ---- zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxnix/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am ---- zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxregexp/Makefile.am ---- zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxregexp/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxself/Makefile.am ---- zabbix-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxself/Makefile.am 2021-11-30 18:52:58.206303636 -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_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxserver/Makefile.am ---- zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxserver/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am 2021-11-30 18:52:58.206303636 -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-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am 2021-11-30 18:52:58.206303636 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am 2021-11-30 18:52:58.207303645 -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-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am 2021-11-30 18:52:58.207303645 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am 2021-11-30 18:52:58.207303645 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am 2021-11-30 18:52:58.207303645 -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-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am 2021-11-30 18:52:58.207303645 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am 2021-11-30 18:52:58.208303654 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am 2021-11-30 18:52:58.208303654 -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-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am 2021-11-30 18:52:58.208303654 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am 2021-11-30 18:52:58.208303654 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a - - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsys/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsys/Makefile.am 2021-11-30 18:52:58.208303654 -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-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxtasks/Makefile.am ---- zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxtasks/Makefile.am 2021-11-30 18:52:58.208303654 -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-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxxml/Makefile.am ---- zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxxml/Makefile.am 2021-11-30 19:00:54.721475933 -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-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am 2021-11-30 18:52:58.208303654 -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-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_agent/Makefile.am ---- zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_agent/Makefile.am 2021-11-30 18:52:58.208303654 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - logfiles - -@@ -76,4 +78,4 @@ zabbix_agentd_CFLAGS = \ +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 = \ 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-5.0.18/src/zabbix_get/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_get/Makefile.am ---- zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_get/Makefile.am 2021-11-30 18:52:58.208303654 -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-5.0.18/src/zabbix_js/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_js/Makefile.am ---- zabbix-5.0.18/src/zabbix_js/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_js/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,24 +1,26 @@ - ## 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/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/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/zbxcrypto/libzbxcrypto.a \ -- $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ -- $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.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/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/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 - - zabbix_js_LDADD += @ZBXJS_LIBS@ - -diff -up zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - heart \ - housekeeper \ -@@ -102,4 +104,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-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_sender/Makefile.am ---- zabbix-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_sender/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am 2021-11-30 18:52:58.209303663 -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-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/lld/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/lld/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - alerter \ - dbsyncer \ -@@ -125,4 +127,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-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +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]) -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxodbc.a +-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']) - libzbxodbc_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am 2021-11-30 18:52:58.210303672 -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-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/poller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/poller/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/timer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/timer/Makefile.am 2021-11-30 18:52:58.211303681 -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-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am 2021-11-30 18:52:58.211303681 -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_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am 2021-11-30 18:52:58.211303681 -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 = \ ---- zabbix-5.0.19/src/zabbix_java/Makefile.am~ 2021-12-23 02:48:34.000000000 -0600 -+++ zabbix-5.0.19/src/zabbix_java/Makefile.am 2022-01-14 11:13:42.354979184 -0600 -@@ -9,22 +9,22 @@ + AC_CANONICAL_BUILD + AC_CANONICAL_HOST +--- zabbix-7.4.3/src/go/Makefile.am~ 2025-10-01 09:49:27.351910250 -0500 ++++ zabbix-7.4.3/src/go/Makefile.am 2025-10-01 10:33:26.662210424 -0500 +@@ -64,6 +64,7 @@ + clean-go-build: + -$(GO) clean ./... + -$(GO) clean -cache ++ -$(GO) clean $(srcdir)/... + -rm -f bin/mock_server + -rm -f bin/zabbix_agent2 + -rm -f bin/zabbix_web_service +--- a/src/zabbix_java/Makefile.am~ 2026-07-07 09:04:30.341683492 -0500 ++++ b/src/zabbix_java/Makefile.am 2026-07-09 10:47:55.481651595 -0500 +@@ -9,23 +9,23 @@ startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).jar --LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.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/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 -+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 ++JUNIT = $(srcdir)tests/junit-4.8.2.jar ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java @@ -924,8 +84,8 @@ diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5 -$(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 @@ -934,32 +94,64 @@ diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5 - $(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: ---- zabbix-5.0.21/src/go/Makefile.am~ 2022-02-28 03:12:28.000000000 -0600 -+++ zabbix-5.0.21/src/go/Makefile.am 2022-03-11 11:38:56.831860649 -0600 -@@ -20,18 +20,18 @@ - all: build +--- 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 - build: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin $(srcdir)/... + 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 - clean: -- go clean ./... -+ go clean $(srcdir)/... - rm -f bin/zabbix_agent2 bin/mock_server + zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) - install: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${GOLDFLAGS}" zabbix.com/cmd/zabbix_agent2 -- test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" -+ test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" - - 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) ./... diff --git a/zabbix.spec b/zabbix.spec index 7f5afae..d01b2d9 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,13 +16,34 @@ Name: zabbix Epoch: 1 -Version: 5.0.21 +Version: 7.4.14 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure -License: GPLv2+ +# 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/5.0/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 @@ -49,15 +70,14 @@ 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 # Patch1 patches automake files so we need to autoreconf -BuildRequires: make BuildRequires: libtool -%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: make BuildRequires: mariadb-connector-c-devel -%else -BuildRequires: mysql-devel -%endif BuildRequires: libpq-devel BuildRequires: sqlite-devel BuildRequires: net-snmp-devel @@ -70,7 +90,7 @@ BuildRequires: OpenIPMI-devel BuildRequires: libssh2-devel BuildRequires: libxml2-devel BuildRequires: libevent-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: gcc # For Agent 2 - has missing deps %if %{with go} @@ -106,13 +126,7 @@ Provides: bundled(md5-deutsch) # Could alternatively be conditional on Fedora/EL %if "x%{?srcname}" != "x%{name}" Provides: %{srcname} = %{version}-%{release} -Conflicts: %{srcname} < 3.0 -Conflicts: %{srcname}20 -Conflicts: %{srcname}22 -%else -Obsoletes: %{srcname}-docs < 1.8.15-2 -Obsoletes: %{srcname}-web-sqlite3 < 2.0.3-3 -Obsoletes: %{srcname}-server-sqlite3 < 2.0.3-3 +Conflicts: %{srcname} < 6.0 %endif %description @@ -162,10 +176,11 @@ 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 @@ -176,7 +191,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} @@ -189,7 +203,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} @@ -199,7 +212,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 @@ -212,7 +224,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 @@ -227,7 +238,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 @@ -239,7 +249,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 @@ -251,7 +260,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 @@ -268,9 +276,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 -Requires: js-jquery >= 3.3.1 -Provides: bundled(js-jquery-ui) = 1.12.1 +# 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.13.2 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype Requires: dejavu-sans-fonts @@ -286,7 +294,6 @@ BuildArch: noarch Requires: %{name}-web = %{?epoch:%{epoch}:}%{version}-%{release} Requires: php-mysqli Provides: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-web <= 1.5.3-0.1 %description web-mysql Zabbix web frontend for MySQL @@ -330,10 +337,7 @@ Custom SELinux policy module %prep -%setup0 -q -n %{srcname}-%{version}%{?prerelease:.%{prerelease}} -%patch0 -p1 -b .config -%patch1 -p1 -b .out-of-tree -%patch2 -p1 -b .crypto-policy +%autosetup -p1 autoreconf # Remove bundled java libs @@ -390,6 +394,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 @@ -746,7 +782,8 @@ fi %if 0%{?with_selinux} %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.* -%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%{_datadir}/selinux/devel/include/distributed/%{name}.if +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %endif %files agent @@ -760,6 +797,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 @@ -801,6 +839,203 @@ 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 + +* 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 + +* Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 +- Use alternatives name that systemd likes for units (bz#2305855) + +* Thu Aug 15 2024 Gwyn Ciesla - 1:6.0.33-1 +- 6.0.33 + +* Mon Jul 29 2024 Miroslav Suchý - 1:6.0.30-3 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1:6.0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue May 21 2024 Gwyn Ciesla - 1:6.0.30-1 +- 6.0.30 + +* Fri May 03 2024 Orion Poplawski - 1:6.0.29-1 +- Update to 6.0.29 +- Hopefully really get the zabbix_run_sudo SELinux boolean working for + zabbix-agent and allow it to run lvm when enabled + +* Wed Feb 28 2024 Morten Stevens - 1:6.0.27-1 +- Update to 6.0.27 + +* Sat Jan 27 2024 Fedora Release Engineering - 1:6.0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 04 2024 Orion Poplawski - 1:6.0.25-1 +- Update to 6.0.25 + +* Fri Dec 01 2023 Gwyn Ciesla - 1:6.0.22-3 +- Patch for libxml2 2.12.x + +* Sat Oct 28 2023 Orion Poplawski - 1:6.0.22-2 +- Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) + +* Wed Oct 04 2023 Morten Stevens - 1:6.0.22-1 +- Update to 6.0.22 + +* Mon Aug 07 2023 Morten Stevens - 1:6.0.20-1 +- Update to 6.0.20 + +* Sat Jul 22 2023 Fedora Release Engineering - 1:6.0.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 06 2023 Morten Stevens - 1:6.0.19-1 +- Update to 6.0.19 + +* Thu Jun 15 2023 Morten Stevens - 1:6.0.18-1 +- Update to 6.0.18 + +* Tue Apr 25 2023 Morten Stevens - 1:6.0.17-1 +- Update to 6.0.17 + +* Tue Apr 11 2023 Morten Stevens - 1:6.0.16-1 +- Update to 6.0.16 + +* Tue Apr 04 2023 Morten Stevens - 1:6.0.15-1 +- Update to 6.0.15 + +* Tue Mar 21 2023 Morten Stevens - 1:6.0.14-1 +- Update to 6.0.14 + +* Wed Mar 01 2023 Gwyn Ciesla - 1:6.0.13-2 +- migrated to SPDX license + +* Thu Feb 16 2023 Orion Poplawski - 1:6.0.13-1 +- Update to 6.0.13 +- Add policy to allow zabbix scripts to run chronyc as chronyc_t (bz#2160180) +- Add policy to allow zabbix agent to run rpm read-only + +* Sun Jan 22 2023 Orion Poplawski - 1:6.0.12-1 +- Update to 6.0.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 1:6.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Nov 17 2022 Florian Weimer - 1:6.0.8-2 +- Include in configure for sscanf prototype + +* Wed Sep 14 2022 Gwyn Ciesla - 1:6.0.8-1 +- 6.0.8 + +* Fri Jul 22 2022 Gwyn Ciesla -1:6.0.6-2 +- Move to pcre2 + +* Fri Jul 08 2022 Orion Poplawski - 1:6.0.6-1 +- Update to 6.0.6 + +* Tue May 31 2022 Gwyn Ciesla - 1:6.0.5-1 +- 6.0.5 + +* Mon May 09 2022 Orion Poplawski - 1:6.0.4-1 +- Update to 6.0.4 + +* Mon Apr 04 2022 Gwyn Ciesla - 1:6.0.3-1 +- 6.0.3 + +* Wed Mar 23 2022 Orion Poplawski - 1:6.0.2-1 +- Update to 6.0.2 + * Fri Mar 11 2022 Gwyn Ciesla - 1:5.0.21-1 - 5.0.21 diff --git a/zabbix.te b/zabbix.te index 273e394..4ff1bb7 100644 --- a/zabbix.te +++ b/zabbix.te @@ -1,4 +1,4 @@ -policy_module(zabbix, 1.6.0) +policy_module(zabbix, 1.7.0) ######################################## # @@ -284,22 +284,53 @@ zabbix_tcp_connect(zabbix_agent_t) zabbix_script_domtrans(zabbix_agent_t) +# These are triggered by vfs.dev.discovery enumerating everyting in /dev +gen_require(` + type devlog_t; +') +dontaudit zabbix_agent_t devlog_t:sock_file getattr; +init_dontaudit_getattr_initctl(zabbix_agent_t) +kernel_dontaudit_getattr_core_if(zabbix_agent_t) + +gen_require(` + type kernel_t, sudo_log_t; +') tunable_policy(`zabbix_run_sudo',` - allow zabbix_agent_t self:capability { setgid setuid sys_resource }; + allow zabbix_agent_t self:capability { chown dac_read_search setgid setuid sys_resource }; allow zabbix_agent_t self:process { setrlimit setsched }; allow zabbix_agent_t self:key write; allow zabbix_agent_t self:passwd { passwd rootok }; + allow zabbix_agent_t sudo_log_t:dir { add_name create setattr write }; + allow zabbix_agent_t sudo_log_t:file { create open read setattr write }; + + allow zabbix_agent_t devlog_t:sock_file write; + allow zabbix_agent_t kernel_t:unix_dgram_socket sendto; + allow zabbix_agent_t self:unix_dgram_socket { connect create }; + + auth_domtrans_chkpwd(zabbix_agent_t) auth_rw_lastlog(zabbix_agent_t) auth_rw_faillog(zabbix_agent_t) - auth_exec_chkpwd(zabbix_agent_t) + + logging_send_audit_msgs(zabbix_agent_t) selinux_compute_access_vector(zabbix_agent_t) + sssd_read_config(zabbix_agent_t) + systemd_write_inherited_logind_sessions_pipes(zabbix_agent_t) systemd_dbus_chat_logind(zabbix_agent_t) xserver_exec_xauth(zabbix_agent_t) + + # Conceivably this could be under a separate boolean, but the reason to allow sudo + # is to allow check like this + lvm_domtrans(zabbix_agent_t) +') + +optional_policy(` + rpm_exec(zabbix_agent_t) + rpm_read_db(zabbix_agent_t) ') optional_policy(` @@ -330,6 +361,10 @@ allow zabbix_t zabbix_script_t:process signal; init_domtrans_script(zabbix_script_t) +optional_policy(` + chronyd_domtrans_chronyc(zabbix_script_t) +') + optional_policy(` mta_send_mail(zabbix_script_t) ')