diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | zabbix-config.patch | 39 | ||||
| -rw-r--r-- | zabbix-configure-sscanf.patch | 3 | ||||
| -rw-r--r-- | zabbix-crypto-policy.patch | 26 | ||||
| -rw-r--r-- | zabbix-out-of-tree.patch | 1122 | ||||
| -rw-r--r-- | zabbix.spec | 632 | ||||
| -rw-r--r-- | zabbix.te | 32 |
8 files changed, 512 insertions, 1345 deletions
@@ -5,3 +5,4 @@ /zabbix-6.0.34.tar.gz /zabbix-6.0.35.tar.gz /zabbix-6.0.36.tar.gz +/zabbix-7.0.6.tar.gz @@ -1 +1 @@ -b56e1bc0ff5df75e46d6ae73b7dbc20a zabbix-6.0.36.tar.gz +1068ff3dbc445cf00468958f3e600136 zabbix-7.0.6.tar.gz diff --git a/zabbix-config.patch b/zabbix-config.patch index 9d58fc6..5d61074 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,7 +1,8 @@ -diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0.2/ui/include/classes/core/CConfigFile.php ---- zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config 2022-03-23 08:38:25.049013803 -0600 -+++ zabbix-6.0.2/ui/include/classes/core/CConfigFile.php 2022-03-23 08:39:25.001657019 -0600 -@@ -25,7 +25,7 @@ class CConfigFile { +diff --git a/ui/include/classes/core/CConfigFile.php b/ui/include/classes/core/CConfigFile.php +index d7ad93a..88b7d5f 100644 +--- a/ui/include/classes/core/CConfigFile.php ++++ b/ui/include/classes/core/CConfigFile.php +@@ -20,7 +20,7 @@ class CConfigFile { const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; @@ -10,10 +11,11 @@ diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0. private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/include/classes/core/ZBase.php ---- zabbix-6.0.2/ui/include/classes/core/ZBase.php.config 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/ui/include/classes/core/ZBase.php 2022-03-23 08:38:25.052013836 -0600 -@@ -368,7 +368,7 @@ class ZBase { +diff --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php +index 51b2165..e57e5a8 100644 +--- a/ui/include/classes/core/ZBase.php ++++ b/ui/include/classes/core/ZBase.php +@@ -392,7 +392,7 @@ class ZBase { * @throws Exception */ protected function setMaintenanceMode() { @@ -22,23 +24,24 @@ diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/i if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -381,7 +381,7 @@ class ZBase { +@@ -405,7 +405,7 @@ class ZBase { * Load zabbix config file. */ - protected function loadConfigFile() { -- $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH; + protected function loadConfigFile(): void { +- $configFile = $this->root_dir.CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; + $config = new CConfigFile($configFile); - $this->config = $config->load(); - } -diff -up zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php ---- zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php 2022-03-23 08:38:25.054013857 -0600 -@@ -271,7 +271,7 @@ class CSetupWizard extends CForm { + +diff --git a/ui/include/classes/setup/CSetupWizard.php b/ui/include/classes/setup/CSetupWizard.php +index 8574868..79d0c72 100644 +--- a/ui/include/classes/setup/CSetupWizard.php ++++ b/ui/include/classes/setup/CSetupWizard.php +@@ -328,7 +328,7 @@ class CSetupWizard extends CForm { // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); -- $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH); +- $config = new CConfigFile(APP::getRootDir().CConfigFile::CONFIG_FILE_PATH); + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH); $config->config = [ 'DB' => [ diff --git a/zabbix-configure-sscanf.patch b/zabbix-configure-sscanf.patch index 1e66baf..8117635 100644 --- a/zabbix-configure-sscanf.patch +++ b/zabbix-configure-sscanf.patch @@ -6,7 +6,7 @@ diff --git a/configure.ac b/configure.ac index 0588004f9f89cdd5..bbc60e3a28369f9f 100644 --- a/configure.ac +++ b/configure.ac -@@ -952,6 +952,7 @@ +@@ -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 <sys/types.h> @@ -14,3 +14,4 @@ index 0588004f9f89cdd5..bbc60e3a28369f9f 100644 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 59d3e6d..901d716 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,673 +1,42 @@ -diff -up zabbix-6.0.25/src/go/Makefile.am zabbix-6.0.25/src/go/Makefile.am ---- zabbix-6.0.25/src/go/Makefile.am 2024-01-27 12:18:10.203573218 +0800 -+++ zabbix-6.0.25/src/go/Makefile.am 2024-01-27 12:32:26.677126253 +0800 -@@ -59,7 +59,7 @@ - clean: clean-go-build clean-sbom +diff --git a/src/go/Makefile.am b/src/go/Makefile.am +index 3e24aa0..308e34b 100644 +--- a/src/go/Makefile.am ++++ b/src/go/Makefile.am +@@ -67,6 +67,7 @@ clean: clean-go-build clean-sbom clean-go-build: -- -go clean ./... -+ -go clean $(srcdir)/... + -$(GO) clean ./... ++ -$(GO) clean $(srcdir)/... -rm -f bin/mock_server -rm -f bin/zabbix_agent2 -rm -f bin/zabbix_web_service -@@ -76,8 +76,8 @@ - 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 "$(srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -+ for cfg in $(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: 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 zabbix-6.0.25/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-27 12:18:10.998582084 +0800 -+++ zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-27 12:18:11.144583713 +0800 -+++ zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-27 12:18:11.139583657 +0800 -+++ zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-27 12:18:10.905581047 +0800 -+++ zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-27 12:26:48.415352368 +0800 -@@ -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/zbxcomms/Makefile.am zabbix-6.0.25/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-27 12:18:10.984581928 +0800 -+++ zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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/zbxcommshigh/Makefile.am zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-27 12:18:11.130583556 +0800 -+++ zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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/zbxcompress/Makefile.am zabbix-6.0.25/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-27 12:18:10.925581270 +0800 -+++ zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-27 12:18:11.129583545 +0800 -+++ zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-27 12:18:10.920581214 +0800 -+++ zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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/zbxdb/Makefile.am zabbix-6.0.25/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-27 12:18:10.913581136 +0800 -+++ zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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/zbxdbcache/Makefile.am zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-27 12:18:11.006582173 +0800 -+++ zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-27 12:18:10.950581549 +0800 -+++ zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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/zbxdbupgrade/Makefile.am zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-27 12:18:10.935581381 +0800 -+++ zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-27 12:26:48.416352379 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-27 12:18:11.137583635 +0800 -+++ zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-27 12:18:10.959581649 +0800 -+++ zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-27 12:18:10.988581973 +0800 -+++ zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-27 12:18:10.992582017 +0800 -+++ zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxha/Makefile.am ---- zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-27 12:18:10.965581716 +0800 -+++ zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-27 12:18:11.149583768 +0800 -+++ zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-27 12:18:10.908581080 +0800 -+++ zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-27 12:18:11.014582263 +0800 -+++ zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-27 12:18:11.149583768 +0800 -+++ zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-27 12:26:48.417352390 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-27 12:18:11.134583601 +0800 -+++ zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-27 12:18:11.013582251 +0800 -+++ zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-27 12:18:11.010582218 +0800 -+++ zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-27 12:18:10.923581248 +0800 -+++ zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-27 12:18:10.910581103 +0800 -+++ zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-27 12:18:10.981581895 +0800 -+++ zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxprof/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-27 12:18:10.994582040 +0800 -+++ zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-27 12:18:10.911581114 +0800 -+++ zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-27 12:26:48.418352401 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-27 12:18:10.977581850 +0800 -+++ zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-27 12:18:10.916581170 +0800 -+++ zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxself/Makefile.am ---- zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-27 12:18:11.019582318 +0800 -+++ zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-27 12:18:10.972581794 +0800 -+++ zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-27 12:18:10.990581995 +0800 -+++ zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-27 12:26:48.419352412 +0800 -@@ -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/zbxsys/Makefile.am zabbix-6.0.25/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-27 12:18:10.963581694 +0800 -+++ zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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/zbxsysinfo/agent/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-27 12:18:11.101583233 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-27 12:18:11.122583467 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-27 12:21:13.373615946 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-27 12:18:11.110583333 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-27 12:18:11.099583211 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-27 12:21:50.135025913 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-27 12:18:11.116583400 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-27 12:22:10.033247819 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-27 12:18:11.033582474 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-27 12:22:28.994459278 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-27 12:18:11.100583222 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-27 12:18:11.093583144 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-27 12:22:45.253640603 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-27 12:18:11.078582976 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-27 12:23:03.828847753 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-27 12:18:11.058582753 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-27 12:23:21.966050020 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-27 12:18:11.043582586 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-27 12:23:37.598224351 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-27 12:18:11.087583077 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-27 12:18:11.084583043 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-27 12:23:54.055407887 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-27 12:18:11.066582843 +0800 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-27 12:24:13.363623213 +0800 -@@ -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/zbxtasks/Makefile.am zabbix-6.0.25/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-27 12:18:10.924581259 +0800 -+++ zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-27 12:18:11.017582296 +0800 -+++ zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-27 12:18:11.148583757 +0800 -+++ zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-27 12:18:10.975581828 +0800 -+++ zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-27 12:26:48.420352423 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-27 12:18:10.054571557 +0800 -+++ zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_agent/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-27 12:18:10.050571512 +0800 -+++ zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -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 @@ +@@ -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)" -Only in zabbix-6.0.25/src/zabbix_agent: Makefile.am.orig -diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am zabbix-6.0.25/src/zabbix_get/Makefile.am ---- zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-27 12:18:10.901581002 +0800 -+++ zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_get - - zabbix_get_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java/Makefile.am ---- zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:18:09.889569717 +0800 -+++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -9,22 +9,22 @@ +diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am +index 43f8f19..48214c9 100644 +--- a/src/zabbix_java/Makefile.am ++++ b/src/zabbix_java/Makefile.am +@@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).jar @@ -696,426 +65,93 @@ diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.25/src/zabbix_js/Makefile.am zabbix-6.0.25/src/zabbix_js/Makefile.am ---- zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-27 12:18:10.899580980 +0800 -+++ zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -1,26 +1,28 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_js - +diff --git a/src/zabbix_js/Makefile.am b/src/zabbix_js/Makefile.am +index 1e4fd93..2110656 100644 +--- a/src/zabbix_js/Makefile.am ++++ b/src/zabbix_js/Makefile.am +@@ -5,30 +5,30 @@ zabbix_js_SOURCES = zabbix_js.c zabbix_js_LDADD = \ - $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ -- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ - $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ - $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ - $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ - $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ -- $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ +- $(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \ +- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \ +- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ - $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ - $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ -- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxip/libzbxip.a \ +- $(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \ +- $(top_srcdir)/src/libs/zbxhash/libzbxhash.a \ - $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ - $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ - $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ -- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a +- $(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \ +- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a \ +- $(top_srcdir)/src/libs/zbxstr/libzbxstr.a \ +- $(top_srcdir)/src/libs/zbxnum/libzbxnum.a \ +- $(top_srcdir)/src/libs/zbxtime/libzbxtime.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \ +- $(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a + $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ -+ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ + $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ + $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ + $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ -+ $(top_builddir)/src/libs/zbxsys/libzbxsys.a \ ++ $(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \ ++ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \ ++ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ + $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ -+ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxip/libzbxip.a \ ++ $(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \ ++ $(top_builddir)/src/libs/zbxhash/libzbxhash.a \ + $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ + $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ + $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ -+ $(top_builddir)/src/libs/zbxxml/libzbxxml.a ++ $(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \ ++ $(top_builddir)/src/libs/zbxxml/libzbxxml.a \ ++ $(top_builddir)/src/libs/zbxstr/libzbxstr.a \ ++ $(top_builddir)/src/libs/zbxnum/libzbxnum.a \ ++ $(top_builddir)/src/libs/zbxtime/libzbxtime.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \ ++ $(top_builddir)/src/libs/zbxcurl/libzbxcurl.a zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) -diff -up zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-27 12:18:10.058571602 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-27 12:18:10.061571635 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-27 12:26:48.421352435 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-27 12:18:10.064571668 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-27 12:18:10.055571568 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 @@ +diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am +index b56f8a8..44800a0 100644 +--- a/src/zabbix_proxy/Makefile.am ++++ b/src/zabbix_proxy/Makefile.am +@@ -151,4 +151,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" + test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-27 12:18:10.064571668 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-27 12:18:10.058571602 +0800 -+++ zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_sender/Makefile.am ---- zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-27 12:18:10.067571702 +0800 -+++ zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-27 12:18:10.037571367 +0800 -+++ zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-27 12:18:10.007571033 +0800 -+++ zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-27 12:26:48.422352446 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-27 12:18:09.986570799 +0800 -+++ zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-27 12:18:09.911569962 +0800 -+++ zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-27 12:18:09.992570866 +0800 -+++ zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-27 12:18:09.943570319 +0800 -+++ zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-27 12:18:10.040571401 +0800 -+++ zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-27 12:18:09.998570933 +0800 -+++ zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-27 12:18:09.917570029 +0800 -+++ zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-27 12:18:09.952570420 +0800 -+++ zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-27 12:18:09.975570676 +0800 -+++ zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-27 12:26:48.423352457 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-27 12:18:09.943570319 +0800 -+++ zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 @@ +diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am +index 0a55934..a7f6a28 100644 +--- a/src/zabbix_server/Makefile.am ++++ b/src/zabbix_server/Makefile.am +@@ -186,4 +186,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-27 12:18:10.041571412 +0800 -+++ zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-27 12:18:10.008571044 +0800 -+++ zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-27 12:18:10.031571301 +0800 -+++ zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-27 12:18:10.003570988 +0800 -+++ zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-27 12:18:09.909569940 +0800 -+++ zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-27 12:18:10.006571022 +0800 -+++ zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-27 12:18:10.010571066 +0800 -+++ zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-27 12:26:48.424352468 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-27 12:18:09.963570542 +0800 -+++ zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-27 12:18:10.017571144 +0800 -+++ zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-27 12:18:09.986570799 +0800 -+++ zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-27 12:18:09.959570498 +0800 -+++ zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-27 12:18:10.019571167 +0800 -+++ zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -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 zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-27 12:18:09.933570208 +0800 -+++ zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-27 12:26:48.425352479 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +--- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600 ++++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600 +@@ -24,7 +24,7 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a + AC_CONFIG_HEADERS(include/common/config.h) - libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-27 12:18:10.013571100 +0800 -+++ zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-27 12:26:48.426352490 +0800 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +-AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include']) ++AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include']) -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvmware.a + AC_CANONICAL_HOST - libzbxvmware_a_SOURCES = \ diff --git a/zabbix.spec b/zabbix.spec index f61486c..8ffd9b3 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -1,43 +1,58 @@ -%global srcname zabbix - -Name: zabbix -Version: 6.0.36 -Release: 1 -Summary: The Enterprise-class open source monitoring solution -License: GPLv2 -URL: http://www.zabbix.com/ -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 -Source9: %{srcname}-tmpfiles-zabbix.conf +# TODO, maybe sometime: +# * Allow for nginx? +# * Consider using systemd's ReadWriteDirectories + +#TODO: systemctl reload seems to be necessary after switching with Alternatives +#TODO: If the DB path for a Sqlite proxy is configured wrong, it requires systemctl restart. Start doesn't work. + +%global with_selinux 1 +%global selinuxtype targeted +# go is needed for agent2, but there are missing deps +%bcond_with go +# Missing dependencies for the java connector +%bcond_with java +#%%global prerelease rc2 + +Name: zabbix +Version: 7.0.6 +Release: 1 +Summary: Open-source monitoring solution for your IT infrastructure +License: AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC +URL: https://www.zabbix.com +Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-%{version}.tar.gz +Source1: %{name}-web.conf +Source2: %{name}-php-fpm.conf +Source5: %{name}-logrotate.in +Source9: %{name}-tmpfiles-zabbix.conf # systemd units -- Alternatives switches between them (they state their dependencies) # https://support.zabbix.com/browse/ZBXNEXT-1593 -Source10: %{srcname}-agent.service -Source11: %{srcname}-proxy-mysql.service -Source12: %{srcname}-proxy-pgsql.service -Source13: %{srcname}-proxy-sqlite3.service -Source14: %{srcname}-server-mysql.service -Source15: %{srcname}-server-pgsql.service -Source17: %{srcname}-tmpfiles-zabbixsrv.conf -Source18: %{srcname}.te -Source19: %{srcname}.if -Source20: %{srcname}.fc - +Source10: %{name}-agent.service +Source11: %{name}-proxy-mysql.service +Source12: %{name}-proxy-pgsql.service +Source13: %{name}-proxy-sqlite3.service +Source14: %{name}-server-mysql.service +Source15: %{name}-server-pgsql.service +Source17: %{name}-tmpfiles-zabbixsrv.conf +Source18: %{name}.te +Source19: %{name}.if +Source20: %{name}.fc + # This is not a symlink, because we don't want the webserver to possibly ever serve it. # local rules for config files -Patch0: %{srcname}-config.patch +Patch0: %{name}-config.patch # Allow out-of-tree builds # https://support.zabbix.com/browse/ZBXNEXT-6077 -Patch1: %{srcname}-out-of-tree.patch +Patch1: %{name}-out-of-tree.patch # Enforce Fedora Crypto Policy -Patch2: %{srcname}-crypto-policy.patch -Patch3: %{srcname}-configure-sscanf.patch +Patch2: %{name}-crypto-policy.patch +# Add <stdio> to sscanf check +# https://support.zabbix.com/browse/ZBX-21946 +Patch3: %{name}-configure-sscanf.patch # Patch1 patches automake files so we need to autoreconf BuildRequires: libtool BuildRequires: make -BuildRequires: mysql-devel +BuildRequires: mariadb-connector-c-devel BuildRequires: libpq-devel BuildRequires: sqlite-devel BuildRequires: net-snmp-devel @@ -52,12 +67,36 @@ BuildRequires: libxml2-devel BuildRequires: libevent-devel BuildRequires: pcre2-devel BuildRequires: gcc - +# For Agent 2 - has missing deps +%if %{with go} +BuildRequires: gcc-go +#BuildRequires: golang(github.com/alimy/mc/v2) +BuildRequires: golang(github.com/docker/go-connections) +#BuildRequires: golang(github.com/dustin/gomemcached) +BuildRequires: golang(github.com/fsnotify/fsnotify) +BuildRequires: golang(github.com/go-ldap/ldap) +#BuildRequires: golang(github.com/go-ole/go-ole) +BuildRequires: golang(github.com/go-sql-driver/mysql) +BuildRequires: golang(github.com/godbus/dbus) +#BuildRequires: golang(github.com/jackc/pgx/v4) +BuildRequires: golang(github.com/mattn/go-sqlite3) +#BuildRequires: golang(github.com/mediocregopher/radix/v3) +#BuildRequires: golang(github.com/natefinch/npipe) +#BuildRequires: golang(github.com/testcontainers/testcontainers-go) +#BuildRequires: golang(golang.org/x/sys) +%endif BuildRequires: systemd -BuildRequires: google-noto-sans-cjk-sc-fonts -BuildRequires: fonts-srpm-macros - +# Needed to determine path to link to +BuildRequires: dejavu-sans-fonts + Requires: logrotate + +%if 0%{?with_selinux} +# This ensures that the *-selinux package and all it’s dependencies are not pulled +# into containers and other systems that do not use SELinux +Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) +%endif + Provides: bundled(md5-deutsch) %description @@ -67,7 +106,7 @@ that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualization features based on the stored data. This makes Zabbix ideal for capacity planning. - + Zabbix supports both polling and trapping. All Zabbix reports and statistics, as well as configuration parameters are accessed through a web-based front end. A web-based front end ensures that the status of your network and the health of @@ -79,27 +118,27 @@ multitude of servers. %package dbfiles-mysql Summary: Zabbix database schemas, images, data and patches BuildArch: noarch - + %description dbfiles-mysql Zabbix database schemas, images, data and patches necessary for creating and/or updating MySQL databases - + %package dbfiles-pgsql Summary: Zabbix database schemas, images, data and patches BuildArch: noarch - + %description dbfiles-pgsql Zabbix database schemas, images, data and patches necessary for creating and/or updating PostgreSQL databases - + %package dbfiles-sqlite3 Summary: Zabbix database schemas and patches BuildArch: noarch - + %description dbfiles-sqlite3 Zabbix database schemas and patches necessary for creating and/or updating SQLite databases - + %package server Summary: Zabbix server common files BuildArch: noarch @@ -108,171 +147,187 @@ Requires: %{name}-server-implementation = %{version}-%{release} Requires: fping Requires: traceroute Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - +%{?systemd_requires} + %description server Zabbix server common files - + %package server-mysql Summary: Zabbix server compiled to use MySQL Requires: %{name} = %{version}-%{release} Requires: %{name}-dbfiles-mysql Requires: %{name}-server = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{version}-%{release} - + %description server-mysql Zabbix server compiled to use MySQL - + %package server-pgsql Summary: Zabbix server compiled to use PostgreSQL Requires: %{name} = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: %{name}-dbfiles-pgsql Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{version}-%{release} - + %description server-pgsql Zabbix server compiled to use PostgreSQL - + %package agent Summary: Zabbix agent Requires: %{name} = %{version}-%{release} Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - +%{?systemd_requires} + %description agent Zabbix agent, to be installed on monitored systems - + %package proxy Summary: Zabbix proxy common files BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: %{name}-proxy-implementation = %{version}-%{release} Requires(pre): shadow-utils -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} Requires: fping - + %description proxy Zabbix proxy commmon files - + %package proxy-mysql Summary: Zabbix proxy compiled to use MySQL Requires: %{name}-proxy = %{version}-%{release} Requires: %{name}-dbfiles-mysql Provides: %{name}-proxy-implementation = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives - + %description proxy-mysql Zabbix proxy compiled to use MySQL - + %package proxy-pgsql Summary: Zabbix proxy compiled to use PostgreSQL Requires: %{name}-proxy = %{version}-%{release} Requires: %{name}-dbfiles-pgsql Provides: %{name}-proxy-implementation = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives - + %description proxy-pgsql Zabbix proxy compiled to use PostgreSQL - + %package proxy-sqlite3 Summary: Zabbix proxy compiled to use SQLite Requires: %{name}-proxy = %{version}-%{release} Requires: %{name}-dbfiles-sqlite3 Provides: %{name}-proxy-implementation = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives - + %description proxy-sqlite3 Zabbix proxy compiled to use SQLite - + %package web Summary: Zabbix Web Frontend BuildArch: noarch Requires: php-bcmath -Requires: php-fpm +Requires: (php-fpm >= 8.0 with php-fpm < 8.4) Requires: php-gd Requires: php-gettext Requires: php-json Requires: php-ldap Requires: php-mbstring Requires: php-xml -# jquery 3.3.1 and jquery-ui 1.12.1 in the sources +# jquery 3.6.0 and jquery-ui 1.13.2 in the sources Requires: js-jquery >= 3.6.0 -Provides: bundled(js-jquery-ui) = 1.12.1 +Provides: bundled(js-jquery-ui) = 1.13.2 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype -Requires: google-noto-sans-cjk-sc-fonts +Requires: dejavu-sans-fonts Requires: %{name} = %{version}-%{release} Requires: %{name}-web-database = %{version}-%{release} - + %description web The php frontend to display the Zabbix web interface. - + %package web-mysql Summary: Zabbix web frontend for MySQL BuildArch: noarch Requires: %{name}-web = %{version}-%{release} Requires: php-mysqli Provides: %{name}-web-database = %{version}-%{release} - + %description web-mysql Zabbix web frontend for MySQL - + %package web-pgsql Summary: Zabbix web frontend for PostgreSQL BuildArch: noarch Requires: %{name}-web = %{version}-%{release} Requires: php-pgsql Provides: %{name}-web-database = %{version}-%{release} - + %description web-pgsql Zabbix web frontend for PostgreSQL +%if %{with java} +%package -n java-%{name} +Summary: Zabbix Java connector +BuildArch: noarch +BuildRequires: java-devel +BuildRequires: osgi(org.junit) +BuildRequires: osgi(slf4j.api) +BuildRequires: osgi(logback) + +%description -n java-%{name} +Zabbix Java connector. +%endif + +%if 0%{?with_selinux} +# SELinux subpackage +%package selinux +Summary: Zabbix SELinux policy +BuildArch: noarch +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description selinux +Custom SELinux policy module +%endif + + %prep %autosetup -p1 - autoreconf - + # Remove bundled java libs find -name \*.jar -delete - + # Remove prebuilt Windows binaries rm -rf bin - + # Override creation of statically named directory for alertscripts and externalscripts # https://support.zabbix.com/browse/ZBX-6159 sed -i '/CURL_SSL_.*_LOCATION\|SCRIPTS_PATH/s|\${datadir}/zabbix|/var/lib/zabbixsrv|' \ configure - + # Kill off .htaccess files, options set in SOURCE1 find -name .htaccess -delete - + # Fix path to traceroute utility (on all Linux targets) find database -name 'data.sql' -exec sed -i 's|/usr/bin/traceroute|/bin/traceroute|' {} \; - + # Common # Settings with hard-coded defaults that are not suitable for Fedora # are explicitly set, leaving the comment with the default value in place. # Settings without hard-coded defaults are simply replaced -- be they # comments or explicit settings! - + # Also replace the datadir placeholder that is not expanded, but effective sed -i \ -e '\|^# LogFileSize=.*|a LogFileSize=0' \ @@ -284,26 +339,25 @@ sed -i \ -e 's|/usr/local||' \ -e 's|\${datadir}|/usr/share|' \ conf/zabbix_agentd.conf conf/zabbix_proxy.conf conf/zabbix_server.conf - + # Specific sed -i \ -e '\|^# PidFile=.*|a PidFile=%{_rundir}/zabbix/zabbix_agentd.pid' \ -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|' \ conf/zabbix_agentd.conf - + sed -i \ -e '\|^# PidFile=.*|a PidFile=%{_rundir}/zabbixsrv/zabbix_proxy.pid' \ -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbixsrv/zabbix_proxy.log|' \ conf/zabbix_proxy.conf - + sed -i \ -e '\|^# PidFile=.*|a PidFile=%{_rundir}/zabbixsrv/zabbix_server.pid' \ -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbixsrv/zabbix_server.log|' \ conf/zabbix_server.conf - %build - + common_flags=" --enable-dependency-tracking --enable-proxy @@ -321,192 +375,252 @@ common_flags=" " # Setup out of tree builds %global _configure ../configure - + +%if %{with java} +export CLASSPATH=$(build-classpath junit slf4j-api logback-core logback-classic android-json) +%endif + # Frontend doesn't work for SQLite, thus don't build server mkdir -p build-frontend cd build-frontend -%configure $common_flags --enable-agent --with-sqlite3 +%configure $common_flags --enable-agent --with-sqlite3 %{?with_go:--enable-agent2} %{?with_java:--enable-java} %make_build cd - - + mkdir -p build-server-mysql cd build-server-mysql %configure $common_flags --with-mysql --enable-server %make_build cd - - + mkdir -p build-server-postgresql cd build-server-postgresql %configure $common_flags --with-postgresql --enable-server %make_build cd - - + %if 0%{?with_selinux} # SELinux policy (originally from selinux-policy-contrib) # this policy module will override the production module mkdir selinux -cp -p %{SOURCE18} selinux/ -cp -p %{SOURCE19} selinux/ -cp -p %{SOURCE20} selinux/ - -make -f %{_datadir}/selinux/devel/Makefile %{srcname}.pp -bzip2 -9 %{srcname}.pp +cp -p %{S:18} selinux/ +cp -p %{S:19} selinux/ +cp -p %{S:20} selinux/ + +make -f %{_datadir}/selinux/devel/Makefile %{name}.pp +bzip2 -9 %{name}.pp %endif - - + + %install # Install binaries %make_install -C build-frontend -mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_sqlite3} +mv %{buildroot}%{_sbindir}/zabbix_proxy{,_sqlite3} %make_install -C build-server-mysql -mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_mysql} -mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_server{,_mysql} +mv %{buildroot}%{_sbindir}/zabbix_proxy{,_mysql} +mv %{buildroot}%{_sbindir}/zabbix_server{,_mysql} %make_install -C build-server-postgresql -mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_pgsql} -mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_server{,_pgsql} - +mv %{buildroot}%{_sbindir}/zabbix_proxy{,_pgsql} +mv %{buildroot}%{_sbindir}/zabbix_server{,_pgsql} + # Ghosted alternatives -touch $RPM_BUILD_ROOT%{_sbindir}/zabbix_{proxy,server} - +touch %{buildroot}%{_sbindir}/zabbix_{proxy,server} + # Home directory for the agent; # The other home directory is created during installation -mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/zabbix - +mkdir -p %{buildroot}%{_sharedstatedir}/zabbix + # Log directories -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbix -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbixsrv - +mkdir -p %{buildroot}%{_localstatedir}/log/zabbix +mkdir -p %{buildroot}%{_localstatedir}/log/zabbixsrv + # systemd tmpfiles -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d -install -m 0644 -p %{SOURCE9} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix.conf -install -m 0644 -p %{SOURCE17} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf -mkdir -p $RPM_BUILD_ROOT%{_rundir} -install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbix/ -install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbixsrv/ - +mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d +install -m 0644 -p %{S:9} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbix.conf +install -m 0644 -p %{S:17} %{buildroot}%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf +mkdir -p %{buildroot}%{_rundir} +install -d -m 0755 %{buildroot}%{_rundir}/zabbix/ +install -d -m 0755 %{buildroot}%{_rundir}/zabbixsrv/ + # Install the frontend after removing backup files from patching find ui -name '*.orig' -delete -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{srcname} -cp -a ui/* $RPM_BUILD_ROOT%{_datadir}/%{srcname}/ - +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -a ui/* %{buildroot}%{_datadir}/%{name}/ + # Prepare ghosted config file -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web -touch $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php - +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/web +touch %{buildroot}%{_sysconfdir}/%{name}/web/zabbix.conf.php + # Replace bundled font -[ -d %{_fontbasedir}/google-noto-cjk ] && - ln -sf ../../../fonts/google-noto-cjk/NotoSansCJKsc-Regular.otf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/assets/fonts/DejaVuSans.ttf - +[ -d %{_fontbasedir}/dejavu ] && + ln -sf ../../../fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/assets/fonts/ +[ -d %{_fontbasedir}/dejavu-sans-fonts ] && + ln -sf ../../../fonts/dejavu-sans-fonts/DejaVuSans.ttf %{buildroot}%{_datadir}/%{name}/assets/fonts/ + # Replace JS libraries # There is no jquery-ui package yet -ln -sf ../../../javascript/jquery/3/jquery.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery.js -#ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery-ui.js - +ln -sf ../../../javascript/jquery/3/jquery.min.js %{buildroot}%{_datadir}/%{name}/js/vendors/jquery.js +#ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js %{buildroot}%{_datadir}/%{name}/js/vendors/jquery-ui.js + # This file is used to switch the frontend to maintenance mode -mv $RPM_BUILD_ROOT%{_datadir}/%{srcname}/conf/maintenance.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/maintenance.inc.php || : - +mv %{buildroot}%{_datadir}/%{name}/conf/maintenance.inc.php %{buildroot}%{_sysconfdir}/%{name}/web/maintenance.inc.php || : + # Drop Apache config file in place -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d -install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{srcname}.conf - +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d +install -m 0644 -p %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf + # Drop php-fpm config file in place -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d -install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/%{srcname}.conf - +mkdir -p %{buildroot}%{_sysconfdir}/php-fpm.d +install -m 0644 -p %{S:2} %{buildroot}%{_sysconfdir}/php-fpm.d/%{name}.conf + # Install log rotation -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -sed -e 's|COMPONENT|agentd|g; s|USER|zabbix|g' %{SOURCE5} > \ - $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent -sed -e 's|COMPONENT|server|g; s|USER|zabbixsrv|g' %{SOURCE5} > \ - $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server -sed -e 's|COMPONENT|proxy|g; s|USER|zabbixsrv|g' %{SOURCE5} > \ - $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy - +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +sed -e 's|COMPONENT|agentd|g; s|USER|zabbix|g' %{S:5} > \ + %{buildroot}%{_sysconfdir}/logrotate.d/zabbix-agent +sed -e 's|COMPONENT|server|g; s|USER|zabbixsrv|g' %{S:5} > \ + %{buildroot}%{_sysconfdir}/logrotate.d/zabbix-server +sed -e 's|COMPONENT|proxy|g; s|USER|zabbixsrv|g' %{S:5} > \ + %{buildroot}%{_sysconfdir}/logrotate.d/zabbix-proxy + # Install different systemd units because of the requirements for DBMS daemons -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -m 0644 -p %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent.service -install -m 0644 -p %{SOURCE11} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-mysql.service -install -m 0644 -p %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-pgsql.service -install -m 0644 -p %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-sqlite3.service -install -m 0644 -p %{SOURCE14} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server-mysql.service -install -m 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server-pgsql.service - +mkdir -p %{buildroot}%{_unitdir} +install -m 0644 -p %{S:10} %{buildroot}%{_unitdir}/zabbix-agent.service +install -m 0644 -p %{S:11} %{buildroot}%{_unitdir}/zabbix-proxy-mysql.service +install -m 0644 -p %{S:12} %{buildroot}%{_unitdir}/zabbix-proxy-pgsql.service +install -m 0644 -p %{S:13} %{buildroot}%{_unitdir}/zabbix-proxy-sqlite3.service +install -m 0644 -p %{S:14} %{buildroot}%{_unitdir}/zabbix-server-mysql.service +install -m 0644 -p %{S:15} %{buildroot}%{_unitdir}/zabbix-server-pgsql.service + # Ghosted alternatives -touch $RPM_BUILD_ROOT%{_unitdir}/zabbix-server.service -touch $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy.service - +touch %{buildroot}%{_unitdir}/zabbix-server.service +touch %{buildroot}%{_unitdir}/zabbix-proxy.service + # Directory for fping spooling files -mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/zabbixsrv/tmp - +mkdir -p %{buildroot}%{_sharedstatedir}/zabbixsrv/tmp + # Install sql files for db in postgresql mysql; do - mkdir $RPM_BUILD_ROOT%{_datadir}/%{srcname}-$db - cp -p database/$db/*.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-$db + mkdir %{buildroot}%{_datadir}/%{name}-$db + cp -p database/$db/*.sql %{buildroot}%{_datadir}/%{name}-$db done - -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{srcname}-sqlite3 -cp -p database/sqlite3/schema.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-sqlite3 + +install -dm 755 %{buildroot}%{_datadir}/%{name}-sqlite3 +cp -p database/sqlite3/schema.sql %{buildroot}%{_datadir}/%{name}-sqlite3 + +%if 0%{?with_selinux} +install -D -m 0644 %{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 +install -D -p -m 0644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if +%endif + %post server %systemd_post zabbix-server.service - + if [ $1 -gt 1 ] ; then # Apply permissions also in *.rpmnew upgrades from old permissive ones chmod 0640 %{_sysconfdir}/zabbix_server.conf chown root:zabbixsrv %{_sysconfdir}/zabbix_server.conf fi : - + %post server-mysql -%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ - %{srcname}-server %{_sbindir}/%{srcname}_server_mysql 10 \ - --slave %{_unitdir}/zabbix-server.service %{srcname}-server-systemd \ +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \ + %{name}-server %{_sbindir}/%{name}_server_mysql 10 \ + --slave %{_unitdir}/zabbix-server.service %{name}-server.service \ %{_unitdir}/zabbix-server-mysql.service - +# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2 +# due to a bug in alternatives. +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \ + %{name}-server %{_sbindir}/%{name}_server_mysql 10 \ + --slave %{_unitdir}/zabbix-server.service %{name}-server.service \ + %{_unitdir}/zabbix-server-mysql.service + %post server-pgsql -%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ - %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql 10 \ - --slave %{_unitdir}/zabbix-server.service %{srcname}-server-systemd \ +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \ + %{name}-server %{_sbindir}/%{name}_server_pgsql 10 \ + --slave %{_unitdir}/zabbix-server.service %{name}-server.service \ %{_unitdir}/zabbix-server-pgsql.service - +# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2 +# due to a bug in alternatives. +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_server \ + %{name}-server %{_sbindir}/%{name}_server_pgsql 10 \ + --slave %{_unitdir}/zabbix-server.service %{name}-server.service \ + %{_unitdir}/zabbix-server-pgsql.service + %post proxy %systemd_post zabbix-proxy.service - + if [ $1 -gt 1 ] ; then # Apply permissions also in *.rpmnew upgrades from old permissive ones chmod 0640 %{_sysconfdir}/zabbix_proxy.conf chown root:zabbixsrv %{_sysconfdir}/zabbix_proxy.conf fi : - + %post proxy-mysql -%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ - %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql 10 \ - --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \ + %{name}-proxy %{_sbindir}/%{name}_proxy_mysql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \ + %{_unitdir}/zabbix-proxy-mysql.service +# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2 +# due to a bug in alternatives. Remove in F45 +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \ + %{name}-proxy %{_sbindir}/%{name}_proxy_mysql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \ %{_unitdir}/zabbix-proxy-mysql.service - + %post proxy-pgsql -%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ - %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql 10 \ - --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \ + %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \ + %{_unitdir}/zabbix-proxy-pgsql.service +# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2 +# due to a bug in alternatives. Remove in F45 +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \ + %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \ %{_unitdir}/zabbix-proxy-pgsql.service - + %post proxy-sqlite3 -%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ - %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 10 \ - --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \ + %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \ %{_unitdir}/zabbix-proxy-sqlite3.service - +# This needs to be run twice to rename from old slave name in zabbix < 6.0.33-2 +# due to a bug in alternatives. Remove in F45 +%{_sbindir}/update-alternatives --install %{_sbindir}/%{name}_proxy \ + %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{name}-proxy.service \ + %{_unitdir}/zabbix-proxy-sqlite3.service + +%if 0%{?with_selinux} +# SELinux contexts are saved so that only affected files can be +# relabeled after the policy module installation +%pre selinux +%selinux_relabel_pre -s %{selinuxtype} + +%post selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 + +%postun selinux +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{name} +fi + +%posttrans selinux +%selinux_relabel_post -s %{selinuxtype} +%endif + %pre agent getent group zabbix > /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 - + %pre server getent group zabbixsrv > /dev/null || groupadd -r zabbixsrv # The zabbixsrv group is introduced by 2.2 packaging @@ -520,10 +634,10 @@ else -c "Zabbix Monitoring System -- Proxy or server" zabbixsrv fi : - + %preun server %systemd_preun zabbix-server.service - + %pre proxy getent group zabbixsrv > /dev/null || groupadd -r zabbixsrv # The zabbixsrv group is introduced by 2.2 packaging @@ -537,70 +651,71 @@ else -c "Zabbix Monitoring System -- Proxy or server" zabbixsrv fi : - + %preun proxy %systemd_preun zabbix-proxy.service - + %preun agent %systemd_preun zabbix-agent.service - + %postun server %systemd_postun_with_restart zabbix-server.service - + %postun server-mysql if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{srcname}-server %{_sbindir}/%{srcname}_server_mysql + %{_sbindir}/update-alternatives --remove %{name}-server %{_sbindir}/%{name}_server_mysql fi - + %postun server-pgsql if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql + %{_sbindir}/update-alternatives --remove %{name}-server %{_sbindir}/%{name}_server_pgsql fi - + %postun proxy %systemd_postun_with_restart zabbix-proxy.service - + %postun proxy-mysql if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql + %{_sbindir}/update-alternatives --remove %{name}-proxy %{_sbindir}/%{name}_proxy_mysql fi - + %postun proxy-pgsql if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql + %{_sbindir}/update-alternatives --remove %{name}-proxy %{_sbindir}/%{name}_proxy_pgsql fi - + %postun proxy-sqlite3 if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 + %{_sbindir}/update-alternatives --remove %{name}-proxy %{_sbindir}/%{name}_proxy_sqlite3 fi - + %postun agent %systemd_postun_with_restart zabbix-agent.service + %files %license COPYING %doc AUTHORS ChangeLog NEWS README -%dir %{_sysconfdir}/%{srcname} +%dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/zabbix_agentd.conf %{_bindir}/zabbix_get %{_bindir}/zabbix_js %{_bindir}/zabbix_sender %{_mandir}/man1/zabbix_get.1* %{_mandir}/man1/zabbix_sender.1* - + %files dbfiles-mysql %license COPYING -%{_datadir}/%{srcname}-mysql/ - +%{_datadir}/%{name}-mysql/ + %files dbfiles-pgsql %license COPYING -%{_datadir}/%{srcname}-postgresql/ - +%{_datadir}/%{name}-postgresql/ + %files dbfiles-sqlite3 %license COPYING -%{_datadir}/%{srcname}-sqlite3/ - +%{_datadir}/%{name}-sqlite3/ + %files server %doc misc/snmptrap/zabbix_trap_receiver.pl %attr(0755,zabbixsrv,zabbixsrv) %dir %{_rundir}/zabbixsrv/ @@ -615,22 +730,22 @@ fi %attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/externalscripts %ghost %{_unitdir}/zabbix-server.service %{_mandir}/man8/zabbix_server.8* - + %files server-mysql %{_sbindir}/zabbix_server_mysql %{_unitdir}/zabbix-server-mysql.service - + %files server-pgsql %{_sbindir}/zabbix_server_pgsql %{_unitdir}/zabbix-server-pgsql.service - + %if 0%{?with_selinux} %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.* %{_datadir}/selinux/devel/include/distributed/%{name}.if %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %endif - + %files agent %doc conf/zabbix_agentd/*.conf %attr(0755,zabbix,zabbix) %dir %{_rundir}/zabbix/ @@ -642,7 +757,7 @@ fi %{_unitdir}/zabbix-agent.service %{_sbindir}/zabbix_agentd %{_mandir}/man8/zabbix_agentd.8* - + %files proxy %doc misc/snmptrap/zabbix_trap_receiver.pl %attr(0755,zabbixsrv,zabbixsrv) %dir %{_rundir}/zabbixsrv/ @@ -657,70 +772,41 @@ fi %attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/externalscripts %ghost %{_unitdir}/zabbix-proxy.service %{_mandir}/man8/zabbix_proxy.8* - + %files proxy-mysql %{_sbindir}/zabbix_proxy_mysql %{_unitdir}/zabbix-proxy-mysql.service - + %files proxy-pgsql %{_sbindir}/zabbix_proxy_pgsql %{_unitdir}/zabbix-proxy-pgsql.service - + %files proxy-sqlite3 %{_sbindir}/zabbix_proxy_sqlite3 %{_unitdir}/zabbix-proxy-sqlite3.service - + %files web -%dir %attr(0750,apache,apache) %{_sysconfdir}/%{srcname}/web -%ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/zabbix.conf.php -%attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/maintenance.inc.php +%dir %attr(0750,apache,apache) %{_sysconfdir}/%{name}/web +%ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{name}/web/zabbix.conf.php +%attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{name}/web/maintenance.inc.php %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf %config(noreplace) %{_sysconfdir}/php-fpm.d/zabbix.conf -%{_datadir}/%{srcname}/ - +%{_datadir}/%{name}/ + %files web-mysql - + %files web-pgsql %changelog -* Fri Nov 22 2024 Funda Wang <fundawang@yeah.net> - 6.0.36-1 -- 6.0.36 - -* Wed Oct 23 2024 Funda Wang <fundawang@yeah.net> - 6.0.35-1 -- 6.0.35 - -* Sun Sep 29 2024 Funda Wang <fundawang@yeah.net> - 6.0.34-1 -- 6.0.34 - -* Thu Aug 15 2024 Funda Wang <fundawang@yeah.net> - 6.0.33-1 -- 6.0.33 - -* Wed Jul 17 2024 Funda Wang <fundawang@yeah.net> - 6.0.32-1 -- 6.0.32 - -* Sun Jun 23 2024 Funda Wang <fundawang@yeah.net> - 6.0.31-1 -- 6.0.31 - -* Fri May 31 2024 Funda Wang <fundawang@yeah.net> - 6.0.30-1 -- 6.0.30 - -* Wed Apr 24 2024 Funda Wang <fundawang@yeah.net> - 6.0.29-1 -- 6.0.29 - -* Fri Mar 29 2024 Funda Wang <fundawang@yeah.net> - 6.0.28-1 -- 6.0.28 - -* Fri Feb 02 2024 Funda Wang <fundawang@yeah.net> - 6.0.26-1 -- 6.0.26 - -* Sat Jan 27 2024 Funda Wang <fundawang@yeah.net> - 6.0.25-1 -- 6.0.25 +* Fri Nov 22 2024 Funda Wang <fundawang@yeah.net> - 7.0.6-1 +- update to 7.0.6 +- tighten php requirment based on upstream documentation -* Mon Oct 02 2023 Funda Wang <fundawang@yeah.net> - 6.0.22-1 -- 6.0.22 +* Thu Oct 24 2024 Funda Wang <fundawang@yeah.net> - 7.0.5-1 +- update to 7.0.5 -* Tue Aug 22 2023 Funda Wang <fundawang@yeah.net> - 6.0.20-1 -- update to 6.0.20 +* Sat Oct 28 2023 beta <beta@yfqm.date> - 5.2.6-5 +- solve installation conflicts between zabbix-proxy-sqlite3 and zabbix-proxy-mysql * Mon Aug 15 2022 Zhang Jun <zhangjun@kylinos.cn> - 5.2.6-4 - update BuildRequire mysql-devel to mysql5-devel @@ -1,4 +1,4 @@ -policy_module(zabbix, 1.6.0) +policy_module(zabbix, 1.7.0) ######################################## # @@ -284,22 +284,48 @@ 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(` |