From 7109b9510dde5d43835eb46454b50d40371b9b2f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 23 Mar 2022 11:46:03 -0600 Subject: [PATCH 01/68] Update to 6.0.2 --- .gitignore | 1 + sources | 2 +- zabbix-config.patch | 28 +- zabbix-out-of-tree.patch | 1232 +++++++++++++++++++++----------------- zabbix.spec | 20 +- 5 files changed, 710 insertions(+), 573 deletions(-) diff --git a/.gitignore b/.gitignore index 195cc30..4fa3b0b 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ zabbix-1.8.2.tar.gz /zabbix-5.0.18.tar.gz /zabbix-5.0.19.tar.gz /zabbix-5.0.21.tar.gz +/zabbix-6.0.2.tar.gz diff --git a/sources b/sources index 7da9498..9a09edd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-5.0.21.tar.gz) = 1c448fa5c2d8323c30793a923597c64e4aede3c3f0185bb0462e52677e955e8d75954d336baebe4226691cc186f2840402c8b2b1fe318c227c45541030b3bac3 +SHA512 (zabbix-6.0.2.tar.gz) = 618b1705f4e1689af4d234e877ea4136d52de39bfedf6512f396b79278750bfaf994d132a7876420705690045bee78ebc2c7297ac31ac4ddd92f00d8f781267d diff --git a/zabbix-config.patch b/zabbix-config.patch index 299b494..9d58fc6 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,19 +1,19 @@ -diff -up zabbix-5.0.6/ui/include/classes/core/CConfigFile.php.config zabbix-5.0.6/ui/include/classes/core/CConfigFile.php ---- zabbix-5.0.6/ui/include/classes/core/CConfigFile.php.config 2020-11-30 04:16:17.000000000 -0700 -+++ zabbix-5.0.6/ui/include/classes/core/CConfigFile.php 2020-12-13 14:45:24.690966761 -0700 -@@ -24,7 +24,7 @@ class CConfigFile { - const CONFIG_NOT_FOUND = 1; +diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0.2/ui/include/classes/core/CConfigFile.php +--- zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config 2022-03-23 08:38:25.049013803 -0600 ++++ zabbix-6.0.2/ui/include/classes/core/CConfigFile.php 2022-03-23 08:39:25.001657019 -0600 +@@ -25,7 +25,7 @@ class CConfigFile { const CONFIG_ERROR = 2; + const CONFIG_VAULT_ERROR = 3; - const CONFIG_FILE_PATH = '/conf/zabbix.conf.php'; + const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php'; private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff -up zabbix-5.0.6/ui/include/classes/core/ZBase.php.config zabbix-5.0.6/ui/include/classes/core/ZBase.php ---- zabbix-5.0.6/ui/include/classes/core/ZBase.php.config 2020-11-30 04:16:17.000000000 -0700 -+++ zabbix-5.0.6/ui/include/classes/core/ZBase.php 2020-12-13 14:45:24.691966769 -0700 -@@ -322,7 +322,7 @@ class ZBase { +diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/include/classes/core/ZBase.php +--- zabbix-6.0.2/ui/include/classes/core/ZBase.php.config 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/ui/include/classes/core/ZBase.php 2022-03-23 08:38:25.052013836 -0600 +@@ -368,7 +368,7 @@ class ZBase { * @throws Exception */ protected function setMaintenanceMode() { @@ -22,7 +22,7 @@ diff -up zabbix-5.0.6/ui/include/classes/core/ZBase.php.config zabbix-5.0.6/ui/i if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -335,7 +335,7 @@ class ZBase { +@@ -381,7 +381,7 @@ class ZBase { * Load zabbix config file. */ protected function loadConfigFile() { @@ -31,10 +31,10 @@ diff -up zabbix-5.0.6/ui/include/classes/core/ZBase.php.config zabbix-5.0.6/ui/i $config = new CConfigFile($configFile); $this->config = $config->load(); } -diff -up zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php.config zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php ---- zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php.config 2020-11-30 04:16:17.000000000 -0700 -+++ zabbix-5.0.6/ui/include/classes/setup/CSetupWizard.php 2020-12-13 14:45:50.510168641 -0700 -@@ -678,7 +678,7 @@ class CSetupWizard extends CForm { +diff -up zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php +--- zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php 2022-03-23 08:38:25.054013857 -0600 +@@ -271,7 +271,7 @@ class CSetupWizard extends CForm { // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 051a55a..955790c 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,6 +1,36 @@ -diff -up zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxalgo/Makefile.am ---- zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxalgo/Makefile.am 2021-11-30 18:52:58.203303610 -0700 +diff -up zabbix-6.0.2/src/go/Makefile.am.out-of-tree zabbix-6.0.2/src/go/Makefile.am +--- zabbix-6.0.2/src/go/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/go/Makefile.am 2022-03-23 11:14:11.273841264 -0600 +@@ -57,15 +57,15 @@ zabbix.com/cmd/zabbix_web_service: + build: ${TARGETS} + + clean: +- go clean ./... ++ go clean $(srcdir)/... + rm -f bin/zabbix_agent2 bin/mock_server + + install-zabbix.com/cmd/zabbix_agent2: + CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ + go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} + $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" +- test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" +- for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \ ++ test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" ++ for cfg in $(top_srcdir)conf/zabbix_agent2.d/plugins.d/*.conf; do \ + test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ + cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ + done +@@ -76,6 +76,6 @@ install-zabbix.com/cmd/zabbix_web_servic + install-exec-local: ${INSTALL_TARGETS} + + check: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... ++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... + style: + CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... +diff -up zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxalgo/Makefile.am +--- zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxalgo/Makefile.am 2022-03-23 11:14:11.274841274 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -9,9 +39,31 @@ diff -up zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxalgo.a if SERVER -diff -up zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcommon/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcommon/Makefile.am 2021-11-30 18:52:58.203303610 -0700 +diff -up zabbix-6.0.2/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxaudit/Makefile.am +--- zabbix-6.0.2/src/libs/zbxaudit/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxaudit/Makefile.am 2022-03-23 11:14:11.274841274 -0600 +@@ -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.2/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxavailability/Makefile.am +--- zabbix-6.0.2/src/libs/zbxavailability/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxavailability/Makefile.am 2022-03-23 11:14:11.275841283 -0600 +@@ -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.2/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcommon/Makefile.am +--- zabbix-6.0.2/src/libs/zbxcommon/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxcommon/Makefile.am 2022-03-23 11:14:11.275841283 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -20,9 +72,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxcommon.a libzbxcommon_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am +--- zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am 2022-03-23 11:14:11.276841292 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -31,9 +83,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-5.0. noinst_LIBRARIES = libzbxcommshigh.a libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcomms/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxcomms/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcomms/Makefile.am +--- zabbix-6.0.2/src/libs/zbxcomms/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxcomms/Makefile.am 2022-03-23 11:14:11.277841302 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -42,9 +94,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxcomms.a libzbxcomms_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcompress/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcompress/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcompress/Makefile.am +--- zabbix-6.0.2/src/libs/zbxcompress/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxcompress/Makefile.am 2022-03-23 11:14:11.277841302 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -53,9 +105,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-5.0.1 noinst_LIBRARIES = libzbxcompress.a libzbxcompress_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxconf/Makefile.am ---- zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxconf/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxconf/Makefile.am +--- zabbix-6.0.2/src/libs/zbxconf/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxconf/Makefile.am 2022-03-23 11:14:11.278841311 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -64,9 +116,9 @@ diff -up zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxconf.a libzbxconf_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am +--- zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am 2022-03-23 11:14:11.278841311 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -75,9 +127,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxcrypto.a libzbxcrypto_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am +--- zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am 2022-03-23 11:14:11.279841320 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -86,9 +138,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-5.0.18 noinst_LIBRARIES = libzbxdbcache.a libzbxdbcache_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am +--- zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am 2022-03-23 11:14:11.279841320 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -97,9 +149,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-5.0.18/ if DBSCHEMA dbschema.c: $(top_srcdir)/create/src/schema.tmpl $(top_srcdir)/create/bin/gen_schema.pl c > dbschema.c -diff -up zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdb/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdb/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdb/Makefile.am +--- zabbix-6.0.2/src/libs/zbxdb/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxdb/Makefile.am 2022-03-23 11:14:11.280841329 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -108,9 +160,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-5.0.18/src/ noinst_LIBRARIES = libzbxdb.a libzbxdb_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am +--- zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am 2022-03-23 11:14:11.280841329 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -119,9 +171,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-5.0. noinst_LIBRARIES = libzbxdbupgrade.a libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdiag/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdiag/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-6.0.2/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdiag/Makefile.am +--- zabbix-6.0.2/src/libs/zbxdiag/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxdiag/Makefile.am 2022-03-23 11:14:11.281841339 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -130,9 +182,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxembed/Makefile.am ---- zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxembed/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxembed/Makefile.am +--- zabbix-6.0.2/src/libs/zbxembed/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxembed/Makefile.am 2022-03-23 11:14:11.281841339 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -141,9 +193,20 @@ diff -up zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxembed.a libzbxembed_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxexec/Makefile.am ---- zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxexec/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxeval/Makefile.am +--- zabbix-6.0.2/src/libs/zbxeval/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxeval/Makefile.am 2022-03-23 11:14:11.282841348 -0600 +@@ -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.2/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxexec/Makefile.am +--- zabbix-6.0.2/src/libs/zbxexec/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxexec/Makefile.am 2022-03-23 11:14:11.282841348 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -152,9 +215,20 @@ diff -up zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxexec.a libzbxexec_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxhistory/Makefile.am ---- zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxhistory/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxha/Makefile.am +--- zabbix-6.0.2/src/libs/zbxha/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxha/Makefile.am 2022-03-23 11:14:11.283841357 -0600 +@@ -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.2/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxhistory/Makefile.am +--- zabbix-6.0.2/src/libs/zbxhistory/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxhistory/Makefile.am 2022-03-23 11:14:11.283841357 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -163,9 +237,9 @@ diff -up zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-5.0.18 noinst_LIBRARIES = libzbxhistory.a libzbxhistory_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxhttp/Makefile.am ---- zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxhttp/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxhttp/Makefile.am +--- zabbix-6.0.2/src/libs/zbxhttp/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxhttp/Makefile.am 2022-03-23 11:14:11.284841367 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -174,9 +248,9 @@ diff -up zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxhttp.a libzbxhttp_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am ---- zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am +--- zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am 2022-03-23 11:14:11.284841367 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -185,9 +259,9 @@ diff -up zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-5.0.1 noinst_LIBRARIES = libzbxicmpping.a libzbxicmpping_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am ---- zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am +--- zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am 2022-03-23 11:14:11.285841376 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -196,9 +270,9 @@ diff -up zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libzbxipcservice.a libzbxipcservice_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxjson/Makefile.am ---- zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxjson/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxjson/Makefile.am +--- zabbix-6.0.2/src/libs/zbxjson/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxjson/Makefile.am 2022-03-23 11:14:11.285841376 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -207,9 +281,9 @@ diff -up zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxjson.a libzbxjson_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxlog/Makefile.am ---- zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxlog/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-6.0.2/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxlog/Makefile.am +--- zabbix-6.0.2/src/libs/zbxlog/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxlog/Makefile.am 2022-03-23 11:14:11.286841385 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -218,9 +292,9 @@ diff -up zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxlog.a libzbxlog_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmedia/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxmedia/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxmedia/Makefile.am +--- zabbix-6.0.2/src/libs/zbxmedia/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxmedia/Makefile.am 2022-03-23 11:14:11.286841385 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -229,9 +303,9 @@ diff -up zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxmedia.a libzbxmedia_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmemory/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxmemory/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxmemory/Makefile.am +--- zabbix-6.0.2/src/libs/zbxmemory/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxmemory/Makefile.am 2022-03-23 11:14:11.287841394 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -240,9 +314,9 @@ diff -up zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxmemory.a libzbxmemory_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmodules/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxmodules/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxmodules/Makefile.am +--- zabbix-6.0.2/src/libs/zbxmodules/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxmodules/Makefile.am 2022-03-23 11:14:11.287841394 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -251,9 +325,9 @@ diff -up zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-5.0.18 noinst_LIBRARIES = libzbxmodules.a libzbxmodules_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxnix/Makefile.am ---- zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxnix/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxnix/Makefile.am +--- zabbix-6.0.2/src/libs/zbxnix/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxnix/Makefile.am 2022-03-23 11:14:11.288841404 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -262,9 +336,9 @@ diff -up zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxnix.a libzbxnix_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am ---- zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am +--- zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am 2022-03-23 11:14:11.288841404 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -273,9 +347,9 @@ diff -up zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libzbxprometheus.a libzbxprometheus_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxregexp/Makefile.am ---- zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxregexp/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxregexp/Makefile.am +--- zabbix-6.0.2/src/libs/zbxregexp/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxregexp/Makefile.am 2022-03-23 11:14:11.289841413 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -284,20 +358,31 @@ diff -up zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxregexp.a libzbxregexp_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxself/Makefile.am ---- zabbix-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxself/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxrtc/Makefile.am +--- zabbix-6.0.2/src/libs/zbxrtc/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxrtc/Makefile.am 2022-03-23 11:14:11.289841413 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libzbxself.a + noinst_LIBRARIES = \ + libzbxrtc.a \ + libzbxrtc_service.a \ +diff -up zabbix-6.0.2/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxself/Makefile.am +--- zabbix-6.0.2/src/libs/zbxself/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxself/Makefile.am 2022-03-23 11:14:11.290841422 -0600 +@@ -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-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxserver/Makefile.am ---- zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxserver/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxserver/Makefile.am +--- zabbix-6.0.2/src/libs/zbxserver/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxserver/Makefile.am 2022-03-23 11:14:11.291841432 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -306,9 +391,20 @@ diff -up zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a libzbxserver_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxservice/Makefile.am +--- zabbix-6.0.2/src/libs/zbxservice/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxservice/Makefile.am 2022-03-23 11:14:11.291841432 -0600 +@@ -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.2/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am 2022-03-23 11:14:11.292841441 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -317,9 +413,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libagentsysinfo.a libagentsysinfo_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am 2022-03-23 11:14:11.292841441 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -328,9 +424,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am 2022-03-23 11:14:11.293841450 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -338,10 +434,10 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix + noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a - libcommonsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent/ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 + libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am 2022-03-23 11:14:11.293841450 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -350,9 +446,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am 2022-03-23 11:14:11.294841460 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -361,9 +457,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-5 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am 2022-03-23 11:14:11.294841460 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -372,9 +468,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am 2022-03-23 11:14:11.295841469 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -383,9 +479,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-5.0.18 DIST_SUBDIRS = \ agent \ common \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am 2022-03-23 11:14:11.295841469 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -394,9 +490,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am 2022-03-23 11:14:11.296841478 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -405,9 +501,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am 2022-03-23 11:14:11.296841478 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -416,9 +512,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am 2022-03-23 11:14:11.297841487 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -427,9 +523,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am 2022-03-23 11:14:11.297841487 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -438,9 +534,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libsimplesysinfo.a libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am 2022-03-23 11:14:11.298841497 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -449,9 +545,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am 2022-03-23 11:14:11.298841497 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -460,9 +556,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsys/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsys/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsys/Makefile.am +--- zabbix-6.0.2/src/libs/zbxsys/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxsys/Makefile.am 2022-03-23 11:14:11.299841506 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -471,9 +567,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxsys.a libzbxsys_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxtasks/Makefile.am ---- zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxtasks/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxtasks/Makefile.am +--- zabbix-6.0.2/src/libs/zbxtasks/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxtasks/Makefile.am 2022-03-23 11:14:11.299841506 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -482,9 +578,31 @@ diff -up zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxtasks.a libzbxtasks_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxxml/Makefile.am ---- zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxxml/Makefile.am 2021-11-30 19:00:54.721475933 -0700 +diff -up zabbix-6.0.2/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxtrends/Makefile.am +--- zabbix-6.0.2/src/libs/zbxtrends/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxtrends/Makefile.am 2022-03-23 11:14:11.300841515 -0600 +@@ -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.2/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxvault/Makefile.am +--- zabbix-6.0.2/src/libs/zbxvault/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxvault/Makefile.am 2022-03-23 11:14:11.300841515 -0600 +@@ -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.2/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxxml/Makefile.am +--- zabbix-6.0.2/src/libs/zbxxml/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/libs/zbxxml/Makefile.am 2022-03-23 11:14:11.301841525 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -493,9 +611,9 @@ diff -up zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxxml.a libzbxxml_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am +--- zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am 2022-03-23 11:14:11.301841525 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -504,9 +622,9 @@ diff -up zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxlogfiles.a libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_agent/Makefile.am ---- zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_agent/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_agent/Makefile.am +--- zabbix-6.0.2/src/zabbix_agent/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_agent/Makefile.am 2022-03-23 11:14:11.302841534 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -515,15 +633,15 @@ diff -up zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree zabbix-5.0.18/sr SUBDIRS = \ logfiles -@@ -76,4 +78,4 @@ zabbix_agentd_CFLAGS = \ +@@ -77,4 +79,4 @@ zabbix_agentd_CFLAGS = \ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff -up zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_get/Makefile.am ---- zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_get/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-6.0.2/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_get/Makefile.am +--- zabbix-6.0.2/src/zabbix_get/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_get/Makefile.am 2022-03-23 11:14:11.302841534 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -532,384 +650,10 @@ diff -up zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree zabbix-5.0.18/src/ bin_PROGRAMS = zabbix_get zabbix_get_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_js/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_js/Makefile.am ---- zabbix-5.0.18/src/zabbix_js/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_js/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,24 +1,26 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_js - - zabbix_js_SOURCES = zabbix_js.c - - zabbix_js_LDADD = \ -- $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ -- $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ -- $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ -- $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ -- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ -- $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ -- $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ -- $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ -- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ -- $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ -- $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ -- $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a -+ $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ -+ $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ -+ $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ -+ $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ -+ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ -+ $(top_builddir)/src/libs/zbxsys/libzbxsys.a \ -+ $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ -+ $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ -+ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ -+ $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ -+ $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ -+ $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a - - zabbix_js_LDADD += @ZBXJS_LIBS@ - -diff -up zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdatasender.a - - libzbxdatasender_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxheart.a - - libzbxheart_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - heart \ - housekeeper \ -@@ -102,4 +104,4 @@ install-data-hook: - $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" - $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" - $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" -- test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -+ test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -diff -up zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxyconfig.a - - libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_sender/Makefile.am ---- zabbix-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_sender/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_sender - - zabbix_sender_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalerter.a - - libzbxalerter_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am 2021-11-30 18:52:58.209303663 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbconfig.a - - libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbsyncer.a - - libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiscoverer.a - - libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxescalator.a - - libzbxescalator_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttppoller.a - - libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libipmi.a - - libipmi_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/lld/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/lld/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlld.a - - libzbxlld_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - alerter \ - dbsyncer \ -@@ -125,4 +127,4 @@ install-data-hook: - $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" - $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)" - $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" -- test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -+ test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -diff -up zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxodbc.a - - libzbxodbc_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am 2021-11-30 18:52:58.210303672 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpinger.a - - libzbxpinger_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/poller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/poller/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a - - libzbxpoller_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libpreprocessor.a - - libpreprocessor_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxypoller.a - - libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxscripts.a - - libzbxscripts_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxselfmon.a - - libzbxselfmon_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsnmptrapper.a - - libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/timer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/timer/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtimer.a - - libzbxtimer_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtrapper.a - - libzbxtrapper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am 2021-11-30 18:52:58.211303681 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvmware.a - - libzbxvmware_a_SOURCES = \ ---- zabbix-5.0.19/src/zabbix_java/Makefile.am~ 2021-12-23 02:48:34.000000000 -0600 -+++ zabbix-5.0.19/src/zabbix_java/Makefile.am 2022-01-14 11:13:42.354979184 -0600 -@@ -9,22 +9,22 @@ +diff -up zabbix-6.0.2/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_java/Makefile.am +--- zabbix-6.0.2/src/zabbix_java/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_java/Makefile.am 2022-03-23 11:14:11.303841543 -0600 +@@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).jar @@ -938,28 +682,424 @@ diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5 java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: ---- zabbix-5.0.21/src/go/Makefile.am~ 2022-02-28 03:12:28.000000000 -0600 -+++ zabbix-5.0.21/src/go/Makefile.am 2022-03-11 11:38:56.831860649 -0600 -@@ -20,18 +20,18 @@ - all: build +diff -up zabbix-6.0.2/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_js/Makefile.am +--- zabbix-6.0.2/src/zabbix_js/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_js/Makefile.am 2022-03-23 11:14:11.304841553 -0600 +@@ -1,25 +1,27 @@ + ## Process this file with automake to produce Makefile.in - build: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin $(srcdir)/... ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + bin_PROGRAMS = zabbix_js - clean: -- go clean ./... -+ go clean $(srcdir)/... - rm -f bin/zabbix_agent2 bin/mock_server + zabbix_js_SOURCES = zabbix_js.c - install: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${GOLDFLAGS}" zabbix.com/cmd/zabbix_agent2 -- test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" -+ test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" + zabbix_js_LDADD = \ +- $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ +- $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ +- $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ +- $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ +- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ +- $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ +- $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ +- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ +- $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ +- $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ +- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a ++ $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ ++ $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ ++ $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ ++ $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ ++ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ ++ $(top_builddir)/src/libs/zbxsys/libzbxsys.a \ ++ $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ ++ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ ++ $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ ++ $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ ++ $(top_builddir)/src/libs/zbxxml/libzbxxml.a + + zabbix_js_LDADD += @ZBXJS_LIBS@ - check: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... - style: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... +diff -up zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am +--- zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am 2022-03-23 11:14:11.304841553 -0600 +@@ -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.2/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am +--- zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am 2022-03-23 11:14:11.305841562 -0600 +@@ -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.2/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am +--- zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am 2022-03-23 11:14:11.305841562 -0600 +@@ -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.2/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/Makefile.am +--- zabbix-6.0.2/src/zabbix_proxy/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_proxy/Makefile.am 2022-03-23 11:14:11.306841571 -0600 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + SUBDIRS = \ + heart \ + housekeeper \ +@@ -110,4 +112,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.2/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am +--- zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am 2022-03-23 11:14:11.306841571 -0600 +@@ -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.2/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am +--- zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am 2022-03-23 11:14:11.307841580 -0600 +@@ -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.2/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_sender/Makefile.am +--- zabbix-6.0.2/src/zabbix_sender/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_sender/Makefile.am 2022-03-23 11:14:11.308841590 -0600 +@@ -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.2/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am 2022-03-23 11:14:11.308841590 -0600 +@@ -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.2/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/availability/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/availability/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/availability/Makefile.am 2022-03-23 11:14:11.309841599 -0600 +@@ -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.2/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am 2022-03-23 11:14:11.309841599 -0600 +@@ -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.2/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am 2022-03-23 11:14:11.310841608 -0600 +@@ -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.2/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am 2022-03-23 11:14:11.310841608 -0600 +@@ -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.2/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am 2022-03-23 11:14:11.311841618 -0600 +@@ -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.2/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/ha/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/ha/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/ha/Makefile.am 2022-03-23 11:31:01.561391019 -0600 +@@ -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.2/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am 2022-03-23 11:14:11.311841618 -0600 +@@ -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.2/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am 2022-03-23 11:14:11.312841627 -0600 +@@ -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.2/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am 2022-03-23 11:14:11.313841636 -0600 +@@ -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.2/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/lld/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/lld/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/lld/Makefile.am 2022-03-23 11:14:11.314841646 -0600 +@@ -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.2/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/Makefile.am 2022-03-23 11:14:11.314841646 -0600 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + SUBDIRS = \ + alerter \ + dbsyncer \ +@@ -147,4 +149,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.2/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am 2022-03-23 11:14:11.315841655 -0600 +@@ -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.2/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am 2022-03-23 11:14:11.316841664 -0600 +@@ -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.2/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/poller/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/poller/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/poller/Makefile.am 2022-03-23 11:14:11.317841673 -0600 +@@ -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.2/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am 2022-03-23 11:14:11.317841673 -0600 +@@ -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.2/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am 2022-03-23 11:14:11.318841683 -0600 +@@ -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.2/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am 2022-03-23 11:14:11.319841692 -0600 +@@ -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.2/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am 2022-03-23 11:14:11.319841692 -0600 +@@ -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.2/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am 2022-03-23 11:14:11.320841701 -0600 +@@ -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.2/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/service/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/service/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/service/Makefile.am 2022-03-23 11:14:11.321841711 -0600 +@@ -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.2/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am 2022-03-23 11:14:11.321841711 -0600 +@@ -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.2/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am 2022-03-23 11:14:11.322841720 -0600 +@@ -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.2/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/timer/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/timer/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/timer/Makefile.am 2022-03-23 11:14:11.322841720 -0600 +@@ -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.2/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am 2022-03-23 11:14:11.323841729 -0600 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a + + libzbxtrapper_a_SOURCES = \ +diff -up zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am +--- zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 ++++ zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am 2022-03-23 11:14:11.323841729 -0600 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libzbxvmware.a + + libzbxvmware_a_SOURCES = \ diff --git a/zabbix.spec b/zabbix.spec index 7f5afae..7c1e381 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,13 +16,13 @@ Name: zabbix Epoch: 1 -Version: 5.0.21 +Version: 6.0.2 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ URL: https://www.zabbix.com -Source0: https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -51,8 +51,8 @@ Patch1: %{srcname}-out-of-tree.patch Patch2: %{srcname}-crypto-policy.patch # Patch1 patches automake files so we need to autoreconf -BuildRequires: make BuildRequires: libtool +BuildRequires: make %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: mariadb-connector-c-devel %else @@ -106,13 +106,7 @@ Provides: bundled(md5-deutsch) # Could alternatively be conditional on Fedora/EL %if "x%{?srcname}" != "x%{name}" Provides: %{srcname} = %{version}-%{release} -Conflicts: %{srcname} < 3.0 -Conflicts: %{srcname}20 -Conflicts: %{srcname}22 -%else -Obsoletes: %{srcname}-docs < 1.8.15-2 -Obsoletes: %{srcname}-web-sqlite3 < 2.0.3-3 -Obsoletes: %{srcname}-server-sqlite3 < 2.0.3-3 +Conflicts: %{srcname} < 6.0 %endif %description @@ -269,7 +263,7 @@ Requires: php-ldap Requires: php-mbstring Requires: php-xml # jquery 3.3.1 and jquery-ui 1.12.1 in the sources -Requires: js-jquery >= 3.3.1 +Requires: js-jquery >= 3.6.0 Provides: bundled(js-jquery-ui) = 1.12.1 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype @@ -286,7 +280,6 @@ BuildArch: noarch Requires: %{name}-web = %{?epoch:%{epoch}:}%{version}-%{release} Requires: php-mysqli Provides: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-web <= 1.5.3-0.1 %description web-mysql Zabbix web frontend for MySQL @@ -801,6 +794,9 @@ fi %files web-pgsql %changelog +* Wed Mar 23 2022 Orion Poplawski - 1:6.0.2-1 +- Update to 6.0.2 + * Fri Mar 11 2022 Gwyn Ciesla - 1:5.0.21-1 - 5.0.21 From b583b6306d90af33caf2be9f7c5057c0d9ab8751 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 4 Apr 2022 16:41:56 -0500 Subject: [PATCH 02/68] 6.0.3 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 19 +++++++++++-------- zabbix.spec | 5 ++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4fa3b0b..e81625f 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ zabbix-1.8.2.tar.gz /zabbix-5.0.19.tar.gz /zabbix-5.0.21.tar.gz /zabbix-6.0.2.tar.gz +/zabbix-6.0.3.tar.gz diff --git a/sources b/sources index 9a09edd..b32cb71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.2.tar.gz) = 618b1705f4e1689af4d234e877ea4136d52de39bfedf6512f396b79278750bfaf994d132a7876420705690045bee78ebc2c7297ac31ac4ddd92f00d8f781267d +SHA512 (zabbix-6.0.3.tar.gz) = f93a7b4b19d2a1561e42ef67378bfb94a5edaae5b9bba8f2214de3bad1bf9d7efcb32da9f1b3ee820cc6bdc68308286606c4ceb7e1ba0ab42e24045c56f8ce47 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 955790c..a370244 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -20,14 +20,6 @@ diff -up zabbix-6.0.2/src/go/Makefile.am.out-of-tree zabbix-6.0.2/src/go/Makefil test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ done -@@ -76,6 +76,6 @@ install-zabbix.com/cmd/zabbix_web_servic - install-exec-local: ${INSTALL_TARGETS} - - check: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... - style: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... diff -up zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxalgo/Makefile.am --- zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 +++ zabbix-6.0.2/src/libs/zbxalgo/Makefile.am 2022-03-23 11:14:11.274841274 -0600 @@ -1103,3 +1095,14 @@ diff -up zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxvmware.a libzbxvmware_a_SOURCES = \ +--- zabbix-6.0.3/src/go/Makefile.am~ 2022-04-04 14:49:58.059635040 -0500 ++++ zabbix-6.0.3/src/go/Makefile.am 2022-04-04 15:40:40.744821121 -0500 +@@ -76,7 +76,7 @@ + install-exec-local: ${INSTALL_TARGETS} + + 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 --git a/zabbix.spec b/zabbix.spec index 7c1e381..a0c6bce 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.2 +Version: 6.0.3 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Mon Apr 04 2022 Gwyn Ciesla - 1:6.0.3-1 +- 6.0.3 + * Wed Mar 23 2022 Orion Poplawski - 1:6.0.2-1 - Update to 6.0.2 From 06b06321cc243f71cce0b4a22ce04294cc0e8081 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 May 2022 16:33:33 -0600 Subject: [PATCH 03/68] Update to 6.0.4 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e81625f..c64093b 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ zabbix-1.8.2.tar.gz /zabbix-5.0.21.tar.gz /zabbix-6.0.2.tar.gz /zabbix-6.0.3.tar.gz +/zabbix-6.0.4.tar.gz diff --git a/sources b/sources index b32cb71..c990cbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.3.tar.gz) = f93a7b4b19d2a1561e42ef67378bfb94a5edaae5b9bba8f2214de3bad1bf9d7efcb32da9f1b3ee820cc6bdc68308286606c4ceb7e1ba0ab42e24045c56f8ce47 +SHA512 (zabbix-6.0.4.tar.gz) = a95706a8258d5161b2fec0ea9fbe33e49b44a59c9214bc43c02fb015d57032e72ea52cb494753a63234ad0af8b89b99918cdbb0c8bf517bc51d3d0eed1657f57 diff --git a/zabbix.spec b/zabbix.spec index a0c6bce..0808b42 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.3 +Version: 6.0.4 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Mon May 09 2022 Orion Poplawski - 1:6.0.4-1 +- Update to 6.0.4 + * Mon Apr 04 2022 Gwyn Ciesla - 1:6.0.3-1 - 6.0.3 From 2310a6183bfd8ac7446e7bb68d5bc9e54d8d39d8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 31 May 2022 10:26:50 -0500 Subject: [PATCH 04/68] 6.0.5 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c64093b..2ebca8e 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.2.tar.gz /zabbix-6.0.3.tar.gz /zabbix-6.0.4.tar.gz +/zabbix-6.0.5.tar.gz diff --git a/sources b/sources index c990cbb..2de7861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.4.tar.gz) = a95706a8258d5161b2fec0ea9fbe33e49b44a59c9214bc43c02fb015d57032e72ea52cb494753a63234ad0af8b89b99918cdbb0c8bf517bc51d3d0eed1657f57 +SHA512 (zabbix-6.0.5.tar.gz) = c4a431ba9c22ccb59c6eaac4147e40390e5e9a1f7a13638f2daa3dab3a75145104e711585b374eed0e663a3dc495d4b3b74c78b7676baafbfcca983f645054e8 diff --git a/zabbix.spec b/zabbix.spec index 0808b42..9147760 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.4 +Version: 6.0.5 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Tue May 31 2022 Gwyn Ciesla - 1:6.0.5-1 +- 6.0.5 + * Mon May 09 2022 Orion Poplawski - 1:6.0.4-1 - Update to 6.0.4 From 6d1d25fbad5684e813a0a253ab5de6c15a9999e3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 7 Jul 2022 22:41:16 -0600 Subject: [PATCH 05/68] Update to 6.0.6 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 580 +++++++++++++++++++-------------------- zabbix.spec | 5 +- 4 files changed, 295 insertions(+), 293 deletions(-) diff --git a/.gitignore b/.gitignore index 2ebca8e..3ceee73 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.3.tar.gz /zabbix-6.0.4.tar.gz /zabbix-6.0.5.tar.gz +/zabbix-6.0.6.tar.gz diff --git a/sources b/sources index 2de7861..81c7b8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.5.tar.gz) = c4a431ba9c22ccb59c6eaac4147e40390e5e9a1f7a13638f2daa3dab3a75145104e711585b374eed0e663a3dc495d4b3b74c78b7676baafbfcca983f645054e8 +SHA512 (zabbix-6.0.6.tar.gz) = 4fc21f54cdfc09b5627a8e8dbe77ac645be7f3d3a0f18fc940cf136d05410ade755c3b4869254a47e9e316dba2b5da6b709a20a023b9cd765ad16094efcded43 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index a370244..9b366ec 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,6 +1,6 @@ -diff -up zabbix-6.0.2/src/go/Makefile.am.out-of-tree zabbix-6.0.2/src/go/Makefile.am ---- zabbix-6.0.2/src/go/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/go/Makefile.am 2022-03-23 11:14:11.273841264 -0600 +diff -up zabbix-6.0.6/src/go/Makefile.am.out-of-tree zabbix-6.0.6/src/go/Makefile.am +--- zabbix-6.0.6/src/go/Makefile.am.out-of-tree 2022-06-27 01:43:04.792778098 -0600 ++++ zabbix-6.0.6/src/go/Makefile.am 2022-07-07 22:23:56.835406975 -0600 @@ -57,15 +57,15 @@ zabbix.com/cmd/zabbix_web_service: build: ${TARGETS} @@ -20,9 +20,18 @@ diff -up zabbix-6.0.2/src/go/Makefile.am.out-of-tree zabbix-6.0.2/src/go/Makefil test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ done -diff -up zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxalgo/Makefile.am 2022-03-23 11:14:11.274841274 -0600 +@@ -76,7 +76,7 @@ install-zabbix.com/cmd/zabbix_web_servic + install-exec-local: ${INSTALL_TARGETS} + + 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.6/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxalgo/Makefile.am +--- zabbix-6.0.6/src/libs/zbxalgo/Makefile.am.out-of-tree 2022-06-27 01:43:04.808778323 -0600 ++++ zabbix-6.0.6/src/libs/zbxalgo/Makefile.am 2022-07-07 22:23:56.788406535 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -31,9 +40,9 @@ diff -up zabbix-6.0.2/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxalgo.a if SERVER -diff -up zabbix-6.0.2/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.2/src/libs/zbxaudit/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxaudit/Makefile.am 2022-03-23 11:14:11.274841274 -0600 +diff -up zabbix-6.0.6/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxaudit/Makefile.am +--- zabbix-6.0.6/src/libs/zbxaudit/Makefile.am.out-of-tree 2022-06-27 01:43:04.808778323 -0600 ++++ zabbix-6.0.6/src/libs/zbxaudit/Makefile.am 2022-07-07 22:23:56.789406544 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -42,9 +51,9 @@ diff -up zabbix-6.0.2/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.2/src noinst_LIBRARIES = libzbxaudit.a libzbxaudit_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.2/src/libs/zbxavailability/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxavailability/Makefile.am 2022-03-23 11:14:11.275841283 -0600 +diff -up zabbix-6.0.6/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxavailability/Makefile.am +--- zabbix-6.0.6/src/libs/zbxavailability/Makefile.am.out-of-tree 2022-06-27 01:43:04.812778378 -0600 ++++ zabbix-6.0.6/src/libs/zbxavailability/Makefile.am 2022-07-07 22:23:56.789406544 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -53,9 +62,9 @@ diff -up zabbix-6.0.2/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxavailability.a libzbxavailability_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.2/src/libs/zbxcommon/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxcommon/Makefile.am 2022-03-23 11:14:11.275841283 -0600 +diff -up zabbix-6.0.6/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcommon/Makefile.am +--- zabbix-6.0.6/src/libs/zbxcommon/Makefile.am.out-of-tree 2022-06-27 01:43:04.812778378 -0600 ++++ zabbix-6.0.6/src/libs/zbxcommon/Makefile.am 2022-07-07 22:23:56.790406554 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -64,9 +73,9 @@ diff -up zabbix-6.0.2/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.2/sr noinst_LIBRARIES = libzbxcommon.a libzbxcommon_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am 2022-03-23 11:14:11.276841292 -0600 +diff -up zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am +--- zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2022-06-27 01:41:38.747573554 -0600 ++++ zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am 2022-07-07 22:23:56.790406554 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -75,9 +84,9 @@ diff -up zabbix-6.0.2/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.2 noinst_LIBRARIES = libzbxcommshigh.a libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.2/src/libs/zbxcomms/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxcomms/Makefile.am 2022-03-23 11:14:11.277841302 -0600 +diff -up zabbix-6.0.6/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcomms/Makefile.am +--- zabbix-6.0.6/src/libs/zbxcomms/Makefile.am.out-of-tree 2022-06-27 01:41:38.747573554 -0600 ++++ zabbix-6.0.6/src/libs/zbxcomms/Makefile.am 2022-07-07 22:23:56.791406563 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -86,9 +95,9 @@ diff -up zabbix-6.0.2/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.2/src noinst_LIBRARIES = libzbxcomms.a libzbxcomms_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.2/src/libs/zbxcompress/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxcompress/Makefile.am 2022-03-23 11:14:11.277841302 -0600 +diff -up zabbix-6.0.6/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcompress/Makefile.am +--- zabbix-6.0.6/src/libs/zbxcompress/Makefile.am.out-of-tree 2022-06-20 02:59:15.982826064 -0600 ++++ zabbix-6.0.6/src/libs/zbxcompress/Makefile.am 2022-07-07 22:23:56.791406563 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -97,9 +106,9 @@ diff -up zabbix-6.0.2/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.2/ noinst_LIBRARIES = libzbxcompress.a libzbxcompress_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.2/src/libs/zbxconf/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxconf/Makefile.am 2022-03-23 11:14:11.278841311 -0600 +diff -up zabbix-6.0.6/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxconf/Makefile.am +--- zabbix-6.0.6/src/libs/zbxconf/Makefile.am.out-of-tree 2022-06-20 02:59:15.982826064 -0600 ++++ zabbix-6.0.6/src/libs/zbxconf/Makefile.am 2022-07-07 22:23:56.792406573 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -108,9 +117,9 @@ diff -up zabbix-6.0.2/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxconf.a libzbxconf_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am 2022-03-23 11:14:11.278841311 -0600 +diff -up zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am +--- zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am.out-of-tree 2022-06-27 01:43:04.816778435 -0600 ++++ zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am 2022-07-07 22:23:56.792406573 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -119,9 +128,9 @@ diff -up zabbix-6.0.2/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.2/sr noinst_LIBRARIES = libzbxcrypto.a libzbxcrypto_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am 2022-03-23 11:14:11.279841320 -0600 +diff -up zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am +--- zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am.out-of-tree 2022-06-27 01:41:38.751573611 -0600 ++++ zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am 2022-07-07 22:23:56.793406582 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -130,9 +139,9 @@ diff -up zabbix-6.0.2/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.2/s noinst_LIBRARIES = libzbxdbcache.a libzbxdbcache_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am 2022-03-23 11:14:11.279841320 -0600 +diff -up zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am +--- zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2022-06-27 01:43:04.820778490 -0600 ++++ zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am 2022-07-07 22:23:56.793406582 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -141,9 +150,9 @@ diff -up zabbix-6.0.2/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.2/sr 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.2/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.2/src/libs/zbxdb/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxdb/Makefile.am 2022-03-23 11:14:11.280841329 -0600 +diff -up zabbix-6.0.6/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdb/Makefile.am +--- zabbix-6.0.6/src/libs/zbxdb/Makefile.am.out-of-tree 2022-06-20 02:59:15.982826064 -0600 ++++ zabbix-6.0.6/src/libs/zbxdb/Makefile.am 2022-07-07 22:23:56.794406591 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -152,9 +161,9 @@ diff -up zabbix-6.0.2/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.2/src/li noinst_LIBRARIES = libzbxdb.a libzbxdb_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am 2022-03-23 11:14:11.280841329 -0600 +diff -up zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am +--- zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2022-06-27 01:43:04.824778547 -0600 ++++ zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am 2022-07-07 22:23:56.794406591 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -163,9 +172,9 @@ diff -up zabbix-6.0.2/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.2 noinst_LIBRARIES = libzbxdbupgrade.a libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.2/src/libs/zbxdiag/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxdiag/Makefile.am 2022-03-23 11:14:11.281841339 -0600 +diff -up zabbix-6.0.6/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdiag/Makefile.am +--- zabbix-6.0.6/src/libs/zbxdiag/Makefile.am.out-of-tree 2022-06-27 01:41:38.771573891 -0600 ++++ zabbix-6.0.6/src/libs/zbxdiag/Makefile.am 2022-07-07 22:23:56.794406591 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -174,9 +183,9 @@ diff -up zabbix-6.0.2/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.2/src/libs/zbxembed/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxembed/Makefile.am 2022-03-23 11:14:11.281841339 -0600 +diff -up zabbix-6.0.6/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxembed/Makefile.am +--- zabbix-6.0.6/src/libs/zbxembed/Makefile.am.out-of-tree 2022-06-27 01:43:04.828778603 -0600 ++++ zabbix-6.0.6/src/libs/zbxembed/Makefile.am 2022-07-07 22:23:56.795406601 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -185,9 +194,9 @@ diff -up zabbix-6.0.2/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.2/src noinst_LIBRARIES = libzbxembed.a libzbxembed_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.2/src/libs/zbxeval/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxeval/Makefile.am 2022-03-23 11:14:11.282841348 -0600 +diff -up zabbix-6.0.6/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxeval/Makefile.am +--- zabbix-6.0.6/src/libs/zbxeval/Makefile.am.out-of-tree 2022-06-27 01:43:04.844778827 -0600 ++++ zabbix-6.0.6/src/libs/zbxeval/Makefile.am 2022-07-07 22:23:56.796406610 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -196,9 +205,9 @@ diff -up zabbix-6.0.2/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxeval.a libzbxeval_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.2/src/libs/zbxexec/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxexec/Makefile.am 2022-03-23 11:14:11.282841348 -0600 +diff -up zabbix-6.0.6/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxexec/Makefile.am +--- zabbix-6.0.6/src/libs/zbxexec/Makefile.am.out-of-tree 2022-06-20 02:59:16.006826441 -0600 ++++ zabbix-6.0.6/src/libs/zbxexec/Makefile.am 2022-07-07 22:23:56.796406610 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -207,9 +216,9 @@ diff -up zabbix-6.0.2/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxexec.a libzbxexec_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxha/Makefile.am ---- zabbix-6.0.2/src/libs/zbxha/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxha/Makefile.am 2022-03-23 11:14:11.283841357 -0600 +diff -up zabbix-6.0.6/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxha/Makefile.am +--- zabbix-6.0.6/src/libs/zbxha/Makefile.am.out-of-tree 2022-06-27 01:43:04.844778827 -0600 ++++ zabbix-6.0.6/src/libs/zbxha/Makefile.am 2022-07-07 22:23:56.796406610 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -218,9 +227,9 @@ diff -up zabbix-6.0.2/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.2/src/li noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.2/src/libs/zbxhistory/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxhistory/Makefile.am 2022-03-23 11:14:11.283841357 -0600 +diff -up zabbix-6.0.6/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxhistory/Makefile.am +--- zabbix-6.0.6/src/libs/zbxhistory/Makefile.am.out-of-tree 2022-06-20 02:59:16.006826441 -0600 ++++ zabbix-6.0.6/src/libs/zbxhistory/Makefile.am 2022-07-07 22:23:56.797406619 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -229,9 +238,9 @@ diff -up zabbix-6.0.2/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.2/s noinst_LIBRARIES = libzbxhistory.a libzbxhistory_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.2/src/libs/zbxhttp/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxhttp/Makefile.am 2022-03-23 11:14:11.284841367 -0600 +diff -up zabbix-6.0.6/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxhttp/Makefile.am +--- zabbix-6.0.6/src/libs/zbxhttp/Makefile.am.out-of-tree 2022-06-27 01:41:38.787574114 -0600 ++++ zabbix-6.0.6/src/libs/zbxhttp/Makefile.am 2022-07-07 22:23:56.797406619 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -240,9 +249,9 @@ diff -up zabbix-6.0.2/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxhttp.a libzbxhttp_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am 2022-03-23 11:14:11.284841367 -0600 +diff -up zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am +--- zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 ++++ zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am 2022-07-07 22:23:56.798406629 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -251,9 +260,9 @@ diff -up zabbix-6.0.2/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.2/ noinst_LIBRARIES = libzbxicmpping.a libzbxicmpping_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am 2022-03-23 11:14:11.285841376 -0600 +diff -up zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am +--- zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 ++++ zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am 2022-07-07 22:23:56.798406629 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -262,9 +271,9 @@ diff -up zabbix-6.0.2/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxipcservice.a libzbxipcservice_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.2/src/libs/zbxjson/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxjson/Makefile.am 2022-03-23 11:14:11.285841376 -0600 +diff -up zabbix-6.0.6/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxjson/Makefile.am +--- zabbix-6.0.6/src/libs/zbxjson/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 ++++ zabbix-6.0.6/src/libs/zbxjson/Makefile.am 2022-07-07 22:23:56.799406638 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -273,9 +282,9 @@ diff -up zabbix-6.0.2/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxjson.a libzbxjson_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.2/src/libs/zbxlog/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxlog/Makefile.am 2022-03-23 11:14:11.286841385 -0600 +diff -up zabbix-6.0.6/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxlog/Makefile.am +--- zabbix-6.0.6/src/libs/zbxlog/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 ++++ zabbix-6.0.6/src/libs/zbxlog/Makefile.am 2022-07-07 22:23:56.799406638 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -284,9 +293,9 @@ diff -up zabbix-6.0.2/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.2/src/l noinst_LIBRARIES = libzbxlog.a libzbxlog_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.2/src/libs/zbxmedia/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxmedia/Makefile.am 2022-03-23 11:14:11.286841385 -0600 +diff -up zabbix-6.0.6/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxmedia/Makefile.am +--- zabbix-6.0.6/src/libs/zbxmedia/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 ++++ zabbix-6.0.6/src/libs/zbxmedia/Makefile.am 2022-07-07 22:23:56.800406648 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -295,9 +304,9 @@ diff -up zabbix-6.0.2/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.2/src noinst_LIBRARIES = libzbxmedia.a libzbxmedia_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.2/src/libs/zbxmemory/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxmemory/Makefile.am 2022-03-23 11:14:11.287841394 -0600 +diff -up zabbix-6.0.6/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxmemory/Makefile.am +--- zabbix-6.0.6/src/libs/zbxmemory/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 ++++ zabbix-6.0.6/src/libs/zbxmemory/Makefile.am 2022-07-07 22:23:56.800406648 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -306,9 +315,9 @@ diff -up zabbix-6.0.2/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.2/sr noinst_LIBRARIES = libzbxmemory.a libzbxmemory_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.2/src/libs/zbxmodules/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxmodules/Makefile.am 2022-03-23 11:14:11.287841394 -0600 +diff -up zabbix-6.0.6/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxmodules/Makefile.am +--- zabbix-6.0.6/src/libs/zbxmodules/Makefile.am.out-of-tree 2022-06-20 02:48:20.280593963 -0600 ++++ zabbix-6.0.6/src/libs/zbxmodules/Makefile.am 2022-07-07 22:23:56.801406657 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -317,9 +326,9 @@ diff -up zabbix-6.0.2/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.2/s noinst_LIBRARIES = libzbxmodules.a libzbxmodules_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.2/src/libs/zbxnix/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxnix/Makefile.am 2022-03-23 11:14:11.288841404 -0600 +diff -up zabbix-6.0.6/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxnix/Makefile.am +--- zabbix-6.0.6/src/libs/zbxnix/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 ++++ zabbix-6.0.6/src/libs/zbxnix/Makefile.am 2022-07-07 22:23:56.801406657 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -328,9 +337,9 @@ diff -up zabbix-6.0.2/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.2/src/l noinst_LIBRARIES = libzbxnix.a libzbxnix_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am 2022-03-23 11:14:11.288841404 -0600 +diff -up zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am +--- zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 ++++ zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am 2022-07-07 22:23:56.802406666 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -339,9 +348,9 @@ diff -up zabbix-6.0.2/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxprometheus.a libzbxprometheus_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.2/src/libs/zbxregexp/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxregexp/Makefile.am 2022-03-23 11:14:11.289841413 -0600 +diff -up zabbix-6.0.6/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxregexp/Makefile.am +--- zabbix-6.0.6/src/libs/zbxregexp/Makefile.am.out-of-tree 2022-06-20 02:48:20.280593963 -0600 ++++ zabbix-6.0.6/src/libs/zbxregexp/Makefile.am 2022-07-07 22:23:56.802406666 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -350,9 +359,9 @@ diff -up zabbix-6.0.2/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.2/sr noinst_LIBRARIES = libzbxregexp.a libzbxregexp_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.2/src/libs/zbxrtc/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxrtc/Makefile.am 2022-03-23 11:14:11.289841413 -0600 +diff -up zabbix-6.0.6/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxrtc/Makefile.am +--- zabbix-6.0.6/src/libs/zbxrtc/Makefile.am.out-of-tree 2022-06-27 01:43:04.848778883 -0600 ++++ zabbix-6.0.6/src/libs/zbxrtc/Makefile.am 2022-07-07 22:23:56.802406666 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -361,9 +370,9 @@ diff -up zabbix-6.0.2/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.2/src/l noinst_LIBRARIES = \ libzbxrtc.a \ libzbxrtc_service.a \ -diff -up zabbix-6.0.2/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxself/Makefile.am ---- zabbix-6.0.2/src/libs/zbxself/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxself/Makefile.am 2022-03-23 11:14:11.290841422 -0600 +diff -up zabbix-6.0.6/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxself/Makefile.am +--- zabbix-6.0.6/src/libs/zbxself/Makefile.am.out-of-tree 2022-06-27 01:43:04.848778883 -0600 ++++ zabbix-6.0.6/src/libs/zbxself/Makefile.am 2022-07-07 22:23:56.803406676 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -372,9 +381,9 @@ diff -up zabbix-6.0.2/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.2/src/ noinst_LIBRARIES = libzbxself.a libzbxself_server.a libzbxself_proxy.a libzbxself_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.2/src/libs/zbxserver/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxserver/Makefile.am 2022-03-23 11:14:11.291841432 -0600 +diff -up zabbix-6.0.6/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxserver/Makefile.am +--- zabbix-6.0.6/src/libs/zbxserver/Makefile.am.out-of-tree 2022-06-27 01:43:04.848778883 -0600 ++++ zabbix-6.0.6/src/libs/zbxserver/Makefile.am 2022-07-07 22:23:56.803406676 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -383,9 +392,9 @@ diff -up zabbix-6.0.2/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.2/sr noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a libzbxserver_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.2/src/libs/zbxservice/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxservice/Makefile.am 2022-03-23 11:14:11.291841432 -0600 +diff -up zabbix-6.0.6/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxservice/Makefile.am +--- zabbix-6.0.6/src/libs/zbxservice/Makefile.am.out-of-tree 2022-06-27 01:43:04.852778938 -0600 ++++ zabbix-6.0.6/src/libs/zbxservice/Makefile.am 2022-07-07 22:23:56.804406685 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -394,9 +403,9 @@ diff -up zabbix-6.0.2/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.2/s noinst_LIBRARIES = libzbxservice.a libzbxservice_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am 2022-03-23 11:14:11.292841441 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2022-06-27 01:43:04.856778995 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am 2022-07-07 22:23:56.804406685 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -405,9 +414,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libagentsysinfo.a libagentsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am 2022-03-23 11:14:11.292841441 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2022-06-20 02:59:16.014826566 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am 2022-07-07 22:23:56.805406694 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -416,9 +425,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am 2022-03-23 11:14:11.293841450 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2022-06-27 01:43:04.856778995 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am 2022-07-07 22:23:56.805406694 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -427,9 +436,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am 2022-03-23 11:14:11.293841450 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am 2022-07-07 22:23:56.806406704 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -438,9 +447,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am 2022-03-23 11:14:11.294841460 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am 2022-07-07 22:23:56.806406704 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -449,9 +458,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am 2022-03-23 11:14:11.294841460 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2022-06-27 01:41:38.807574394 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am 2022-07-07 22:23:56.807406713 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -460,9 +469,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am 2022-03-23 11:14:11.295841469 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2022-06-27 01:41:38.803574339 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am 2022-07-07 22:23:56.807406713 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -471,9 +480,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.2/s DIST_SUBDIRS = \ agent \ common \ -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am 2022-03-23 11:14:11.295841469 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am 2022-07-07 22:23:56.808406723 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -482,9 +491,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am 2022-03-23 11:14:11.296841478 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am 2022-07-07 22:23:56.808406723 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -493,9 +502,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am 2022-03-23 11:14:11.296841478 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am 2022-07-07 22:23:56.809406732 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -504,9 +513,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am 2022-03-23 11:14:11.297841487 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am 2022-07-07 22:23:56.809406732 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -515,9 +524,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am 2022-03-23 11:14:11.297841487 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2022-06-27 01:41:38.807574394 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am 2022-07-07 22:23:56.809406732 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -526,9 +535,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libsimplesysinfo.a libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am 2022-03-23 11:14:11.298841497 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am 2022-07-07 22:23:56.810406741 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -537,9 +546,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am 2022-03-23 11:14:11.298841497 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 ++++ zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am 2022-07-07 22:23:56.810406741 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -548,9 +557,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.2/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.2/src/libs/zbxsys/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxsys/Makefile.am 2022-03-23 11:14:11.299841506 -0600 +diff -up zabbix-6.0.6/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsys/Makefile.am +--- zabbix-6.0.6/src/libs/zbxsys/Makefile.am.out-of-tree 2022-06-27 01:41:38.799574282 -0600 ++++ zabbix-6.0.6/src/libs/zbxsys/Makefile.am 2022-07-07 22:23:56.811406751 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -559,9 +568,9 @@ diff -up zabbix-6.0.2/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.2/src/l noinst_LIBRARIES = libzbxsys.a libzbxsys_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.2/src/libs/zbxtasks/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxtasks/Makefile.am 2022-03-23 11:14:11.299841506 -0600 +diff -up zabbix-6.0.6/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxtasks/Makefile.am +--- zabbix-6.0.6/src/libs/zbxtasks/Makefile.am.out-of-tree 2022-06-20 02:48:20.292594158 -0600 ++++ zabbix-6.0.6/src/libs/zbxtasks/Makefile.am 2022-07-07 22:23:56.811406751 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -570,9 +579,9 @@ diff -up zabbix-6.0.2/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.2/src noinst_LIBRARIES = libzbxtasks.a libzbxtasks_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.2/src/libs/zbxtrends/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxtrends/Makefile.am 2022-03-23 11:14:11.300841515 -0600 +diff -up zabbix-6.0.6/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxtrends/Makefile.am +--- zabbix-6.0.6/src/libs/zbxtrends/Makefile.am.out-of-tree 2022-06-27 01:43:04.860779050 -0600 ++++ zabbix-6.0.6/src/libs/zbxtrends/Makefile.am 2022-07-07 22:23:56.812406760 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -581,9 +590,9 @@ diff -up zabbix-6.0.2/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.2/sr noinst_LIBRARIES = \ libzbxtrends.a \ libzbxtrends_baseline.a -diff -up zabbix-6.0.2/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.2/src/libs/zbxvault/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxvault/Makefile.am 2022-03-23 11:14:11.300841515 -0600 +diff -up zabbix-6.0.6/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxvault/Makefile.am +--- zabbix-6.0.6/src/libs/zbxvault/Makefile.am.out-of-tree 2022-06-27 01:43:04.860779050 -0600 ++++ zabbix-6.0.6/src/libs/zbxvault/Makefile.am 2022-07-07 22:23:56.812406760 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -592,9 +601,9 @@ diff -up zabbix-6.0.2/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.2/src noinst_LIBRARIES = libzbxvault.a libzbxvault_a_SOURCES = \ -diff -up zabbix-6.0.2/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.2/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.2/src/libs/zbxxml/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/libs/zbxxml/Makefile.am 2022-03-23 11:14:11.301841525 -0600 +diff -up zabbix-6.0.6/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxxml/Makefile.am +--- zabbix-6.0.6/src/libs/zbxxml/Makefile.am.out-of-tree 2022-06-20 02:59:16.022826692 -0600 ++++ zabbix-6.0.6/src/libs/zbxxml/Makefile.am 2022-07-07 22:23:56.813406769 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -603,9 +612,9 @@ diff -up zabbix-6.0.2/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.2/src/l noinst_LIBRARIES = libzbxxml.a libzbxxml_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am 2022-03-23 11:14:11.301841525 -0600 +diff -up zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am +--- zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2022-06-20 02:59:16.022826692 -0600 ++++ zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am 2022-07-07 22:23:56.813406769 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -614,9 +623,9 @@ diff -up zabbix-6.0.2/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxlogfiles.a libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_agent/Makefile.am ---- zabbix-6.0.2/src/zabbix_agent/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_agent/Makefile.am 2022-03-23 11:14:11.302841534 -0600 +diff -up zabbix-6.0.6/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_agent/Makefile.am +--- zabbix-6.0.6/src/zabbix_agent/Makefile.am.out-of-tree 2022-06-27 01:43:04.860779050 -0600 ++++ zabbix-6.0.6/src/zabbix_agent/Makefile.am 2022-07-07 22:23:56.814406779 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -631,9 +640,9 @@ diff -up zabbix-6.0.2/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.2/src/ $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff -up zabbix-6.0.2/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_get/Makefile.am ---- zabbix-6.0.2/src/zabbix_get/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_get/Makefile.am 2022-03-23 11:14:11.302841534 -0600 +diff -up zabbix-6.0.6/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_get/Makefile.am +--- zabbix-6.0.6/src/zabbix_get/Makefile.am.out-of-tree 2022-06-27 01:43:04.864779107 -0600 ++++ zabbix-6.0.6/src/zabbix_get/Makefile.am 2022-07-07 22:23:56.815406788 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -642,9 +651,9 @@ diff -up zabbix-6.0.2/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.2/src/za bin_PROGRAMS = zabbix_get zabbix_get_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_java/Makefile.am ---- zabbix-6.0.2/src/zabbix_java/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_java/Makefile.am 2022-03-23 11:14:11.303841543 -0600 +diff -up zabbix-6.0.6/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_java/Makefile.am +--- zabbix-6.0.6/src/zabbix_java/Makefile.am.out-of-tree 2022-06-27 01:43:04.864779107 -0600 ++++ zabbix-6.0.6/src/zabbix_java/Makefile.am 2022-07-07 22:23:56.816406798 -0600 @@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh @@ -674,9 +683,9 @@ diff -up zabbix-6.0.2/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.2/src/z java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.2/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_js/Makefile.am ---- zabbix-6.0.2/src/zabbix_js/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_js/Makefile.am 2022-03-23 11:14:11.304841553 -0600 +diff -up zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_js/Makefile.am +--- zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree 2022-07-07 22:23:56.817406807 -0600 ++++ zabbix-6.0.6/src/zabbix_js/Makefile.am 2022-07-07 22:25:33.289310841 -0600 @@ -1,25 +1,27 @@ ## Process this file with automake to produce Makefile.in @@ -717,12 +726,12 @@ diff -up zabbix-6.0.2/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.2/src/zab + $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ + $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ + $(top_builddir)/src/libs/zbxxml/libzbxxml.a - - zabbix_js_LDADD += @ZBXJS_LIBS@ -diff -up zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am 2022-03-23 11:14:11.304841553 -0600 + zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) + +diff -up zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am +--- zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 ++++ zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am 2022-07-07 22:23:56.818406816 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -731,9 +740,9 @@ diff -up zabbix-6.0.2/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxdatasender.a libzbxdatasender_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am 2022-03-23 11:14:11.305841562 -0600 +diff -up zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am +--- zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 ++++ zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am 2022-07-07 22:23:56.818406816 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -742,9 +751,9 @@ diff -up zabbix-6.0.2/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxheart.a libzbxheart_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am 2022-03-23 11:14:11.305841562 -0600 +diff -up zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am +--- zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 ++++ zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am 2022-07-07 22:23:56.820406835 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -753,9 +762,9 @@ diff -up zabbix-6.0.2/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.2/src/zabbix_proxy/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_proxy/Makefile.am 2022-03-23 11:14:11.306841571 -0600 +diff -up zabbix-6.0.6/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/Makefile.am +--- zabbix-6.0.6/src/zabbix_proxy/Makefile.am.out-of-tree 2022-06-27 01:43:04.864779107 -0600 ++++ zabbix-6.0.6/src/zabbix_proxy/Makefile.am 2022-07-07 22:23:56.820406835 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -764,15 +773,15 @@ diff -up zabbix-6.0.2/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.2/src/ SUBDIRS = \ heart \ housekeeper \ -@@ -110,4 +112,4 @@ install-data-hook: +@@ -111,4 +113,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.2/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am 2022-03-23 11:14:11.306841571 -0600 +diff -up zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am +--- zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 ++++ zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am 2022-07-07 22:23:56.821406844 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -781,9 +790,9 @@ diff -up zabbix-6.0.2/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxproxyconfig.a libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am 2022-03-23 11:14:11.307841580 -0600 +diff -up zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am +--- zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 ++++ zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am 2022-07-07 22:23:56.822406854 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -792,9 +801,9 @@ diff -up zabbix-6.0.2/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_sender/Makefile.am ---- zabbix-6.0.2/src/zabbix_sender/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_sender/Makefile.am 2022-03-23 11:14:11.308841590 -0600 +diff -up zabbix-6.0.6/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_sender/Makefile.am +--- zabbix-6.0.6/src/zabbix_sender/Makefile.am.out-of-tree 2022-06-27 01:43:04.868779163 -0600 ++++ zabbix-6.0.6/src/zabbix_sender/Makefile.am 2022-07-07 22:23:56.822406854 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -803,9 +812,9 @@ diff -up zabbix-6.0.2/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.2/src bin_PROGRAMS = zabbix_sender zabbix_sender_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am 2022-03-23 11:14:11.308841590 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am.out-of-tree 2022-06-27 01:41:38.823574619 -0600 ++++ zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am 2022-07-07 22:23:56.823406863 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -814,9 +823,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxalerter.a libzbxalerter_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/availability/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/availability/Makefile.am 2022-03-23 11:14:11.309841599 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/availability/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/availability/Makefile.am.out-of-tree 2022-06-27 01:43:04.868779163 -0600 ++++ zabbix-6.0.6/src/zabbix_server/availability/Makefile.am 2022-07-07 22:23:56.823406863 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -825,9 +834,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/availability/Makefile.am.out-of-tree zab noinst_LIBRARIES = libavailability.a libavailability_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am 2022-03-23 11:14:11.309841599 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 ++++ zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am 2022-07-07 22:23:56.824406873 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -836,9 +845,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxdbconfig.a libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am 2022-03-23 11:14:11.310841608 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 ++++ zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am 2022-07-07 22:23:56.824406873 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -847,9 +856,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxdbsyncer.a libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am 2022-03-23 11:14:11.310841608 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 ++++ zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am 2022-07-07 22:23:56.824406873 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -858,9 +867,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxdiscoverer.a libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am 2022-03-23 11:14:11.311841618 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 ++++ zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am 2022-07-07 22:23:56.825406882 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -869,9 +878,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxescalator.a libzbxescalator_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/ha/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/ha/Makefile.am 2022-03-23 11:31:01.561391019 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/ha/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/ha/Makefile.am.out-of-tree 2022-06-27 01:43:04.872779218 -0600 ++++ zabbix-6.0.6/src/zabbix_server/ha/Makefile.am 2022-07-07 22:23:56.825406882 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -880,9 +889,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.2/ noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am 2022-03-23 11:14:11.311841618 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2022-06-27 01:43:04.872779218 -0600 ++++ zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am 2022-07-07 22:23:56.826406891 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -891,9 +900,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am 2022-03-23 11:14:11.312841627 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 ++++ zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am 2022-07-07 22:23:56.826406891 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -902,9 +911,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxhttppoller.a libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am 2022-03-23 11:14:11.313841636 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 ++++ zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am 2022-07-07 22:23:56.827406900 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -913,9 +922,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libipmi.a libipmi_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/lld/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/lld/Makefile.am 2022-03-23 11:14:11.314841646 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/lld/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/lld/Makefile.am.out-of-tree 2022-06-27 01:41:38.831574731 -0600 ++++ zabbix-6.0.6/src/zabbix_server/lld/Makefile.am 2022-07-07 22:23:56.827406900 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -924,9 +933,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.2 noinst_LIBRARIES = libzbxlld.a libzbxlld_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/Makefile.am 2022-03-23 11:14:11.314841646 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/Makefile.am.out-of-tree 2022-06-27 01:43:04.868779163 -0600 ++++ zabbix-6.0.6/src/zabbix_server/Makefile.am 2022-07-07 22:23:56.828406910 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -935,15 +944,15 @@ diff -up zabbix-6.0.2/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.2/src SUBDIRS = \ alerter \ dbsyncer \ -@@ -147,4 +149,4 @@ install-data-hook: +@@ -148,4 +150,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.2/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am 2022-03-23 11:14:11.315841655 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am.out-of-tree 2022-06-20 02:59:16.034826880 -0600 ++++ zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am 2022-07-07 22:23:56.828406910 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -952,9 +961,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxodbc.a libzbxodbc_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am 2022-03-23 11:14:11.316841664 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am.out-of-tree 2022-06-20 02:59:16.034826880 -0600 ++++ zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am 2022-07-07 22:23:56.829406919 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -963,9 +972,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxpinger.a libzbxpinger_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/poller/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/poller/Makefile.am 2022-03-23 11:14:11.317841673 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/poller/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/poller/Makefile.am.out-of-tree 2022-06-27 01:43:04.876779275 -0600 ++++ zabbix-6.0.6/src/zabbix_server/poller/Makefile.am 2022-07-07 22:23:56.829406919 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -974,9 +983,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a libzbxpoller_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am 2022-03-23 11:14:11.317841673 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2022-06-27 01:43:04.876779275 -0600 ++++ zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am 2022-07-07 22:23:56.830406929 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -985,9 +994,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zab noinst_LIBRARIES = libpreprocessor.a libpreprocessor_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am 2022-03-23 11:14:11.318841683 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 ++++ zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am 2022-07-07 22:23:56.830406929 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -996,9 +1005,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxproxypoller.a libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am 2022-03-23 11:14:11.319841692 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am.out-of-tree 2022-06-27 01:43:04.880779330 -0600 ++++ zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am 2022-07-07 22:23:56.831406938 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1007,9 +1016,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxreporter.a libzbxreporter_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am 2022-03-23 11:14:11.319841692 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 ++++ zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am 2022-07-07 22:23:56.831406938 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1018,9 +1027,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxscripts.a libzbxscripts_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am 2022-03-23 11:14:11.320841701 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 ++++ zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am 2022-07-07 22:23:56.832406947 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1029,9 +1038,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxselfmon.a libzbxselfmon_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/service/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/service/Makefile.am 2022-03-23 11:14:11.321841711 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/service/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/service/Makefile.am.out-of-tree 2022-06-27 01:43:04.880779330 -0600 ++++ zabbix-6.0.6/src/zabbix_server/service/Makefile.am 2022-07-07 22:23:56.832406947 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1040,9 +1049,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libservice.a libservice_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am 2022-03-23 11:14:11.321841711 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 ++++ zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am 2022-07-07 22:23:56.833406957 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1051,9 +1060,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxsnmptrapper.a libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am 2022-03-23 11:14:11.322841720 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 ++++ zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am 2022-07-07 22:23:56.833406957 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1062,9 +1071,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/timer/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/timer/Makefile.am 2022-03-23 11:14:11.322841720 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/timer/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/timer/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 ++++ zabbix-6.0.6/src/zabbix_server/timer/Makefile.am 2022-07-07 22:23:56.834406966 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1073,9 +1082,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libzbxtimer.a libzbxtimer_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am 2022-03-23 11:14:11.323841729 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am.out-of-tree 2022-06-27 01:43:04.880779330 -0600 ++++ zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am 2022-07-07 22:23:56.834406966 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1084,9 +1093,9 @@ diff -up zabbix-6.0.2/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am.out-of-tree 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am 2022-03-23 11:14:11.323841729 -0600 +diff -up zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am +--- zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am.out-of-tree 2022-06-20 02:59:16.042827005 -0600 ++++ zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am 2022-07-07 22:23:56.835406975 -0600 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1095,14 +1104,3 @@ diff -up zabbix-6.0.2/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxvmware.a libzbxvmware_a_SOURCES = \ ---- zabbix-6.0.3/src/go/Makefile.am~ 2022-04-04 14:49:58.059635040 -0500 -+++ zabbix-6.0.3/src/go/Makefile.am 2022-04-04 15:40:40.744821121 -0500 -@@ -76,7 +76,7 @@ - install-exec-local: ${INSTALL_TARGETS} - - 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 --git a/zabbix.spec b/zabbix.spec index 9147760..0b72f00 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.5 +Version: 6.0.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Fri Jul 08 2022 Orion Poplawski - 1:6.0.6-1 +- Update to 6.0.6 + * Tue May 31 2022 Gwyn Ciesla - 1:6.0.5-1 - 6.0.5 From b90a63b5862b0016a127d736a2c039e6e3120be0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 Jul 2022 11:40:02 -0500 Subject: [PATCH 06/68] Move to pcre2 --- zabbix.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index 0b72f00..d70d45d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -70,7 +70,7 @@ BuildRequires: OpenIPMI-devel BuildRequires: libssh2-devel BuildRequires: libxml2-devel BuildRequires: libevent-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: gcc # For Agent 2 - has missing deps %if %{with go} @@ -398,7 +398,7 @@ common_flags=" --with-ssh2 --with-libxml2 --with-libevent - --with-libpcre + --with-libpcre2 --with-openssl " # Setup out of tree builds @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Fri Jul 22 2022 Gwyn Ciesla -1:6.0.6-2 +- Move to pcre2 + * Fri Jul 08 2022 Orion Poplawski - 1:6.0.6-1 - Update to 6.0.6 From 99dd20bd58454c2aa0545bce393bf08b4476a84e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 14 Sep 2022 12:20:17 -0500 Subject: [PATCH 07/68] 6.0.8 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ceee73..cb37d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.4.tar.gz /zabbix-6.0.5.tar.gz /zabbix-6.0.6.tar.gz +/zabbix-6.0.8.tar.gz diff --git a/sources b/sources index 81c7b8b..e1a3b8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.6.tar.gz) = 4fc21f54cdfc09b5627a8e8dbe77ac645be7f3d3a0f18fc940cf136d05410ade755c3b4869254a47e9e316dba2b5da6b709a20a023b9cd765ad16094efcded43 +SHA512 (zabbix-6.0.8.tar.gz) = 76e3ec798b4cb4474ef6c0f936aea04cc9e15ce3aefb146e1de09b08c64559bdaa1caaa011fdfa94c23765417d8c3be3da9aa22dfb2cb403e588befa25fcc668 diff --git a/zabbix.spec b/zabbix.spec index d70d45d..cea7314 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.6 -Release: 2%{?dist} +Version: 6.0.8 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Wed Sep 14 2022 Gwyn Ciesla - 1:6.0.8-1 +- 6.0.8 + * Fri Jul 22 2022 Gwyn Ciesla -1:6.0.6-2 - Move to pcre2 From 22940093aef79e2eb21d4254c9214d6b00fea4ce Mon Sep 17 00:00:00 2001 From: Nikola Knazekova Date: Mon, 26 Sep 2022 17:11:22 +0200 Subject: [PATCH 08/68] selinux: Update based on latest packaging guide https://fedoraproject.org/wiki/SELinux/IndependentPolicy Start shipping zabbix interface file Exclude installed policy module file from RPM verification Signed-off-by: Nikola Knazekova --- zabbix.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index cea7314..4cd675d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -537,6 +537,7 @@ cp -p database/sqlite3/schema.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-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 @@ -739,7 +740,8 @@ fi %if 0%{?with_selinux} %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.* -%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%{_datadir}/selinux/devel/include/distributed/%{name}.if +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} %endif %files agent From 182e725d2692644aec9ed2a8a623c9e639ffb308 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 17 Nov 2022 13:11:23 +0100 Subject: [PATCH 09/68] Include in configure for sscanf prototype For: --- zabbix-configure-sscanf.patch | 16 ++++++++++++++++ zabbix.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 zabbix-configure-sscanf.patch diff --git a/zabbix-configure-sscanf.patch b/zabbix-configure-sscanf.patch new file mode 100644 index 0000000..a872ff5 --- /dev/null +++ b/zabbix-configure-sscanf.patch @@ -0,0 +1,16 @@ +sscanf needs for the prototype. Submitted upstream here: + + + +diff --git a/configure.ac b/configure.ac +index 0588004f9f89cdd5..bbc60e3a28369f9f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1087,6 +1087,7 @@ AC_MSG_CHECKING(for long long format) + AC_TRY_RUN( + [ + #include ++#include + int main() + { + uint64_t i; diff --git a/zabbix.spec b/zabbix.spec index 4cd675d..c3b93b2 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -49,6 +49,7 @@ Patch0: %{srcname}-config.patch Patch1: %{srcname}-out-of-tree.patch # Enforce Fedora Crypto Policy Patch2: %{srcname}-crypto-policy.patch +Patch3: %{srcname}-configure-sscanf.patch # Patch1 patches automake files so we need to autoreconf BuildRequires: libtool @@ -327,6 +328,7 @@ Custom SELinux policy module %patch0 -p1 -b .config %patch1 -p1 -b .out-of-tree %patch2 -p1 -b .crypto-policy +%patch3 -p1 -b .configure-sscanf autoreconf # Remove bundled java libs @@ -796,6 +798,9 @@ fi %files web-pgsql %changelog +* Thu Nov 17 2022 Florian Weimer - 1:6.0.8-2 +- Include in configure for sscanf prototype + * Wed Sep 14 2022 Gwyn Ciesla - 1:6.0.8-1 - 6.0.8 From 30e53b16282e3efcb9b7917e0d7de1f1d19c3778 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:10:26 +0000 Subject: [PATCH 10/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index c3b93b2..49d70ce 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1:6.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Nov 17 2022 Florian Weimer - 1:6.0.8-2 - Include in configure for sscanf prototype From a11392074c6f8efc7209212a6e5103a71697c8a6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 22 Jan 2023 13:56:30 -0700 Subject: [PATCH 11/68] Update to 6.0.12 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb37d3f..332891b 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.5.tar.gz /zabbix-6.0.6.tar.gz /zabbix-6.0.8.tar.gz +/zabbix-6.0.12.tar.gz diff --git a/sources b/sources index e1a3b8c..ab913ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.8.tar.gz) = 76e3ec798b4cb4474ef6c0f936aea04cc9e15ce3aefb146e1de09b08c64559bdaa1caaa011fdfa94c23765417d8c3be3da9aa22dfb2cb403e588befa25fcc668 +SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d diff --git a/zabbix.spec b/zabbix.spec index 49d70ce..a03be7e 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.8 -Release: 3%{?dist} +Version: 6.0.12 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Sun Jan 22 2023 Orion Poplawski - 1:6.0.12-1 +- Update to 6.0.12 + * Sat Jan 21 2023 Fedora Release Engineering - 1:6.0.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 87540912a155b925e0673f549811178c1a5d03ed Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Feb 2023 15:48:27 -0700 Subject: [PATCH 12/68] Update to 6.0.13 Add policy to allow zabbix scripts to run chronyc as chronyc_t (bz#2160180) Add policy to allow zabbix agent to run rpm read-only --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 573 ++++++++++++++++++++------------------- zabbix.spec | 7 +- zabbix.te | 9 + 5 files changed, 310 insertions(+), 282 deletions(-) diff --git a/.gitignore b/.gitignore index 332891b..25e02f8 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.6.tar.gz /zabbix-6.0.8.tar.gz /zabbix-6.0.12.tar.gz +/zabbix-6.0.13.tar.gz diff --git a/sources b/sources index ab913ad..5e0073f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.12.tar.gz) = 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d +SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 9b366ec..9bfabaa 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,6 +1,6 @@ -diff -up zabbix-6.0.6/src/go/Makefile.am.out-of-tree zabbix-6.0.6/src/go/Makefile.am ---- zabbix-6.0.6/src/go/Makefile.am.out-of-tree 2022-06-27 01:43:04.792778098 -0600 -+++ zabbix-6.0.6/src/go/Makefile.am 2022-07-07 22:23:56.835406975 -0600 +diff -up zabbix-6.0.13/src/go/Makefile.am.out-of-tree zabbix-6.0.13/src/go/Makefile.am +--- zabbix-6.0.13/src/go/Makefile.am.out-of-tree 2023-02-01 00:19:54.520718582 -0700 ++++ zabbix-6.0.13/src/go/Makefile.am 2023-02-16 12:12:40.691876329 -0700 @@ -57,15 +57,15 @@ zabbix.com/cmd/zabbix_web_service: build: ${TARGETS} @@ -29,9 +29,9 @@ diff -up zabbix-6.0.6/src/go/Makefile.am.out-of-tree zabbix-6.0.6/src/go/Makefil style: CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... format: -diff -up zabbix-6.0.6/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.6/src/libs/zbxalgo/Makefile.am.out-of-tree 2022-06-27 01:43:04.808778323 -0600 -+++ zabbix-6.0.6/src/libs/zbxalgo/Makefile.am 2022-07-07 22:23:56.788406535 -0600 +diff -up zabbix-6.0.13/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxalgo/Makefile.am +--- zabbix-6.0.13/src/libs/zbxalgo/Makefile.am.out-of-tree 2023-02-01 00:19:54.536718733 -0700 ++++ zabbix-6.0.13/src/libs/zbxalgo/Makefile.am 2023-02-16 12:12:40.692876324 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -40,9 +40,9 @@ diff -up zabbix-6.0.6/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxalgo.a if SERVER -diff -up zabbix-6.0.6/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.6/src/libs/zbxaudit/Makefile.am.out-of-tree 2022-06-27 01:43:04.808778323 -0600 -+++ zabbix-6.0.6/src/libs/zbxaudit/Makefile.am 2022-07-07 22:23:56.789406544 -0600 +diff -up zabbix-6.0.13/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxaudit/Makefile.am +--- zabbix-6.0.13/src/libs/zbxaudit/Makefile.am.out-of-tree 2023-02-01 00:19:54.540718773 -0700 ++++ zabbix-6.0.13/src/libs/zbxaudit/Makefile.am 2023-02-16 12:12:40.693876319 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -51,9 +51,9 @@ diff -up zabbix-6.0.6/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.6/src noinst_LIBRARIES = libzbxaudit.a libzbxaudit_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.6/src/libs/zbxavailability/Makefile.am.out-of-tree 2022-06-27 01:43:04.812778378 -0600 -+++ zabbix-6.0.6/src/libs/zbxavailability/Makefile.am 2022-07-07 22:23:56.789406544 -0600 +diff -up zabbix-6.0.13/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxavailability/Makefile.am +--- zabbix-6.0.13/src/libs/zbxavailability/Makefile.am.out-of-tree 2023-02-01 00:19:54.544718811 -0700 ++++ zabbix-6.0.13/src/libs/zbxavailability/Makefile.am 2023-02-16 12:12:40.694876314 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -62,9 +62,9 @@ diff -up zabbix-6.0.6/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxavailability.a libzbxavailability_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.6/src/libs/zbxcommon/Makefile.am.out-of-tree 2022-06-27 01:43:04.812778378 -0600 -+++ zabbix-6.0.6/src/libs/zbxcommon/Makefile.am 2022-07-07 22:23:56.790406554 -0600 +diff -up zabbix-6.0.13/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcommon/Makefile.am +--- zabbix-6.0.13/src/libs/zbxcommon/Makefile.am.out-of-tree 2023-02-01 00:19:54.544718811 -0700 ++++ zabbix-6.0.13/src/libs/zbxcommon/Makefile.am 2023-02-16 12:12:40.695876310 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -73,9 +73,9 @@ diff -up zabbix-6.0.6/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.6/sr noinst_LIBRARIES = libzbxcommon.a libzbxcommon_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2022-06-27 01:41:38.747573554 -0600 -+++ zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am 2022-07-07 22:23:56.790406554 -0600 +diff -up zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am +--- zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2023-01-30 00:22:04.944328308 -0700 ++++ zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am 2023-02-16 12:12:40.697876300 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -84,9 +84,9 @@ diff -up zabbix-6.0.6/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.6 noinst_LIBRARIES = libzbxcommshigh.a libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.6/src/libs/zbxcomms/Makefile.am.out-of-tree 2022-06-27 01:41:38.747573554 -0600 -+++ zabbix-6.0.6/src/libs/zbxcomms/Makefile.am 2022-07-07 22:23:56.791406563 -0600 +diff -up zabbix-6.0.13/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcomms/Makefile.am +--- zabbix-6.0.13/src/libs/zbxcomms/Makefile.am.out-of-tree 2023-01-30 00:22:04.944328308 -0700 ++++ zabbix-6.0.13/src/libs/zbxcomms/Makefile.am 2023-02-16 12:12:40.698876295 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -95,9 +95,9 @@ diff -up zabbix-6.0.6/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.6/src noinst_LIBRARIES = libzbxcomms.a libzbxcomms_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.6/src/libs/zbxcompress/Makefile.am.out-of-tree 2022-06-20 02:59:15.982826064 -0600 -+++ zabbix-6.0.6/src/libs/zbxcompress/Makefile.am 2022-07-07 22:23:56.791406563 -0600 +diff -up zabbix-6.0.13/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcompress/Makefile.am +--- zabbix-6.0.13/src/libs/zbxcompress/Makefile.am.out-of-tree 2023-01-23 01:33:45.931502136 -0700 ++++ zabbix-6.0.13/src/libs/zbxcompress/Makefile.am 2023-02-16 12:12:40.699876291 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -106,9 +106,9 @@ diff -up zabbix-6.0.6/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.6/ noinst_LIBRARIES = libzbxcompress.a libzbxcompress_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.6/src/libs/zbxconf/Makefile.am.out-of-tree 2022-06-20 02:59:15.982826064 -0600 -+++ zabbix-6.0.6/src/libs/zbxconf/Makefile.am 2022-07-07 22:23:56.792406573 -0600 +diff -up zabbix-6.0.13/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxconf/Makefile.am +--- zabbix-6.0.13/src/libs/zbxconf/Makefile.am.out-of-tree 2023-01-23 01:33:45.931502136 -0700 ++++ zabbix-6.0.13/src/libs/zbxconf/Makefile.am 2023-02-16 12:12:40.699876291 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -117,9 +117,9 @@ diff -up zabbix-6.0.6/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxconf.a libzbxconf_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am.out-of-tree 2022-06-27 01:43:04.816778435 -0600 -+++ zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am 2022-07-07 22:23:56.792406573 -0600 +diff -up zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am +--- zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am.out-of-tree 2023-02-01 00:19:54.552718885 -0700 ++++ zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am 2023-02-16 12:12:40.700876286 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -128,9 +128,9 @@ diff -up zabbix-6.0.6/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.6/sr noinst_LIBRARIES = libzbxcrypto.a libzbxcrypto_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am.out-of-tree 2022-06-27 01:41:38.751573611 -0600 -+++ zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am 2022-07-07 22:23:56.793406582 -0600 +diff -up zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am +--- zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am.out-of-tree 2023-01-30 00:22:04.948328337 -0700 ++++ zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am 2023-02-16 12:12:40.701876281 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -139,9 +139,9 @@ diff -up zabbix-6.0.6/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.6/s noinst_LIBRARIES = libzbxdbcache.a libzbxdbcache_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2022-06-27 01:43:04.820778490 -0600 -+++ zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am 2022-07-07 22:23:56.793406582 -0600 +diff -up zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am +--- zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2023-02-01 00:19:54.568719037 -0700 ++++ zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am 2023-02-16 12:12:40.702876276 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -150,9 +150,9 @@ diff -up zabbix-6.0.6/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.6/sr 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.6/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.6/src/libs/zbxdb/Makefile.am.out-of-tree 2022-06-20 02:59:15.982826064 -0600 -+++ zabbix-6.0.6/src/libs/zbxdb/Makefile.am 2022-07-07 22:23:56.794406591 -0600 +diff -up zabbix-6.0.13/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdb/Makefile.am +--- zabbix-6.0.13/src/libs/zbxdb/Makefile.am.out-of-tree 2023-01-23 01:33:45.931502136 -0700 ++++ zabbix-6.0.13/src/libs/zbxdb/Makefile.am 2023-02-16 12:12:40.703876272 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -161,9 +161,9 @@ diff -up zabbix-6.0.6/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.6/src/li noinst_LIBRARIES = libzbxdb.a libzbxdb_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2022-06-27 01:43:04.824778547 -0600 -+++ zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am 2022-07-07 22:23:56.794406591 -0600 +diff -up zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am +--- zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2023-02-01 00:19:54.572719076 -0700 ++++ zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am 2023-02-16 12:12:40.704876267 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -172,9 +172,9 @@ diff -up zabbix-6.0.6/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.6 noinst_LIBRARIES = libzbxdbupgrade.a libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.6/src/libs/zbxdiag/Makefile.am.out-of-tree 2022-06-27 01:41:38.771573891 -0600 -+++ zabbix-6.0.6/src/libs/zbxdiag/Makefile.am 2022-07-07 22:23:56.794406591 -0600 +diff -up zabbix-6.0.13/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdiag/Makefile.am +--- zabbix-6.0.13/src/libs/zbxdiag/Makefile.am.out-of-tree 2023-01-30 00:22:04.964328451 -0700 ++++ zabbix-6.0.13/src/libs/zbxdiag/Makefile.am 2023-02-16 12:12:40.704876267 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -183,9 +183,9 @@ diff -up zabbix-6.0.6/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.6/src/libs/zbxembed/Makefile.am.out-of-tree 2022-06-27 01:43:04.828778603 -0600 -+++ zabbix-6.0.6/src/libs/zbxembed/Makefile.am 2022-07-07 22:23:56.795406601 -0600 +diff -up zabbix-6.0.13/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxembed/Makefile.am +--- zabbix-6.0.13/src/libs/zbxembed/Makefile.am.out-of-tree 2023-02-01 00:19:54.580719152 -0700 ++++ zabbix-6.0.13/src/libs/zbxembed/Makefile.am 2023-02-16 12:12:40.705876262 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -194,9 +194,9 @@ diff -up zabbix-6.0.6/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.6/src noinst_LIBRARIES = libzbxembed.a libzbxembed_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.6/src/libs/zbxeval/Makefile.am.out-of-tree 2022-06-27 01:43:04.844778827 -0600 -+++ zabbix-6.0.6/src/libs/zbxeval/Makefile.am 2022-07-07 22:23:56.796406610 -0600 +diff -up zabbix-6.0.13/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxeval/Makefile.am +--- zabbix-6.0.13/src/libs/zbxeval/Makefile.am.out-of-tree 2023-02-01 00:19:54.596719303 -0700 ++++ zabbix-6.0.13/src/libs/zbxeval/Makefile.am 2023-02-16 12:12:40.706876257 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -205,9 +205,9 @@ diff -up zabbix-6.0.6/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxeval.a libzbxeval_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.6/src/libs/zbxexec/Makefile.am.out-of-tree 2022-06-20 02:59:16.006826441 -0600 -+++ zabbix-6.0.6/src/libs/zbxexec/Makefile.am 2022-07-07 22:23:56.796406610 -0600 +diff -up zabbix-6.0.13/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxexec/Makefile.am +--- zabbix-6.0.13/src/libs/zbxexec/Makefile.am.out-of-tree 2023-01-23 01:33:45.959502505 -0700 ++++ zabbix-6.0.13/src/libs/zbxexec/Makefile.am 2023-02-16 12:12:40.706876257 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -216,9 +216,9 @@ diff -up zabbix-6.0.6/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxexec.a libzbxexec_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxha/Makefile.am ---- zabbix-6.0.6/src/libs/zbxha/Makefile.am.out-of-tree 2022-06-27 01:43:04.844778827 -0600 -+++ zabbix-6.0.6/src/libs/zbxha/Makefile.am 2022-07-07 22:23:56.796406610 -0600 +diff -up zabbix-6.0.13/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxha/Makefile.am +--- zabbix-6.0.13/src/libs/zbxha/Makefile.am.out-of-tree 2023-02-01 00:19:54.596719303 -0700 ++++ zabbix-6.0.13/src/libs/zbxha/Makefile.am 2023-02-16 12:12:40.707876252 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -227,9 +227,9 @@ diff -up zabbix-6.0.6/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.6/src/li noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.6/src/libs/zbxhistory/Makefile.am.out-of-tree 2022-06-20 02:59:16.006826441 -0600 -+++ zabbix-6.0.6/src/libs/zbxhistory/Makefile.am 2022-07-07 22:23:56.797406619 -0600 +diff -up zabbix-6.0.13/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxhistory/Makefile.am +--- zabbix-6.0.13/src/libs/zbxhistory/Makefile.am.out-of-tree 2023-01-23 01:33:45.959502505 -0700 ++++ zabbix-6.0.13/src/libs/zbxhistory/Makefile.am 2023-02-16 12:12:40.708876248 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -238,9 +238,9 @@ diff -up zabbix-6.0.6/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.6/s noinst_LIBRARIES = libzbxhistory.a libzbxhistory_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.6/src/libs/zbxhttp/Makefile.am.out-of-tree 2022-06-27 01:41:38.787574114 -0600 -+++ zabbix-6.0.6/src/libs/zbxhttp/Makefile.am 2022-07-07 22:23:56.797406619 -0600 +diff -up zabbix-6.0.13/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxhttp/Makefile.am +--- zabbix-6.0.13/src/libs/zbxhttp/Makefile.am.out-of-tree 2023-01-30 00:22:04.976328534 -0700 ++++ zabbix-6.0.13/src/libs/zbxhttp/Makefile.am 2023-02-16 12:12:40.709876243 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -249,9 +249,9 @@ diff -up zabbix-6.0.6/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxhttp.a libzbxhttp_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 -+++ zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am 2022-07-07 22:23:56.798406629 -0600 +diff -up zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am +--- zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am.out-of-tree 2023-01-30 00:22:04.976328534 -0700 ++++ zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am 2023-02-16 12:12:40.710876238 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -260,9 +260,9 @@ diff -up zabbix-6.0.6/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.6/ noinst_LIBRARIES = libzbxicmpping.a libzbxicmpping_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 -+++ zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am 2022-07-07 22:23:56.798406629 -0600 +diff -up zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am +--- zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am.out-of-tree 2023-01-27 02:18:53.018143449 -0700 ++++ zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am 2023-02-16 12:12:40.711876234 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -271,9 +271,9 @@ diff -up zabbix-6.0.6/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxipcservice.a libzbxipcservice_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.6/src/libs/zbxjson/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 -+++ zabbix-6.0.6/src/libs/zbxjson/Makefile.am 2022-07-07 22:23:56.799406638 -0600 +diff -up zabbix-6.0.13/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxjson/Makefile.am +--- zabbix-6.0.13/src/libs/zbxjson/Makefile.am.out-of-tree 2023-02-01 00:19:54.600719342 -0700 ++++ zabbix-6.0.13/src/libs/zbxjson/Makefile.am 2023-02-16 12:12:40.712876229 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -282,9 +282,9 @@ diff -up zabbix-6.0.6/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxjson.a libzbxjson_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.6/src/libs/zbxlog/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 -+++ zabbix-6.0.6/src/libs/zbxlog/Makefile.am 2022-07-07 22:23:56.799406638 -0600 +diff -up zabbix-6.0.13/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxlog/Makefile.am +--- zabbix-6.0.13/src/libs/zbxlog/Makefile.am.out-of-tree 2023-01-23 01:33:45.963502558 -0700 ++++ zabbix-6.0.13/src/libs/zbxlog/Makefile.am 2023-02-16 12:12:40.712876229 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -293,9 +293,9 @@ diff -up zabbix-6.0.6/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.6/src/l noinst_LIBRARIES = libzbxlog.a libzbxlog_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.6/src/libs/zbxmedia/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 -+++ zabbix-6.0.6/src/libs/zbxmedia/Makefile.am 2022-07-07 22:23:56.800406648 -0600 +diff -up zabbix-6.0.13/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxmedia/Makefile.am +--- zabbix-6.0.13/src/libs/zbxmedia/Makefile.am.out-of-tree 2023-01-30 00:22:04.980328562 -0700 ++++ zabbix-6.0.13/src/libs/zbxmedia/Makefile.am 2023-02-16 12:12:40.713876224 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -304,9 +304,9 @@ diff -up zabbix-6.0.6/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.6/src noinst_LIBRARIES = libzbxmedia.a libzbxmedia_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.6/src/libs/zbxmemory/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 -+++ zabbix-6.0.6/src/libs/zbxmemory/Makefile.am 2022-07-07 22:23:56.800406648 -0600 +diff -up zabbix-6.0.13/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxmemory/Makefile.am +--- zabbix-6.0.13/src/libs/zbxmemory/Makefile.am.out-of-tree 2023-01-30 00:22:04.980328562 -0700 ++++ zabbix-6.0.13/src/libs/zbxmemory/Makefile.am 2023-02-16 12:12:40.714876219 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -315,9 +315,9 @@ diff -up zabbix-6.0.6/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.6/sr noinst_LIBRARIES = libzbxmemory.a libzbxmemory_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.6/src/libs/zbxmodules/Makefile.am.out-of-tree 2022-06-20 02:48:20.280593963 -0600 -+++ zabbix-6.0.6/src/libs/zbxmodules/Makefile.am 2022-07-07 22:23:56.801406657 -0600 +diff -up zabbix-6.0.13/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxmodules/Makefile.am +--- zabbix-6.0.13/src/libs/zbxmodules/Makefile.am.out-of-tree 2023-01-23 01:33:45.963502558 -0700 ++++ zabbix-6.0.13/src/libs/zbxmodules/Makefile.am 2023-02-16 12:12:40.715876214 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -326,9 +326,9 @@ diff -up zabbix-6.0.6/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.6/s noinst_LIBRARIES = libzbxmodules.a libzbxmodules_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.6/src/libs/zbxnix/Makefile.am.out-of-tree 2022-06-27 01:41:38.791574171 -0600 -+++ zabbix-6.0.6/src/libs/zbxnix/Makefile.am 2022-07-07 22:23:56.801406657 -0600 +diff -up zabbix-6.0.13/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxnix/Makefile.am +--- zabbix-6.0.13/src/libs/zbxnix/Makefile.am.out-of-tree 2023-01-30 00:22:04.980328562 -0700 ++++ zabbix-6.0.13/src/libs/zbxnix/Makefile.am 2023-02-16 12:12:40.716876210 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -337,9 +337,20 @@ diff -up zabbix-6.0.6/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.6/src/l noinst_LIBRARIES = libzbxnix.a libzbxnix_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am.out-of-tree 2022-06-20 02:59:16.010826504 -0600 -+++ zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am 2022-07-07 22:23:56.802406666 -0600 +diff -up zabbix-6.0.13/src/libs/zbxprof/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxprof/Makefile.am +--- zabbix-6.0.13/src/libs/zbxprof/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 ++++ zabbix-6.0.13/src/libs/zbxprof/Makefile.am 2023-02-16 12:15:46.024983315 -0700 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libzbxprof.a + + libzbxprof_a_SOURCES = \ +diff -up zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am +--- zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am.out-of-tree 2023-01-23 01:33:45.963502558 -0700 ++++ zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am 2023-02-16 12:12:40.717876205 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -348,9 +359,9 @@ diff -up zabbix-6.0.6/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxprometheus.a libzbxprometheus_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.6/src/libs/zbxregexp/Makefile.am.out-of-tree 2022-06-20 02:48:20.280593963 -0600 -+++ zabbix-6.0.6/src/libs/zbxregexp/Makefile.am 2022-07-07 22:23:56.802406666 -0600 +diff -up zabbix-6.0.13/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxregexp/Makefile.am +--- zabbix-6.0.13/src/libs/zbxregexp/Makefile.am.out-of-tree 2023-01-23 01:33:45.967502610 -0700 ++++ zabbix-6.0.13/src/libs/zbxregexp/Makefile.am 2023-02-16 12:12:40.717876205 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -359,9 +370,9 @@ diff -up zabbix-6.0.6/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.6/sr noinst_LIBRARIES = libzbxregexp.a libzbxregexp_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.6/src/libs/zbxrtc/Makefile.am.out-of-tree 2022-06-27 01:43:04.848778883 -0600 -+++ zabbix-6.0.6/src/libs/zbxrtc/Makefile.am 2022-07-07 22:23:56.802406666 -0600 +diff -up zabbix-6.0.13/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxrtc/Makefile.am +--- zabbix-6.0.13/src/libs/zbxrtc/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 ++++ zabbix-6.0.13/src/libs/zbxrtc/Makefile.am 2023-02-16 12:12:40.718876200 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -370,9 +381,9 @@ diff -up zabbix-6.0.6/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.6/src/l noinst_LIBRARIES = \ libzbxrtc.a \ libzbxrtc_service.a \ -diff -up zabbix-6.0.6/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxself/Makefile.am ---- zabbix-6.0.6/src/libs/zbxself/Makefile.am.out-of-tree 2022-06-27 01:43:04.848778883 -0600 -+++ zabbix-6.0.6/src/libs/zbxself/Makefile.am 2022-07-07 22:23:56.803406676 -0600 +diff -up zabbix-6.0.13/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxself/Makefile.am +--- zabbix-6.0.13/src/libs/zbxself/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 ++++ zabbix-6.0.13/src/libs/zbxself/Makefile.am 2023-02-16 12:12:40.719876196 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -381,9 +392,9 @@ diff -up zabbix-6.0.6/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.6/src/ noinst_LIBRARIES = libzbxself.a libzbxself_server.a libzbxself_proxy.a libzbxself_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.6/src/libs/zbxserver/Makefile.am.out-of-tree 2022-06-27 01:43:04.848778883 -0600 -+++ zabbix-6.0.6/src/libs/zbxserver/Makefile.am 2022-07-07 22:23:56.803406676 -0600 +diff -up zabbix-6.0.13/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxserver/Makefile.am +--- zabbix-6.0.13/src/libs/zbxserver/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 ++++ zabbix-6.0.13/src/libs/zbxserver/Makefile.am 2023-02-16 12:12:40.720876191 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -392,9 +403,9 @@ diff -up zabbix-6.0.6/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.6/sr noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a libzbxserver_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.6/src/libs/zbxservice/Makefile.am.out-of-tree 2022-06-27 01:43:04.852778938 -0600 -+++ zabbix-6.0.6/src/libs/zbxservice/Makefile.am 2022-07-07 22:23:56.804406685 -0600 +diff -up zabbix-6.0.13/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxservice/Makefile.am +--- zabbix-6.0.13/src/libs/zbxservice/Makefile.am.out-of-tree 2023-02-01 00:19:54.608719418 -0700 ++++ zabbix-6.0.13/src/libs/zbxservice/Makefile.am 2023-02-16 12:12:40.721876186 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -403,9 +414,9 @@ diff -up zabbix-6.0.6/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.6/s noinst_LIBRARIES = libzbxservice.a libzbxservice_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2022-06-27 01:43:04.856778995 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am 2022-07-07 22:23:56.804406685 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2023-02-01 00:19:54.608719418 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am 2023-02-16 12:12:40.722876181 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -414,9 +425,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libagentsysinfo.a libagentsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2022-06-20 02:59:16.014826566 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am 2022-07-07 22:23:56.805406694 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2023-01-23 01:33:45.967502610 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am 2023-02-16 12:12:40.723876176 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -425,9 +436,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2022-06-27 01:43:04.856778995 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am 2022-07-07 22:23:56.805406694 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2023-02-01 00:19:54.612719455 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am 2023-02-16 12:12:40.723876176 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -436,9 +447,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am 2022-07-07 22:23:56.806406704 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2023-01-23 01:33:45.971502662 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am 2023-02-16 12:12:40.724876172 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -447,9 +458,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am 2022-07-07 22:23:56.806406704 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2023-01-23 01:33:45.971502662 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am 2023-02-16 12:12:40.725876167 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -458,9 +469,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2022-06-27 01:41:38.807574394 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am 2022-07-07 22:23:56.807406713 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2023-01-30 00:22:04.992328648 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am 2023-02-16 12:12:40.726876162 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -469,9 +480,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2022-06-27 01:41:38.803574339 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am 2022-07-07 22:23:56.807406713 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2023-01-30 00:22:04.988328619 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am 2023-02-16 12:12:40.727876157 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -480,9 +491,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.6/s DIST_SUBDIRS = \ agent \ common \ -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am 2022-07-07 22:23:56.808406723 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am 2023-02-16 12:12:40.728876152 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -491,9 +502,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am 2022-07-07 22:23:56.808406723 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am 2023-02-16 12:12:40.728876152 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -502,9 +513,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am 2022-07-07 22:23:56.809406732 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am 2023-02-16 12:12:40.729876148 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -513,9 +524,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am 2022-07-07 22:23:56.809406732 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am 2023-02-16 12:12:40.733876129 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -524,9 +535,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2022-06-27 01:41:38.807574394 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am 2022-07-07 22:23:56.809406732 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2023-01-30 00:22:04.992328648 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am 2023-02-16 12:12:40.734876124 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -535,9 +546,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libsimplesysinfo.a libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am 2022-07-07 22:23:56.810406741 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2023-01-27 02:18:53.042143778 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am 2023-02-16 12:12:40.735876119 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -546,9 +557,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2022-06-20 02:59:16.018826628 -0600 -+++ zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am 2022-07-07 22:23:56.810406741 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2023-01-23 01:33:45.979502768 -0700 ++++ zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am 2023-02-16 12:12:40.735876119 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -557,9 +568,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.6/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.6/src/libs/zbxsys/Makefile.am.out-of-tree 2022-06-27 01:41:38.799574282 -0600 -+++ zabbix-6.0.6/src/libs/zbxsys/Makefile.am 2022-07-07 22:23:56.811406751 -0600 +diff -up zabbix-6.0.13/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsys/Makefile.am +--- zabbix-6.0.13/src/libs/zbxsys/Makefile.am.out-of-tree 2023-01-30 00:22:04.988328619 -0700 ++++ zabbix-6.0.13/src/libs/zbxsys/Makefile.am 2023-02-16 12:12:40.736876114 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -568,9 +579,9 @@ diff -up zabbix-6.0.6/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.6/src/l noinst_LIBRARIES = libzbxsys.a libzbxsys_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.6/src/libs/zbxtasks/Makefile.am.out-of-tree 2022-06-20 02:48:20.292594158 -0600 -+++ zabbix-6.0.6/src/libs/zbxtasks/Makefile.am 2022-07-07 22:23:56.811406751 -0600 +diff -up zabbix-6.0.13/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxtasks/Makefile.am +--- zabbix-6.0.13/src/libs/zbxtasks/Makefile.am.out-of-tree 2023-01-23 01:33:45.979502768 -0700 ++++ zabbix-6.0.13/src/libs/zbxtasks/Makefile.am 2023-02-16 12:12:40.737876110 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -579,9 +590,9 @@ diff -up zabbix-6.0.6/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.6/src noinst_LIBRARIES = libzbxtasks.a libzbxtasks_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.6/src/libs/zbxtrends/Makefile.am.out-of-tree 2022-06-27 01:43:04.860779050 -0600 -+++ zabbix-6.0.6/src/libs/zbxtrends/Makefile.am 2022-07-07 22:23:56.812406760 -0600 +diff -up zabbix-6.0.13/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxtrends/Makefile.am +--- zabbix-6.0.13/src/libs/zbxtrends/Makefile.am.out-of-tree 2023-02-01 00:19:54.620719532 -0700 ++++ zabbix-6.0.13/src/libs/zbxtrends/Makefile.am 2023-02-16 12:12:40.738876105 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -590,9 +601,9 @@ diff -up zabbix-6.0.6/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.6/sr noinst_LIBRARIES = \ libzbxtrends.a \ libzbxtrends_baseline.a -diff -up zabbix-6.0.6/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.6/src/libs/zbxvault/Makefile.am.out-of-tree 2022-06-27 01:43:04.860779050 -0600 -+++ zabbix-6.0.6/src/libs/zbxvault/Makefile.am 2022-07-07 22:23:56.812406760 -0600 +diff -up zabbix-6.0.13/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxvault/Makefile.am +--- zabbix-6.0.13/src/libs/zbxvault/Makefile.am.out-of-tree 2023-02-01 00:19:54.620719532 -0700 ++++ zabbix-6.0.13/src/libs/zbxvault/Makefile.am 2023-02-16 12:12:40.738876105 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -601,9 +612,9 @@ diff -up zabbix-6.0.6/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.6/src noinst_LIBRARIES = libzbxvault.a libzbxvault_a_SOURCES = \ -diff -up zabbix-6.0.6/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.6/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.6/src/libs/zbxxml/Makefile.am.out-of-tree 2022-06-20 02:59:16.022826692 -0600 -+++ zabbix-6.0.6/src/libs/zbxxml/Makefile.am 2022-07-07 22:23:56.813406769 -0600 +diff -up zabbix-6.0.13/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxxml/Makefile.am +--- zabbix-6.0.13/src/libs/zbxxml/Makefile.am.out-of-tree 2023-01-23 01:33:45.979502768 -0700 ++++ zabbix-6.0.13/src/libs/zbxxml/Makefile.am 2023-02-16 12:12:40.739876100 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -612,9 +623,9 @@ diff -up zabbix-6.0.6/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.6/src/l noinst_LIBRARIES = libzbxxml.a libzbxxml_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2022-06-20 02:59:16.022826692 -0600 -+++ zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am 2022-07-07 22:23:56.813406769 -0600 +diff -up zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am +--- zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2023-01-27 02:18:53.054143943 -0700 ++++ zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am 2023-02-16 12:12:40.740876096 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -623,9 +634,9 @@ diff -up zabbix-6.0.6/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxlogfiles.a libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_agent/Makefile.am ---- zabbix-6.0.6/src/zabbix_agent/Makefile.am.out-of-tree 2022-06-27 01:43:04.860779050 -0600 -+++ zabbix-6.0.6/src/zabbix_agent/Makefile.am 2022-07-07 22:23:56.814406779 -0600 +diff -up zabbix-6.0.13/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_agent/Makefile.am +--- zabbix-6.0.13/src/zabbix_agent/Makefile.am.out-of-tree 2023-02-01 00:19:54.620719532 -0700 ++++ zabbix-6.0.13/src/zabbix_agent/Makefile.am 2023-02-16 12:12:40.741876091 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -634,15 +645,15 @@ diff -up zabbix-6.0.6/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.6/src/ SUBDIRS = \ logfiles -@@ -77,4 +79,4 @@ zabbix_agentd_CFLAGS = \ +@@ -78,4 +80,4 @@ zabbix_agentd_CFLAGS = \ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff -up zabbix-6.0.6/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_get/Makefile.am ---- zabbix-6.0.6/src/zabbix_get/Makefile.am.out-of-tree 2022-06-27 01:43:04.864779107 -0600 -+++ zabbix-6.0.6/src/zabbix_get/Makefile.am 2022-07-07 22:23:56.815406788 -0600 +diff -up zabbix-6.0.13/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_get/Makefile.am +--- zabbix-6.0.13/src/zabbix_get/Makefile.am.out-of-tree 2023-02-01 00:19:54.624719569 -0700 ++++ zabbix-6.0.13/src/zabbix_get/Makefile.am 2023-02-16 12:12:40.741876091 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -651,9 +662,9 @@ diff -up zabbix-6.0.6/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.6/src/za bin_PROGRAMS = zabbix_get zabbix_get_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_java/Makefile.am ---- zabbix-6.0.6/src/zabbix_java/Makefile.am.out-of-tree 2022-06-27 01:43:04.864779107 -0600 -+++ zabbix-6.0.6/src/zabbix_java/Makefile.am 2022-07-07 22:23:56.816406798 -0600 +diff -up zabbix-6.0.13/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_java/Makefile.am +--- zabbix-6.0.13/src/zabbix_java/Makefile.am.out-of-tree 2023-02-01 00:19:54.624719569 -0700 ++++ zabbix-6.0.13/src/zabbix_java/Makefile.am 2023-02-16 12:12:40.742876086 -0700 @@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh @@ -683,10 +694,10 @@ diff -up zabbix-6.0.6/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.6/src/z java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_js/Makefile.am ---- zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree 2022-07-07 22:23:56.817406807 -0600 -+++ zabbix-6.0.6/src/zabbix_js/Makefile.am 2022-07-07 22:25:33.289310841 -0600 -@@ -1,25 +1,27 @@ +diff -up zabbix-6.0.13/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_js/Makefile.am +--- zabbix-6.0.13/src/zabbix_js/Makefile.am.out-of-tree 2023-02-01 00:19:54.624719569 -0700 ++++ zabbix-6.0.13/src/zabbix_js/Makefile.am 2023-02-16 12:12:40.743876081 -0700 +@@ -1,26 +1,28 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include @@ -697,6 +708,7 @@ diff -up zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.6/src/zab 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 \ @@ -712,6 +724,7 @@ diff -up zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.6/src/zab - $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ - $(top_srcdir)/src/libs/zbxxml/libzbxxml.a + $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ ++ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ + $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ + $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ @@ -729,9 +742,9 @@ diff -up zabbix-6.0.6/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.6/src/zab zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) -diff -up zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 -+++ zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am 2022-07-07 22:23:56.818406816 -0600 +diff -up zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am +--- zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2023-01-23 01:33:45.991502925 -0700 ++++ zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am 2023-02-16 12:12:40.744876076 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -740,9 +753,9 @@ diff -up zabbix-6.0.6/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxdatasender.a libzbxdatasender_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 -+++ zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am 2022-07-07 22:23:56.818406816 -0600 +diff -up zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am +--- zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2023-01-27 02:18:53.058143998 -0700 ++++ zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am 2023-02-16 12:12:40.745876072 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -751,9 +764,9 @@ diff -up zabbix-6.0.6/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxheart.a libzbxheart_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 -+++ zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am 2022-07-07 22:23:56.820406835 -0600 +diff -up zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am +--- zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2023-01-23 01:33:45.991502925 -0700 ++++ zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am 2023-02-16 12:12:40.746876067 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -762,9 +775,9 @@ diff -up zabbix-6.0.6/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.6/src/zabbix_proxy/Makefile.am.out-of-tree 2022-06-27 01:43:04.864779107 -0600 -+++ zabbix-6.0.6/src/zabbix_proxy/Makefile.am 2022-07-07 22:23:56.820406835 -0600 +diff -up zabbix-6.0.13/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/Makefile.am +--- zabbix-6.0.13/src/zabbix_proxy/Makefile.am.out-of-tree 2023-02-01 00:19:54.628719606 -0700 ++++ zabbix-6.0.13/src/zabbix_proxy/Makefile.am 2023-02-16 12:12:40.747876062 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -773,15 +786,15 @@ diff -up zabbix-6.0.6/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.6/src/ SUBDIRS = \ heart \ housekeeper \ -@@ -111,4 +113,4 @@ install-data-hook: +@@ -112,4 +114,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" + test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -diff -up zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 -+++ zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am 2022-07-07 22:23:56.821406844 -0600 +diff -up zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am +--- zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2023-01-27 02:18:53.058143998 -0700 ++++ zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am 2023-02-16 12:12:40.747876062 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -790,9 +803,9 @@ diff -up zabbix-6.0.6/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxproxyconfig.a libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2022-06-20 02:59:16.026826754 -0600 -+++ zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am 2022-07-07 22:23:56.822406854 -0600 +diff -up zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am +--- zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2023-01-23 01:33:45.991502925 -0700 ++++ zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am 2023-02-16 12:12:40.748876057 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -801,9 +814,9 @@ diff -up zabbix-6.0.6/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_sender/Makefile.am ---- zabbix-6.0.6/src/zabbix_sender/Makefile.am.out-of-tree 2022-06-27 01:43:04.868779163 -0600 -+++ zabbix-6.0.6/src/zabbix_sender/Makefile.am 2022-07-07 22:23:56.822406854 -0600 +diff -up zabbix-6.0.13/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_sender/Makefile.am +--- zabbix-6.0.13/src/zabbix_sender/Makefile.am.out-of-tree 2023-02-01 00:19:54.628719606 -0700 ++++ zabbix-6.0.13/src/zabbix_sender/Makefile.am 2023-02-16 12:12:40.749876052 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -812,9 +825,9 @@ diff -up zabbix-6.0.6/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.6/src bin_PROGRAMS = zabbix_sender zabbix_sender_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am.out-of-tree 2022-06-27 01:41:38.823574619 -0600 -+++ zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am 2022-07-07 22:23:56.823406863 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am.out-of-tree 2023-01-30 00:22:05.008328759 -0700 ++++ zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am 2023-02-16 12:12:40.750876048 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -823,9 +836,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxalerter.a libzbxalerter_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/availability/Makefile.am.out-of-tree 2022-06-27 01:43:04.868779163 -0600 -+++ zabbix-6.0.6/src/zabbix_server/availability/Makefile.am 2022-07-07 22:23:56.823406863 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/availability/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/availability/Makefile.am.out-of-tree 2023-02-01 00:19:54.632719646 -0700 ++++ zabbix-6.0.13/src/zabbix_server/availability/Makefile.am 2023-02-16 12:12:40.751876043 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -834,9 +847,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/availability/Makefile.am.out-of-tree zab noinst_LIBRARIES = libavailability.a libavailability_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 -+++ zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am 2022-07-07 22:23:56.824406873 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2023-01-27 02:18:53.066144108 -0700 ++++ zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am 2023-02-16 12:12:40.751876043 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -845,9 +858,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxdbconfig.a libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 -+++ zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am 2022-07-07 22:23:56.824406873 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 ++++ zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am 2023-02-16 12:12:40.752876038 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -856,9 +869,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxdbsyncer.a libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 -+++ zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am 2022-07-07 22:23:56.824406873 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 ++++ zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am 2023-02-16 12:12:40.753876034 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -867,9 +880,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxdiscoverer.a libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 -+++ zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am 2022-07-07 22:23:56.825406882 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 ++++ zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am 2023-02-16 12:12:40.754876029 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -878,9 +891,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxescalator.a libzbxescalator_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/ha/Makefile.am.out-of-tree 2022-06-27 01:43:04.872779218 -0600 -+++ zabbix-6.0.6/src/zabbix_server/ha/Makefile.am 2022-07-07 22:23:56.825406882 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/ha/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/ha/Makefile.am.out-of-tree 2023-02-01 00:19:54.632719646 -0700 ++++ zabbix-6.0.13/src/zabbix_server/ha/Makefile.am 2023-02-16 12:12:40.754876029 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -889,9 +902,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.6/ noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2022-06-27 01:43:04.872779218 -0600 -+++ zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am 2022-07-07 22:23:56.826406891 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2023-02-01 00:19:54.632719646 -0700 ++++ zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am 2023-02-16 12:12:40.755876024 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -900,9 +913,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 -+++ zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am 2022-07-07 22:23:56.826406891 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 ++++ zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am 2023-02-16 12:12:40.756876019 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -911,9 +924,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxhttppoller.a libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2022-06-20 02:59:16.030826816 -0600 -+++ zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am 2022-07-07 22:23:56.827406900 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2023-01-23 01:33:45.999503030 -0700 ++++ zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am 2023-02-16 12:12:40.758876010 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -922,9 +935,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libipmi.a libipmi_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/lld/Makefile.am.out-of-tree 2022-06-27 01:41:38.831574731 -0600 -+++ zabbix-6.0.6/src/zabbix_server/lld/Makefile.am 2022-07-07 22:23:56.827406900 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/lld/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/lld/Makefile.am.out-of-tree 2023-01-30 00:22:05.012328788 -0700 ++++ zabbix-6.0.13/src/zabbix_server/lld/Makefile.am 2023-02-16 12:12:40.758876010 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -933,9 +946,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.6 noinst_LIBRARIES = libzbxlld.a libzbxlld_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/Makefile.am.out-of-tree 2022-06-27 01:43:04.868779163 -0600 -+++ zabbix-6.0.6/src/zabbix_server/Makefile.am 2022-07-07 22:23:56.828406910 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/Makefile.am.out-of-tree 2023-02-01 00:19:54.628719606 -0700 ++++ zabbix-6.0.13/src/zabbix_server/Makefile.am 2023-02-16 12:12:40.759876005 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -944,15 +957,15 @@ diff -up zabbix-6.0.6/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.6/src SUBDIRS = \ alerter \ dbsyncer \ -@@ -148,4 +150,4 @@ install-data-hook: +@@ -151,4 +153,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -diff -up zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am.out-of-tree 2022-06-20 02:59:16.034826880 -0600 -+++ zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am 2022-07-07 22:23:56.828406910 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am.out-of-tree 2023-01-23 01:33:45.999503030 -0700 ++++ zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am 2023-02-16 12:12:40.760876000 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -961,9 +974,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxodbc.a libzbxodbc_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am.out-of-tree 2022-06-20 02:59:16.034826880 -0600 -+++ zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am 2022-07-07 22:23:56.829406919 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am.out-of-tree 2023-01-23 01:33:45.999503030 -0700 ++++ zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am 2023-02-16 12:12:40.761875995 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -972,9 +985,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxpinger.a libzbxpinger_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/poller/Makefile.am.out-of-tree 2022-06-27 01:43:04.876779275 -0600 -+++ zabbix-6.0.6/src/zabbix_server/poller/Makefile.am 2022-07-07 22:23:56.829406919 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/poller/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/poller/Makefile.am.out-of-tree 2023-02-01 00:19:54.640719721 -0700 ++++ zabbix-6.0.13/src/zabbix_server/poller/Makefile.am 2023-02-16 12:12:40.761875995 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -983,9 +996,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a libzbxpoller_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2022-06-27 01:43:04.876779275 -0600 -+++ zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am 2022-07-07 22:23:56.830406929 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2023-02-01 00:19:54.644719758 -0700 ++++ zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am 2023-02-16 12:12:40.763875986 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -994,9 +1007,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zab noinst_LIBRARIES = libpreprocessor.a libpreprocessor_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 -+++ zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am 2022-07-07 22:23:56.830406929 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2023-01-27 02:18:53.086144382 -0700 ++++ zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am 2023-02-16 12:12:40.764875981 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1005,9 +1018,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxproxypoller.a libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am.out-of-tree 2022-06-27 01:43:04.880779330 -0600 -+++ zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am 2022-07-07 22:23:56.831406938 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am.out-of-tree 2023-02-01 00:19:54.648719797 -0700 ++++ zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am 2023-02-16 12:12:40.766875971 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1016,9 +1029,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxreporter.a libzbxreporter_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 -+++ zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am 2022-07-07 22:23:56.831406938 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 ++++ zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am 2023-02-16 12:12:40.767875967 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1027,9 +1040,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxscripts.a libzbxscripts_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 -+++ zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am 2022-07-07 22:23:56.832406947 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2023-01-27 02:18:53.086144382 -0700 ++++ zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am 2023-02-16 12:12:40.769875957 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1038,9 +1051,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxselfmon.a libzbxselfmon_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/service/Makefile.am.out-of-tree 2022-06-27 01:43:04.880779330 -0600 -+++ zabbix-6.0.6/src/zabbix_server/service/Makefile.am 2022-07-07 22:23:56.832406947 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/service/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/service/Makefile.am.out-of-tree 2023-02-01 00:19:54.648719797 -0700 ++++ zabbix-6.0.13/src/zabbix_server/service/Makefile.am 2023-02-16 12:12:40.770875952 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1049,9 +1062,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libservice.a libservice_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 -+++ zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am 2022-07-07 22:23:56.833406957 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 ++++ zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am 2023-02-16 12:12:40.772875943 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1060,9 +1073,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxsnmptrapper.a libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 -+++ zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am 2022-07-07 22:23:56.833406957 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 ++++ zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am 2023-02-16 12:12:40.773875938 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1071,9 +1084,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/timer/Makefile.am.out-of-tree 2022-06-20 02:59:16.038826943 -0600 -+++ zabbix-6.0.6/src/zabbix_server/timer/Makefile.am 2022-07-07 22:23:56.834406966 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/timer/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/timer/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 ++++ zabbix-6.0.13/src/zabbix_server/timer/Makefile.am 2023-02-16 12:12:40.773875938 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1082,9 +1095,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libzbxtimer.a libzbxtimer_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am.out-of-tree 2022-06-27 01:43:04.880779330 -0600 -+++ zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am 2022-07-07 22:23:56.834406966 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am.out-of-tree 2023-02-01 00:19:54.648719797 -0700 ++++ zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am 2023-02-16 12:12:40.774875933 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1093,9 +1106,9 @@ diff -up zabbix-6.0.6/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am.out-of-tree 2022-06-20 02:59:16.042827005 -0600 -+++ zabbix-6.0.6/src/zabbix_server/vmware/Makefile.am 2022-07-07 22:23:56.835406975 -0600 +diff -up zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am +--- zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am.out-of-tree 2023-01-30 00:22:05.028328900 -0700 ++++ zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am 2023-02-16 12:12:40.775875929 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in diff --git a/zabbix.spec b/zabbix.spec index a03be7e..f66ab20 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.12 +Version: 6.0.13 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -798,6 +798,11 @@ fi %files web-pgsql %changelog +* Thu Feb 16 2023 Orion Poplawski - 1:6.0.13-1 +- Update to 6.0.13 +- Add policy to allow zabbix scripts to run chronyc as chronyc_t (bz#2160180) +- Add policy to allow zabbix agent to run rpm read-only + * Sun Jan 22 2023 Orion Poplawski - 1:6.0.12-1 - Update to 6.0.12 diff --git a/zabbix.te b/zabbix.te index 273e394..a456bd5 100644 --- a/zabbix.te +++ b/zabbix.te @@ -302,6 +302,11 @@ tunable_policy(`zabbix_run_sudo',` xserver_exec_xauth(zabbix_agent_t) ') +optional_policy(` + rpm_exec(zabbix_agent_t) + rpm_read_db(zabbix_agent_t) +') + optional_policy(` tunable_policy(`zabbix_run_sudo',` sudo_exec(zabbix_agent_t) @@ -330,6 +335,10 @@ allow zabbix_t zabbix_script_t:process signal; init_domtrans_script(zabbix_script_t) +optional_policy(` + chronyd_domtrans_chronyc(zabbix_script_t) +') + optional_policy(` mta_send_mail(zabbix_script_t) ') From 490e3ed00208e9fae440d3d7b717d720872be0c7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 14:16:35 -0600 Subject: [PATCH 13/68] migrated to SPDX license --- zabbix.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index f66ab20..643df82 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,10 +17,10 @@ Name: zabbix Epoch: 1 Version: 6.0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure -License: GPLv2+ +License: GPL-2.0-or-later URL: https://www.zabbix.com Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Wed Mar 01 2023 Gwyn Ciesla - 1:6.0.13-2 +- migrated to SPDX license + * Thu Feb 16 2023 Orion Poplawski - 1:6.0.13-1 - Update to 6.0.13 - Add policy to allow zabbix scripts to run chronyc as chronyc_t (bz#2160180) From 88890abe71505a8c06cfb303234014002136243d Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 21 Mar 2023 17:34:23 +0100 Subject: [PATCH 14/68] Update to 6.0.14 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 25e02f8..f7e1143 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.8.tar.gz /zabbix-6.0.12.tar.gz /zabbix-6.0.13.tar.gz +/zabbix-6.0.14.tar.gz diff --git a/sources b/sources index 5e0073f..d3fa07c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.13.tar.gz) = 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e +SHA512 (zabbix-6.0.14.tar.gz) = 9750dc6bfdc3966a6be098297744fed507272776212ce2143c70b035c2a0662e6c1fb1a1f423babbd9b69ad6231e6cbe397d5def069192a0c21189ca96670c89 diff --git a/zabbix.spec b/zabbix.spec index 643df82..568a687 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.13 -Release: 2%{?dist} +Version: 6.0.14 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPL-2.0-or-later @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Tue Mar 21 2023 Morten Stevens - 1:6.0.14-1 +- Update to 6.0.14 + * Wed Mar 01 2023 Gwyn Ciesla - 1:6.0.13-2 - migrated to SPDX license From 3411c0f5861fe566c236900617067e98b12de894 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 4 Apr 2023 11:11:37 +0200 Subject: [PATCH 15/68] Update to 6.0.15 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f7e1143..f945170 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.12.tar.gz /zabbix-6.0.13.tar.gz /zabbix-6.0.14.tar.gz +/zabbix-6.0.15.tar.gz diff --git a/sources b/sources index d3fa07c..fdd5a7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.14.tar.gz) = 9750dc6bfdc3966a6be098297744fed507272776212ce2143c70b035c2a0662e6c1fb1a1f423babbd9b69ad6231e6cbe397d5def069192a0c21189ca96670c89 +SHA512 (zabbix-6.0.15.tar.gz) = c4b06308e08d630ca5af756a07f86b60562847ad0e2520ca6224724b76067cc83d7f38af21979c902dc3658b208b3d49069f42792b6bf204b71adffa0283fdb9 diff --git a/zabbix.spec b/zabbix.spec index 568a687..cf53911 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.14 +Version: 6.0.15 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Tue Apr 04 2023 Morten Stevens - 1:6.0.15-1 +- Update to 6.0.15 + * Tue Mar 21 2023 Morten Stevens - 1:6.0.14-1 - Update to 6.0.14 From 01503a359d0dde71fa868abbf09d3193ba758d92 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 11 Apr 2023 16:15:57 +0200 Subject: [PATCH 16/68] Update to 6.0.16 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f945170..00fbc9d 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.13.tar.gz /zabbix-6.0.14.tar.gz /zabbix-6.0.15.tar.gz +/zabbix-6.0.16.tar.gz diff --git a/sources b/sources index fdd5a7f..02dc788 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.15.tar.gz) = c4b06308e08d630ca5af756a07f86b60562847ad0e2520ca6224724b76067cc83d7f38af21979c902dc3658b208b3d49069f42792b6bf204b71adffa0283fdb9 +SHA512 (zabbix-6.0.16.tar.gz) = 256c634fee53cdc9b898774499b6853aad3f9b27a045bac4dbed8bf1013fb478a1c5596f8db95346faf86a0350aff5623b3ac5161536cd7f3b85292a688e3360 diff --git a/zabbix.spec b/zabbix.spec index cf53911..8ef569d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.15 +Version: 6.0.16 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Tue Apr 11 2023 Morten Stevens - 1:6.0.16-1 +- Update to 6.0.16 + * Tue Apr 04 2023 Morten Stevens - 1:6.0.15-1 - Update to 6.0.15 From 8cece31e8c79943d058332d3f0e82380be1cc095 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Tue, 25 Apr 2023 08:02:06 +0200 Subject: [PATCH 17/68] Update to 6.0.17 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 00fbc9d..7a6407d 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.14.tar.gz /zabbix-6.0.15.tar.gz /zabbix-6.0.16.tar.gz +/zabbix-6.0.17.tar.gz diff --git a/sources b/sources index 02dc788..8dadce8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.16.tar.gz) = 256c634fee53cdc9b898774499b6853aad3f9b27a045bac4dbed8bf1013fb478a1c5596f8db95346faf86a0350aff5623b3ac5161536cd7f3b85292a688e3360 +SHA512 (zabbix-6.0.17.tar.gz) = 3f82ffe45e6ebdb5851c06a9710671ceccf74a16c01b6fdf53297cd57a69d4221f0b80d3395fb570ac5c508aa09e42d5e497ed73e638c70b388a7c7fc4add9bc diff --git a/zabbix.spec b/zabbix.spec index 8ef569d..f1c9fbe 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.16 +Version: 6.0.17 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Tue Apr 25 2023 Morten Stevens - 1:6.0.17-1 +- Update to 6.0.17 + * Tue Apr 11 2023 Morten Stevens - 1:6.0.16-1 - Update to 6.0.16 From 48cc1bbc016178c032ad1b2c806307da3accc63a Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 15 Jun 2023 15:29:23 +0200 Subject: [PATCH 18/68] Update to 6.0.18 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7a6407d..d1e417f 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.15.tar.gz /zabbix-6.0.16.tar.gz /zabbix-6.0.17.tar.gz +/zabbix-6.0.18.tar.gz diff --git a/sources b/sources index 8dadce8..0b98243 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.17.tar.gz) = 3f82ffe45e6ebdb5851c06a9710671ceccf74a16c01b6fdf53297cd57a69d4221f0b80d3395fb570ac5c508aa09e42d5e497ed73e638c70b388a7c7fc4add9bc +SHA512 (zabbix-6.0.18.tar.gz) = 775da1d47e095c233c6fdaab0c94dd4eee356825401ac885a8f000681caccda54f0ef508bcf8cb7d1f6def0178cb0aa17b37ec15ae9db032aaaa7faec7542e3d diff --git a/zabbix.spec b/zabbix.spec index f1c9fbe..9603de6 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,11 +16,11 @@ Name: zabbix Epoch: 1 -Version: 6.0.17 +Version: 6.0.18 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure -License: GPL-2.0-or-later +License: GPLv2 URL: https://www.zabbix.com Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Thu Jun 15 2023 Morten Stevens - 1:6.0.18-1 +- Update to 6.0.18 + * Tue Apr 25 2023 Morten Stevens - 1:6.0.17-1 - Update to 6.0.17 From 61e223bea1993e4ec0f634d494bf58f45005c57a Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 6 Jul 2023 17:21:19 +0200 Subject: [PATCH 19/68] Update to 6.0.19 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d1e417f..b075dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.16.tar.gz /zabbix-6.0.17.tar.gz /zabbix-6.0.18.tar.gz +/zabbix-6.0.19.tar.gz diff --git a/sources b/sources index 0b98243..9f73b5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.18.tar.gz) = 775da1d47e095c233c6fdaab0c94dd4eee356825401ac885a8f000681caccda54f0ef508bcf8cb7d1f6def0178cb0aa17b37ec15ae9db032aaaa7faec7542e3d +SHA512 (zabbix-6.0.19.tar.gz) = 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e diff --git a/zabbix.spec b/zabbix.spec index 9603de6..6ed2d77 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.18 +Version: 6.0.19 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Thu Jul 06 2023 Morten Stevens - 1:6.0.19-1 +- Update to 6.0.19 + * Thu Jun 15 2023 Morten Stevens - 1:6.0.18-1 - Update to 6.0.18 From 5571a5909575d8193f3bd240fa311cd8c85838ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:35:49 +0000 Subject: [PATCH 20/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 6ed2d77..b226c80 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -798,6 +798,9 @@ fi %files web-pgsql %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:6.0.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 06 2023 Morten Stevens - 1:6.0.19-1 - Update to 6.0.19 From 76ee645c8080cb5de075e29f8d91e355d3614d14 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Mon, 7 Aug 2023 12:23:17 +0200 Subject: [PATCH 21/68] Update to 6.0.20 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 13 ++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b075dbd..2511c12 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.17.tar.gz /zabbix-6.0.18.tar.gz /zabbix-6.0.19.tar.gz +/zabbix-6.0.20.tar.gz diff --git a/sources b/sources index 9f73b5d..dae22c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.19.tar.gz) = 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e +SHA512 (zabbix-6.0.20.tar.gz) = 8f4fa955eb20ba4c4539bb3b6744c942e89db61dc50c998e61c4cf065cf07fddddfacce3992b8402851dc2f55e41fbff40e814d86b8c4ed9802931b8fe4a172b diff --git a/zabbix.spec b/zabbix.spec index b226c80..49843a9 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.19 -Release: 2%{?dist} +Version: 6.0.20 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -324,11 +324,7 @@ Custom SELinux policy module %prep -%setup0 -q -n %{srcname}-%{version}%{?prerelease:.%{prerelease}} -%patch0 -p1 -b .config -%patch1 -p1 -b .out-of-tree -%patch2 -p1 -b .crypto-policy -%patch3 -p1 -b .configure-sscanf +%autosetup -p1 autoreconf # Remove bundled java libs @@ -798,6 +794,9 @@ fi %files web-pgsql %changelog +* Mon Aug 07 2023 Morten Stevens - 1:6.0.20-1 +- Update to 6.0.20 + * Sat Jul 22 2023 Fedora Release Engineering - 1:6.0.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 43e1780e364af8d4b8b2bec9c03eb946b5e06c92 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Thu, 5 Oct 2023 00:14:32 +0200 Subject: [PATCH 22/68] Update to 6.0.22 --- .gitignore | 1 + sources | 2 +- zabbix-configure-sscanf.patch | 7 ++++--- zabbix-out-of-tree.patch | 10 +++++----- zabbix.spec | 5 ++++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 2511c12..9cebab7 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.18.tar.gz /zabbix-6.0.19.tar.gz /zabbix-6.0.20.tar.gz +/zabbix-6.0.22.tar.gz diff --git a/sources b/sources index dae22c4..6c0aeb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.20.tar.gz) = 8f4fa955eb20ba4c4539bb3b6744c942e89db61dc50c998e61c4cf065cf07fddddfacce3992b8402851dc2f55e41fbff40e814d86b8c4ed9802931b8fe4a172b +SHA512 (zabbix-6.0.22.tar.gz) = d26903d6272e22dd960d3bac5d93857de09a9f64a91e542a43fe1169ed1a7d7fbcf69975d152a227028ebbeb250cd0dd96501d15cbd7c8f7bdd7222a0b97a2a2 diff --git a/zabbix-configure-sscanf.patch b/zabbix-configure-sscanf.patch index a872ff5..8117635 100644 --- a/zabbix-configure-sscanf.patch +++ b/zabbix-configure-sscanf.patch @@ -6,11 +6,12 @@ diff --git a/configure.ac b/configure.ac index 0588004f9f89cdd5..bbc60e3a28369f9f 100644 --- a/configure.ac +++ b/configure.ac -@@ -1087,6 +1087,7 @@ AC_MSG_CHECKING(for long long format) - AC_TRY_RUN( - [ +@@ -952,6 +952,7 @@ dnl FreeBSD 4.x does not support %llu + AC_MSG_CHECKING(for long long format) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include +#include int main() { uint64_t i; + diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 9bfabaa..406ed88 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,6 +1,6 @@ -diff -up zabbix-6.0.13/src/go/Makefile.am.out-of-tree zabbix-6.0.13/src/go/Makefile.am ---- zabbix-6.0.13/src/go/Makefile.am.out-of-tree 2023-02-01 00:19:54.520718582 -0700 -+++ zabbix-6.0.13/src/go/Makefile.am 2023-02-16 12:12:40.691876329 -0700 +diff -up zabbix-6.0.22/src/go/Makefile.am.out-of-tree zabbix-6.0.22/src/go/Makefile.am +--- zabbix-6.0.22/src/go/Makefile.am.out-of-tree 2023-09-25 12:26:42.751167618 +0200 ++++ zabbix-6.0.22/src/go/Makefile.am 2023-10-04 23:38:09.904981417 +0200 @@ -57,15 +57,15 @@ zabbix.com/cmd/zabbix_web_service: build: ${TARGETS} @@ -20,8 +20,8 @@ diff -up zabbix-6.0.13/src/go/Makefile.am.out-of-tree zabbix-6.0.13/src/go/Makef test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ done -@@ -76,7 +76,7 @@ install-zabbix.com/cmd/zabbix_web_servic - install-exec-local: ${INSTALL_TARGETS} +@@ -90,7 +90,7 @@ sbom.xml: + sbom: sbom.json check: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... diff --git a/zabbix.spec b/zabbix.spec index 49843a9..fe4fe99 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.20 +Version: 6.0.22 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Wed Oct 04 2023 Morten Stevens - 1:6.0.22-1 +- Update to 6.0.22 + * Mon Aug 07 2023 Morten Stevens - 1:6.0.20-1 - Update to 6.0.20 From 94fa5ca481637dacb111b82dbedaa05c6fb38b90 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 28 Oct 2023 15:46:21 -0600 Subject: [PATCH 23/68] Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) --- zabbix.spec | 5 ++++- zabbix.te | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index fe4fe99..0952f31 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Sat Oct 28 2023 Orion Poplawski - 1:6.0.22-2 +- Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) + * Wed Oct 04 2023 Morten Stevens - 1:6.0.22-1 - Update to 6.0.22 diff --git a/zabbix.te b/zabbix.te index a456bd5..f6de1bc 100644 --- a/zabbix.te +++ b/zabbix.te @@ -1,4 +1,4 @@ -policy_module(zabbix, 1.6.0) +policy_module(zabbix, 1.6.1) ######################################## # @@ -302,6 +302,14 @@ tunable_policy(`zabbix_run_sudo',` xserver_exec_xauth(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) + optional_policy(` rpm_exec(zabbix_agent_t) rpm_read_db(zabbix_agent_t) From f7d2d5eae69125e185b2196ea51e599aa978e91e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 1 Dec 2023 15:50:56 -0600 Subject: [PATCH 24/68] Patch for libxml2 2.12.x --- ZBX-23738-6.0.patch | 218 ++++++++++++++++++++++++++++++++++++++++++++ zabbix.spec | 6 +- 2 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 ZBX-23738-6.0.patch diff --git a/ZBX-23738-6.0.patch b/ZBX-23738-6.0.patch new file mode 100644 index 0000000..8ea5bf1 --- /dev/null +++ b/ZBX-23738-6.0.patch @@ -0,0 +1,218 @@ +diff --git a/ChangeLog.d/bugfix/ZBX-23738 b/ChangeLog.d/bugfix/ZBX-23738 +new file mode 100644 +index 0000000..f7c7dd5 +--- /dev/null ++++ b/ChangeLog.d/bugfix/ZBX-23738 +@@ -0,0 +1 @@ ++.......PS. [ZBX-23738] fixed Zabbix backend sources for libxml2 2.12.0 version changes (akozlovs) +diff --git a/m4/libxml2.m4 b/m4/libxml2.m4 +index ddb444e..7449f97 100644 +--- a/m4/libxml2.m4 ++++ b/m4/libxml2.m4 +@@ -29,10 +29,13 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa + [ + if test "$withval" = "no"; then + want_libxml2="no" ++ _libxml2_with="no" + elif test "$withval" = "yes"; then + want_libxml2="yes" ++ _libxml2_with="yes" + else + want_libxml2="yes" ++ _libxml2_with=$withval + fi + ], + [want_libxml2="no"] +@@ -48,27 +51,43 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa + dnl + + if test "$want_libxml2" = "yes"; then +- AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +- m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG()], [:]) ++ if test "$_libxml2_with" != "yes"; then ++ XML2_INCDIR=$_libxml2_with/include ++ XML2_LIBDIR=$_libxml2_with/lib ++ LIBXML2_CFLAGS="-I$XML2_INCDIR" ++ LIBXML2_LDFLAGS="-L$XML2_LIBDIR" ++ _full_libxml2_libs=$LIBXML2_LDFLAGS ++ configured_libxml2="yes" ++ else ++ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG()], [:]) ++ ++ if test -x "$PKG_CONFIG"; then + +- if test -x "$PKG_CONFIG"; then ++ LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" + +- LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" ++ _full_libxml2_libs="`$PKG_CONFIG --libs libxml-2.0`" ++ ++ for i in $_full_libxml2_libs; do ++ case $i in ++ -lxml2) ++ ;; ++ -L*) ++ LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} $i" ++ ;; ++ -R*) ++ LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} -Wl,$i" ++ ;; ++ esac ++ done + +- _full_libxml2_libs="`$PKG_CONFIG --libs libxml-2.0`" ++ configured_libxml2="yes" ++ else ++ configured_libxml2="no" ++ fi ++ fi + +- for i in $_full_libxml2_libs; do +- case $i in +- -lxml2) +- ;; +- -L*) +- LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} $i" +- ;; +- -R*) +- LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} -Wl,$i" +- ;; +- esac +- done ++ if test "$configured_libxml2" = "yes"; then + + if test "x$enable_static" = "xyes"; then + for i in $_full_libxml2_libs; do +@@ -87,6 +106,20 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa + done + fi + ++ if test "$_libxml2_with" != "yes"; then ++ if test -f $_libxml2_with/include/libxml2/libxml/xmlversion.h; then ++ LIBXML2_VERSION=`cat $_libxml2_with/include/libxml2/libxml/xmlversion.h \ ++ | grep '#define.*LIBXML_DOTTED_VERSION.*' \ ++ | sed -e 's/#define LIBXML_DOTTED_VERSION *//' \ ++ | sed -e 's/ *\/\*.*\*\///' \ ++ | sed -e 's/\"//g'` ++ else ++ AC_MSG_ERROR([Not found libxml2 library]) ++ fi ++ else ++ LIBXML2_VERSION=`$PKG_CONFIG --version libxml-2.0` ++ fi ++ + _save_libxml2_libs="${LIBS}" + _save_libxml2_ldflags="${LDFLAGS}" + _save_libxml2_cflags="${CFLAGS}" +@@ -95,7 +128,7 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa + CFLAGS="${CFLAGS} ${LIBXML2_CFLAGS}" + + AC_CHECK_LIB(xml2, xmlReadMemory, [ +- LIBXML2_LIBS="-lxml2 ${LIBXML2_LIBS}" ++ LIBXML2_LIBS="${LIBXML2_LIBS} -lxml2" + ],[ + AC_MSG_ERROR([Not found libxml2 library]) + ]) +@@ -107,8 +140,6 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa + unset _save_libxml2_ldflags + unset _save_libxml2_cflags + +- LIBXML2_VERSION=`$PKG_CONFIG --version libxml-2.0` +- + AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if libxml2 libraries are available]) + + found_libxml2="yes" +diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c +index 027735d..2058b0f 100644 +--- a/src/libs/zbxserver/expression.c ++++ b/src/libs/zbxserver/expression.c +@@ -6580,7 +6580,11 @@ exit: + * err - [IN] the libxml2 error message * + * * + ******************************************************************************/ ++#if 21200 > LIBXML_VERSION /* version 2.12.0 */ + static void libxml_handle_error(void *user_data, xmlErrorPtr err) ++#else ++static void libxml_handle_error(void *user_data, const xmlError *err) ++#endif + { + zbx_libxml_error_t *err_ctx; + +diff --git a/src/libs/zbxxml/xml.c b/src/libs/zbxxml/xml.c +index 82928e8..e5b3a56 100644 +--- a/src/libs/zbxxml/xml.c ++++ b/src/libs/zbxxml/xml.c +@@ -24,6 +24,7 @@ + + #ifdef HAVE_LIBXML2 + # include ++# include + #endif + + #include "../zbxalgo/vectorimpl.h" +@@ -234,7 +235,7 @@ int zbx_query_xpath(zbx_variant_t *value, const char *params, char **errmsg) + xmlXPathContext *xpathCtx; + xmlXPathObject *xpathObj; + xmlNodeSetPtr nodeset; +- xmlErrorPtr pErr; ++ const xmlError *pErr; + xmlBufferPtr xmlBufferLocal; + + if (NULL == (doc = xmlReadMemory(value->data.str, strlen(value->data.str), "noname.xml", NULL, 0))) +@@ -583,7 +584,7 @@ static void vector_to_json(zbx_vector_xml_node_ptr_t *nodes, struct zbx_json *js + ******************************************************************************/ + int zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void **root_node, char **errmsg) + { +- xmlErrorPtr pErr; ++ const xmlError *pErr; + + if (NULL == (*xml_doc = xmlReadMemory(data, strlen(data), "noname.xml", NULL, options))) + { +@@ -639,7 +640,7 @@ int zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void ** + ******************************************************************************/ + int zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg) + { +- xmlErrorPtr pErr; ++ const xmlError *pErr; + + if (NULL == mem) + { +@@ -894,7 +895,7 @@ int zbx_json_to_xml(char *json_data, char **xstr, char **errmsg) + int size, ret = FAIL; + struct zbx_json_parse jp; + xmlDoc *doc = NULL; +- xmlErrorPtr pErr; ++ const xmlError *pErr; + xmlChar *xmem; + + if (NULL == (doc = xmlNewDoc(BAD_CAST XML_DEFAULT_VERSION))) +diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c +index bd46f3a..f253651 100644 +--- a/src/zabbix_server/preprocessor/item_preproc.c ++++ b/src/zabbix_server/preprocessor/item_preproc.c +@@ -1224,7 +1224,7 @@ static int item_preproc_get_error_from_xml(const zbx_variant_t *value, const cha + xmlDoc *doc = NULL; + xmlXPathContext *xpathCtx = NULL; + xmlXPathObject *xpathObj = NULL; +- xmlErrorPtr pErr; ++ const xmlError *pErr; + xmlBufferPtr xmlBufferLocal; + + zbx_variant_copy(&value_str, value); +diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c +index 5b5cedc..0ff7a34 100644 +--- a/src/zabbix_server/vmware/vmware.c ++++ b/src/zabbix_server/vmware/vmware.c +@@ -7054,7 +7054,11 @@ int zbx_vmware_get_statistics(zbx_vmware_stats_t *stats) + * err - [IN] the libxml2 error message * + * * + ******************************************************************************/ ++#if 21200 > LIBXML_VERSION /* version 2.12.0 */ + static void libxml_handle_error(void *user_data, xmlErrorPtr err) ++#else ++static void libxml_handle_error(void *user_data, const xmlError *err) ++#endif + { + ZBX_UNUSED(user_data); + ZBX_UNUSED(err); diff --git a/zabbix.spec b/zabbix.spec index 0952f31..a97cc5a 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -50,6 +50,7 @@ Patch1: %{srcname}-out-of-tree.patch # Enforce Fedora Crypto Policy Patch2: %{srcname}-crypto-policy.patch Patch3: %{srcname}-configure-sscanf.patch +Patch4: ZBX-23738-6.0.patch # Patch1 patches automake files so we need to autoreconf BuildRequires: libtool @@ -794,6 +795,9 @@ fi %files web-pgsql %changelog +* Fri Dec 01 2023 Gwyn Ciesla - 1:6.0.22-3 +- Patch for libxml2 2.12.x + * Sat Oct 28 2023 Orion Poplawski - 1:6.0.22-2 - Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) From 2e759bc2081536ac5628e5b5ec5b002c566c3322 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Jan 2024 16:37:48 -0700 Subject: [PATCH 25/68] Update to 6.0.25 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9cebab7..cf57584 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.19.tar.gz /zabbix-6.0.20.tar.gz /zabbix-6.0.22.tar.gz +/zabbix-6.0.25.tar.gz diff --git a/sources b/sources index 6c0aeb7..a6417f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.22.tar.gz) = d26903d6272e22dd960d3bac5d93857de09a9f64a91e542a43fe1169ed1a7d7fbcf69975d152a227028ebbeb250cd0dd96501d15cbd7c8f7bdd7222a0b97a2a2 +SHA512 (zabbix-6.0.25.tar.gz) = 0be1ce76754788e05ff73a02f370c2b6b4bc2f69a463a47304ac9504a8cd9da2697c54d897a95b39841ceb38ded0c985f4772e453a393526aca6475c78eb7a1e diff --git a/zabbix.spec b/zabbix.spec index a97cc5a..b7a7663 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.22 -Release: 3%{?dist} +Version: 6.0.25 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -795,6 +795,9 @@ fi %files web-pgsql %changelog +* Thu Jan 04 2024 Orion Poplawski - 1:6.0.25-1 +- Update to 6.0.25 + * Fri Dec 01 2023 Gwyn Ciesla - 1:6.0.22-3 - Patch for libxml2 2.12.x From e1c0851c37f93dcd6a1e6f30aa3b481c78861623 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Jan 2024 16:39:36 -0700 Subject: [PATCH 26/68] Update zabbix-out-of-tree.patch --- zabbix-out-of-tree.patch | 621 ++++++++++++++++++++------------------- 1 file changed, 311 insertions(+), 310 deletions(-) diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 406ed88..cd7012c 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,15 +1,16 @@ -diff -up zabbix-6.0.22/src/go/Makefile.am.out-of-tree zabbix-6.0.22/src/go/Makefile.am ---- zabbix-6.0.22/src/go/Makefile.am.out-of-tree 2023-09-25 12:26:42.751167618 +0200 -+++ zabbix-6.0.22/src/go/Makefile.am 2023-10-04 23:38:09.904981417 +0200 -@@ -57,15 +57,15 @@ zabbix.com/cmd/zabbix_web_service: - build: ${TARGETS} +diff -up zabbix-6.0.25/src/go/Makefile.am.out-of-tree zabbix-6.0.25/src/go/Makefile.am +--- zabbix-6.0.25/src/go/Makefile.am.out-of-tree 2024-01-04 13:32:00.055044909 -0700 ++++ zabbix-6.0.25/src/go/Makefile.am 2024-01-04 13:37:56.640412586 -0700 +@@ -59,7 +59,7 @@ build: ${TARGETS} + clean: clean-go-build clean-sbom - clean: -- go clean ./... -+ go clean $(srcdir)/... - rm -f bin/zabbix_agent2 bin/mock_server - - install-zabbix.com/cmd/zabbix_agent2: + clean-go-build: +- -go clean ./... ++ -go clean $(srcdir)/... + -rm -f bin/mock_server + -rm -f bin/zabbix_agent2 + -rm -f bin/zabbix_web_service +@@ -76,8 +76,8 @@ install-zabbix.com/cmd/zabbix_agent2: CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" @@ -20,8 +21,8 @@ diff -up zabbix-6.0.22/src/go/Makefile.am.out-of-tree zabbix-6.0.22/src/go/Makef test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ done -@@ -90,7 +90,7 @@ sbom.xml: - sbom: sbom.json +@@ -151,7 +151,7 @@ sbom-mod: sbom-mod.json + sbom: sbom-apps sbom-mod check: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... @@ -29,9 +30,9 @@ diff -up zabbix-6.0.22/src/go/Makefile.am.out-of-tree zabbix-6.0.22/src/go/Makef style: CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... format: -diff -up zabbix-6.0.13/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.13/src/libs/zbxalgo/Makefile.am.out-of-tree 2023-02-01 00:19:54.536718733 -0700 -+++ zabbix-6.0.13/src/libs/zbxalgo/Makefile.am 2023-02-16 12:12:40.692876324 -0700 +diff -up zabbix-6.0.25/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxalgo/Makefile.am +--- zabbix-6.0.25/src/libs/zbxalgo/Makefile.am.out-of-tree 2023-12-13 01:17:33.180166583 -0700 ++++ zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-04 13:32:00.057044900 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -40,9 +41,9 @@ diff -up zabbix-6.0.13/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxalgo.a if SERVER -diff -up zabbix-6.0.13/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.13/src/libs/zbxaudit/Makefile.am.out-of-tree 2023-02-01 00:19:54.540718773 -0700 -+++ zabbix-6.0.13/src/libs/zbxaudit/Makefile.am 2023-02-16 12:12:40.693876319 -0700 +diff -up zabbix-6.0.25/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxaudit/Makefile.am +--- zabbix-6.0.25/src/libs/zbxaudit/Makefile.am.out-of-tree 2023-12-13 01:17:33.184166606 -0700 ++++ zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-04 13:32:00.058044895 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -51,9 +52,9 @@ diff -up zabbix-6.0.13/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.13/s noinst_LIBRARIES = libzbxaudit.a libzbxaudit_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.13/src/libs/zbxavailability/Makefile.am.out-of-tree 2023-02-01 00:19:54.544718811 -0700 -+++ zabbix-6.0.13/src/libs/zbxavailability/Makefile.am 2023-02-16 12:12:40.694876314 -0700 +diff -up zabbix-6.0.25/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxavailability/Makefile.am +--- zabbix-6.0.25/src/libs/zbxavailability/Makefile.am.out-of-tree 2023-12-13 01:17:33.184166606 -0700 ++++ zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-04 13:32:00.059044890 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -62,9 +63,9 @@ diff -up zabbix-6.0.13/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxavailability.a libzbxavailability_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.13/src/libs/zbxcommon/Makefile.am.out-of-tree 2023-02-01 00:19:54.544718811 -0700 -+++ zabbix-6.0.13/src/libs/zbxcommon/Makefile.am 2023-02-16 12:12:40.695876310 -0700 +diff -up zabbix-6.0.25/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcommon/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcommon/Makefile.am.out-of-tree 2023-12-13 01:17:33.188166628 -0700 ++++ zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-04 13:32:00.061044881 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -73,9 +74,9 @@ diff -up zabbix-6.0.13/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.13/ noinst_LIBRARIES = libzbxcommon.a libzbxcommon_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2023-01-30 00:22:04.944328308 -0700 -+++ zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am 2023-02-16 12:12:40.697876300 -0700 +diff -up zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 ++++ zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-04 13:32:00.062044877 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -84,9 +85,9 @@ diff -up zabbix-6.0.13/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxcommshigh.a libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.13/src/libs/zbxcomms/Makefile.am.out-of-tree 2023-01-30 00:22:04.944328308 -0700 -+++ zabbix-6.0.13/src/libs/zbxcomms/Makefile.am 2023-02-16 12:12:40.698876295 -0700 +diff -up zabbix-6.0.25/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcomms/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcomms/Makefile.am.out-of-tree 2023-12-13 01:17:33.188166628 -0700 ++++ zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-04 13:32:00.063044872 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -95,9 +96,9 @@ diff -up zabbix-6.0.13/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.13/s noinst_LIBRARIES = libzbxcomms.a libzbxcomms_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.13/src/libs/zbxcompress/Makefile.am.out-of-tree 2023-01-23 01:33:45.931502136 -0700 -+++ zabbix-6.0.13/src/libs/zbxcompress/Makefile.am 2023-02-16 12:12:40.699876291 -0700 +diff -up zabbix-6.0.25/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcompress/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcompress/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 ++++ zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-04 13:32:00.063044872 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -106,9 +107,9 @@ diff -up zabbix-6.0.13/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.1 noinst_LIBRARIES = libzbxcompress.a libzbxcompress_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.13/src/libs/zbxconf/Makefile.am.out-of-tree 2023-01-23 01:33:45.931502136 -0700 -+++ zabbix-6.0.13/src/libs/zbxconf/Makefile.am 2023-02-16 12:12:40.699876291 -0700 +diff -up zabbix-6.0.25/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxconf/Makefile.am +--- zabbix-6.0.25/src/libs/zbxconf/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 ++++ zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-04 13:32:00.064044867 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -117,9 +118,9 @@ diff -up zabbix-6.0.13/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxconf.a libzbxconf_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am.out-of-tree 2023-02-01 00:19:54.552718885 -0700 -+++ zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am 2023-02-16 12:12:40.700876286 -0700 +diff -up zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 ++++ zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-04 13:32:00.065044863 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -128,9 +129,9 @@ diff -up zabbix-6.0.13/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.13/ noinst_LIBRARIES = libzbxcrypto.a libzbxcrypto_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am.out-of-tree 2023-01-30 00:22:04.948328337 -0700 -+++ zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am 2023-02-16 12:12:40.701876281 -0700 +diff -up zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 ++++ zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-04 13:32:00.065044863 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -139,9 +140,9 @@ diff -up zabbix-6.0.13/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.13 noinst_LIBRARIES = libzbxdbcache.a libzbxdbcache_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2023-02-01 00:19:54.568719037 -0700 -+++ zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am 2023-02-16 12:12:40.702876276 -0700 +diff -up zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2023-12-13 01:17:33.200166696 -0700 ++++ zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-04 13:32:00.066044858 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -150,9 +151,9 @@ diff -up zabbix-6.0.13/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.13/ 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.13/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.13/src/libs/zbxdb/Makefile.am.out-of-tree 2023-01-23 01:33:45.931502136 -0700 -+++ zabbix-6.0.13/src/libs/zbxdb/Makefile.am 2023-02-16 12:12:40.703876272 -0700 +diff -up zabbix-6.0.25/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdb/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdb/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 ++++ zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-04 13:32:00.066044858 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -161,9 +162,9 @@ diff -up zabbix-6.0.13/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.13/src/ noinst_LIBRARIES = libzbxdb.a libzbxdb_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2023-02-01 00:19:54.572719076 -0700 -+++ zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am 2023-02-16 12:12:40.704876267 -0700 +diff -up zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2023-12-13 01:17:33.204166719 -0700 ++++ zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-04 13:32:00.067044854 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -172,9 +173,9 @@ diff -up zabbix-6.0.13/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxdbupgrade.a libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.13/src/libs/zbxdiag/Makefile.am.out-of-tree 2023-01-30 00:22:04.964328451 -0700 -+++ zabbix-6.0.13/src/libs/zbxdiag/Makefile.am 2023-02-16 12:12:40.704876267 -0700 +diff -up zabbix-6.0.25/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdiag/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdiag/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 ++++ zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-04 13:32:00.068044849 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -183,9 +184,9 @@ diff -up zabbix-6.0.13/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.13/src/libs/zbxembed/Makefile.am.out-of-tree 2023-02-01 00:19:54.580719152 -0700 -+++ zabbix-6.0.13/src/libs/zbxembed/Makefile.am 2023-02-16 12:12:40.705876262 -0700 +diff -up zabbix-6.0.25/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxembed/Makefile.am +--- zabbix-6.0.25/src/libs/zbxembed/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 ++++ zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-04 13:32:00.068044849 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -194,9 +195,9 @@ diff -up zabbix-6.0.13/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.13/s noinst_LIBRARIES = libzbxembed.a libzbxembed_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.13/src/libs/zbxeval/Makefile.am.out-of-tree 2023-02-01 00:19:54.596719303 -0700 -+++ zabbix-6.0.13/src/libs/zbxeval/Makefile.am 2023-02-16 12:12:40.706876257 -0700 +diff -up zabbix-6.0.25/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxeval/Makefile.am +--- zabbix-6.0.25/src/libs/zbxeval/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 ++++ zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-04 13:32:00.069044844 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -205,9 +206,9 @@ diff -up zabbix-6.0.13/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxeval.a libzbxeval_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.13/src/libs/zbxexec/Makefile.am.out-of-tree 2023-01-23 01:33:45.959502505 -0700 -+++ zabbix-6.0.13/src/libs/zbxexec/Makefile.am 2023-02-16 12:12:40.706876257 -0700 +diff -up zabbix-6.0.25/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxexec/Makefile.am +--- zabbix-6.0.25/src/libs/zbxexec/Makefile.am.out-of-tree 2023-12-13 01:17:17.040075318 -0700 ++++ zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-04 13:32:00.070044840 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -216,9 +217,9 @@ diff -up zabbix-6.0.13/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxexec.a libzbxexec_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxha/Makefile.am ---- zabbix-6.0.13/src/libs/zbxha/Makefile.am.out-of-tree 2023-02-01 00:19:54.596719303 -0700 -+++ zabbix-6.0.13/src/libs/zbxha/Makefile.am 2023-02-16 12:12:40.707876252 -0700 +diff -up zabbix-6.0.25/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxha/Makefile.am +--- zabbix-6.0.25/src/libs/zbxha/Makefile.am.out-of-tree 2023-12-13 01:17:29.108143557 -0700 ++++ zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-04 13:32:00.071044835 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -227,9 +228,9 @@ diff -up zabbix-6.0.13/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.13/src/ noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.13/src/libs/zbxhistory/Makefile.am.out-of-tree 2023-01-23 01:33:45.959502505 -0700 -+++ zabbix-6.0.13/src/libs/zbxhistory/Makefile.am 2023-02-16 12:12:40.708876248 -0700 +diff -up zabbix-6.0.25/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxhistory/Makefile.am +--- zabbix-6.0.25/src/libs/zbxhistory/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 ++++ zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-04 13:32:00.072044830 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -238,9 +239,9 @@ diff -up zabbix-6.0.13/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.13 noinst_LIBRARIES = libzbxhistory.a libzbxhistory_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.13/src/libs/zbxhttp/Makefile.am.out-of-tree 2023-01-30 00:22:04.976328534 -0700 -+++ zabbix-6.0.13/src/libs/zbxhttp/Makefile.am 2023-02-16 12:12:40.709876243 -0700 +diff -up zabbix-6.0.25/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxhttp/Makefile.am +--- zabbix-6.0.25/src/libs/zbxhttp/Makefile.am.out-of-tree 2023-12-13 01:17:17.044075341 -0700 ++++ zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-04 13:32:00.073044826 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -249,9 +250,9 @@ diff -up zabbix-6.0.13/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxhttp.a libzbxhttp_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am.out-of-tree 2023-01-30 00:22:04.976328534 -0700 -+++ zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am 2023-02-16 12:12:40.710876238 -0700 +diff -up zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am +--- zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 ++++ zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-04 13:32:00.074044821 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -260,9 +261,9 @@ diff -up zabbix-6.0.13/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.1 noinst_LIBRARIES = libzbxicmpping.a libzbxicmpping_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am.out-of-tree 2023-01-27 02:18:53.018143449 -0700 -+++ zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am 2023-02-16 12:12:40.711876234 -0700 +diff -up zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am +--- zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 ++++ zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-04 13:32:00.075044817 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -271,9 +272,9 @@ diff -up zabbix-6.0.13/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libzbxipcservice.a libzbxipcservice_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.13/src/libs/zbxjson/Makefile.am.out-of-tree 2023-02-01 00:19:54.600719342 -0700 -+++ zabbix-6.0.13/src/libs/zbxjson/Makefile.am 2023-02-16 12:12:40.712876229 -0700 +diff -up zabbix-6.0.25/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxjson/Makefile.am +--- zabbix-6.0.25/src/libs/zbxjson/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 ++++ zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-04 13:32:00.076044812 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -282,9 +283,9 @@ diff -up zabbix-6.0.13/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxjson.a libzbxjson_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.13/src/libs/zbxlog/Makefile.am.out-of-tree 2023-01-23 01:33:45.963502558 -0700 -+++ zabbix-6.0.13/src/libs/zbxlog/Makefile.am 2023-02-16 12:12:40.712876229 -0700 +diff -up zabbix-6.0.25/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxlog/Makefile.am +--- zabbix-6.0.25/src/libs/zbxlog/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 ++++ zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-04 13:32:00.077044807 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -293,9 +294,9 @@ diff -up zabbix-6.0.13/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.13/src noinst_LIBRARIES = libzbxlog.a libzbxlog_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.13/src/libs/zbxmedia/Makefile.am.out-of-tree 2023-01-30 00:22:04.980328562 -0700 -+++ zabbix-6.0.13/src/libs/zbxmedia/Makefile.am 2023-02-16 12:12:40.713876224 -0700 +diff -up zabbix-6.0.25/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmedia/Makefile.am +--- zabbix-6.0.25/src/libs/zbxmedia/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 ++++ zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-04 13:32:00.078044803 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -304,9 +305,9 @@ diff -up zabbix-6.0.13/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.13/s noinst_LIBRARIES = libzbxmedia.a libzbxmedia_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.13/src/libs/zbxmemory/Makefile.am.out-of-tree 2023-01-30 00:22:04.980328562 -0700 -+++ zabbix-6.0.13/src/libs/zbxmemory/Makefile.am 2023-02-16 12:12:40.714876219 -0700 +diff -up zabbix-6.0.25/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmemory/Makefile.am +--- zabbix-6.0.25/src/libs/zbxmemory/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 ++++ zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-04 13:32:00.079044798 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -315,9 +316,9 @@ diff -up zabbix-6.0.13/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.13/ noinst_LIBRARIES = libzbxmemory.a libzbxmemory_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.13/src/libs/zbxmodules/Makefile.am.out-of-tree 2023-01-23 01:33:45.963502558 -0700 -+++ zabbix-6.0.13/src/libs/zbxmodules/Makefile.am 2023-02-16 12:12:40.715876214 -0700 +diff -up zabbix-6.0.25/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmodules/Makefile.am +--- zabbix-6.0.25/src/libs/zbxmodules/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 ++++ zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-04 13:32:00.082044784 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -326,9 +327,9 @@ diff -up zabbix-6.0.13/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.13 noinst_LIBRARIES = libzbxmodules.a libzbxmodules_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.13/src/libs/zbxnix/Makefile.am.out-of-tree 2023-01-30 00:22:04.980328562 -0700 -+++ zabbix-6.0.13/src/libs/zbxnix/Makefile.am 2023-02-16 12:12:40.716876210 -0700 +diff -up zabbix-6.0.25/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxnix/Makefile.am +--- zabbix-6.0.25/src/libs/zbxnix/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 ++++ zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-04 13:32:00.083044780 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -337,9 +338,9 @@ diff -up zabbix-6.0.13/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.13/src noinst_LIBRARIES = libzbxnix.a libzbxnix_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxprof/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxprof/Makefile.am ---- zabbix-6.0.13/src/libs/zbxprof/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 -+++ zabbix-6.0.13/src/libs/zbxprof/Makefile.am 2023-02-16 12:15:46.024983315 -0700 +diff -up zabbix-6.0.25/src/libs/zbxprof/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxprof/Makefile.am +--- zabbix-6.0.25/src/libs/zbxprof/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 ++++ zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-04 13:32:00.083044780 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -348,9 +349,9 @@ diff -up zabbix-6.0.13/src/libs/zbxprof/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxprof.a libzbxprof_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am.out-of-tree 2023-01-23 01:33:45.963502558 -0700 -+++ zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am 2023-02-16 12:12:40.717876205 -0700 +diff -up zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am +--- zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 ++++ zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-04 13:32:00.084044775 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -359,9 +360,9 @@ diff -up zabbix-6.0.13/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libzbxprometheus.a libzbxprometheus_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.13/src/libs/zbxregexp/Makefile.am.out-of-tree 2023-01-23 01:33:45.967502610 -0700 -+++ zabbix-6.0.13/src/libs/zbxregexp/Makefile.am 2023-02-16 12:12:40.717876205 -0700 +diff -up zabbix-6.0.25/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxregexp/Makefile.am +--- zabbix-6.0.25/src/libs/zbxregexp/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 ++++ zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-04 13:32:00.085044770 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -370,9 +371,9 @@ diff -up zabbix-6.0.13/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.13/ noinst_LIBRARIES = libzbxregexp.a libzbxregexp_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.13/src/libs/zbxrtc/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 -+++ zabbix-6.0.13/src/libs/zbxrtc/Makefile.am 2023-02-16 12:12:40.718876200 -0700 +diff -up zabbix-6.0.25/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxrtc/Makefile.am +--- zabbix-6.0.25/src/libs/zbxrtc/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 ++++ zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-04 13:32:00.085044770 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -381,9 +382,9 @@ diff -up zabbix-6.0.13/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.13/src noinst_LIBRARIES = \ libzbxrtc.a \ libzbxrtc_service.a \ -diff -up zabbix-6.0.13/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxself/Makefile.am ---- zabbix-6.0.13/src/libs/zbxself/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 -+++ zabbix-6.0.13/src/libs/zbxself/Makefile.am 2023-02-16 12:12:40.719876196 -0700 +diff -up zabbix-6.0.25/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxself/Makefile.am +--- zabbix-6.0.25/src/libs/zbxself/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 ++++ zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-04 13:32:00.086044766 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -392,9 +393,9 @@ diff -up zabbix-6.0.13/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.13/sr noinst_LIBRARIES = libzbxself.a libzbxself_server.a libzbxself_proxy.a libzbxself_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.13/src/libs/zbxserver/Makefile.am.out-of-tree 2023-02-01 00:19:54.604719380 -0700 -+++ zabbix-6.0.13/src/libs/zbxserver/Makefile.am 2023-02-16 12:12:40.720876191 -0700 +diff -up zabbix-6.0.25/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxserver/Makefile.am +--- zabbix-6.0.25/src/libs/zbxserver/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 ++++ zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-04 13:32:00.087044761 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -403,9 +404,9 @@ diff -up zabbix-6.0.13/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.13/ noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a libzbxserver_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.13/src/libs/zbxservice/Makefile.am.out-of-tree 2023-02-01 00:19:54.608719418 -0700 -+++ zabbix-6.0.13/src/libs/zbxservice/Makefile.am 2023-02-16 12:12:40.721876186 -0700 +diff -up zabbix-6.0.25/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxservice/Makefile.am +--- zabbix-6.0.25/src/libs/zbxservice/Makefile.am.out-of-tree 2023-12-13 01:17:17.056075408 -0700 ++++ zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-04 13:32:00.087044761 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -414,9 +415,9 @@ diff -up zabbix-6.0.13/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.13 noinst_LIBRARIES = libzbxservice.a libzbxservice_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2023-02-01 00:19:54.608719418 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am 2023-02-16 12:12:40.722876181 -0700 +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2023-12-13 01:17:29.120143625 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-04 13:32:00.088044757 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -425,20 +426,20 @@ diff -up zabbix-6.0.13/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libagentsysinfo.a libagentsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2023-01-23 01:33:45.967502610 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/aix/Makefile.am 2023-02-16 12:12:40.723876176 -0700 +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2024-01-04 13:32:00.089044752 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-04 13:34:08.285453006 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2023-02-01 00:19:54.612719455 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am 2023-02-16 12:12:40.723876176 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-04 13:32:00.090044747 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -447,42 +448,42 @@ diff -up zabbix-6.0.13/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2023-01-23 01:33:45.971502662 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/freebsd/Makefile.am 2023-02-16 12:12:40.724876172 -0700 +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.091044743 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-04 13:35:35.946050650 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2023-01-23 01:33:45.971502662 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/hpux/Makefile.am 2023-02-16 12:12:40.725876167 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2024-01-04 13:32:00.093044733 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-04 13:36:03.172925688 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2023-01-30 00:22:04.992328648 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/linux/Makefile.am 2023-02-16 12:12:40.726876162 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2024-01-04 13:32:00.095044724 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-04 13:34:22.857386127 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2023-01-30 00:22:04.988328619 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am 2023-02-16 12:12:40.727876157 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-04 13:32:00.097044715 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -491,53 +492,53 @@ diff -up zabbix-6.0.13/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.13 DIST_SUBDIRS = \ agent \ common \ -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/netbsd/Makefile.am 2023-02-16 12:12:40.728876152 -0700 +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.098044710 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-04 13:34:53.065247481 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/openbsd/Makefile.am 2023-02-16 12:12:40.728876152 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.099044706 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-04 13:34:38.921312399 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/osf/Makefile.am 2023-02-16 12:12:40.729876148 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2024-01-04 13:32:00.103044687 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-04 13:35:51.154980846 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2023-01-23 01:33:45.975502715 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/osx/Makefile.am 2023-02-16 12:12:40.733876129 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2024-01-04 13:32:00.104044683 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-04 13:35:04.864193319 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2023-01-30 00:22:04.992328648 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am 2023-02-16 12:12:40.734876124 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2023-12-13 01:17:33.228166854 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-04 13:32:00.106044673 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -546,31 +547,31 @@ diff -up zabbix-6.0.13/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libsimplesysinfo.a libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2023-01-27 02:18:53.042143778 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/solaris/Makefile.am 2023-02-16 12:12:40.735876119 -0700 +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2024-01-04 13:32:00.107044669 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-04 13:35:19.524126021 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2023-01-23 01:33:45.979502768 -0700 -+++ zabbix-6.0.13/src/libs/zbxsysinfo/unknown/Makefile.am 2023-02-16 12:12:40.735876119 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2024-01-04 13:32:00.108044664 -0700 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-04 13:36:27.379816202 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-6.0.13/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.13/src/libs/zbxsys/Makefile.am.out-of-tree 2023-01-30 00:22:04.988328619 -0700 -+++ zabbix-6.0.13/src/libs/zbxsys/Makefile.am 2023-02-16 12:12:40.736876114 -0700 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsys/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsys/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 ++++ zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-04 13:32:00.110044655 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -579,9 +580,9 @@ diff -up zabbix-6.0.13/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.13/src noinst_LIBRARIES = libzbxsys.a libzbxsys_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.13/src/libs/zbxtasks/Makefile.am.out-of-tree 2023-01-23 01:33:45.979502768 -0700 -+++ zabbix-6.0.13/src/libs/zbxtasks/Makefile.am 2023-02-16 12:12:40.737876110 -0700 +diff -up zabbix-6.0.25/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxtasks/Makefile.am +--- zabbix-6.0.25/src/libs/zbxtasks/Makefile.am.out-of-tree 2023-12-13 01:17:17.064075454 -0700 ++++ zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-04 13:32:00.110044655 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -590,9 +591,9 @@ diff -up zabbix-6.0.13/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.13/s noinst_LIBRARIES = libzbxtasks.a libzbxtasks_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.13/src/libs/zbxtrends/Makefile.am.out-of-tree 2023-02-01 00:19:54.620719532 -0700 -+++ zabbix-6.0.13/src/libs/zbxtrends/Makefile.am 2023-02-16 12:12:40.738876105 -0700 +diff -up zabbix-6.0.25/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxtrends/Makefile.am +--- zabbix-6.0.25/src/libs/zbxtrends/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 ++++ zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-04 13:32:00.111044650 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -601,9 +602,9 @@ diff -up zabbix-6.0.13/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.13/ noinst_LIBRARIES = \ libzbxtrends.a \ libzbxtrends_baseline.a -diff -up zabbix-6.0.13/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.13/src/libs/zbxvault/Makefile.am.out-of-tree 2023-02-01 00:19:54.620719532 -0700 -+++ zabbix-6.0.13/src/libs/zbxvault/Makefile.am 2023-02-16 12:12:40.738876105 -0700 +diff -up zabbix-6.0.25/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxvault/Makefile.am +--- zabbix-6.0.25/src/libs/zbxvault/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 ++++ zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-04 13:32:00.113044641 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -612,9 +613,9 @@ diff -up zabbix-6.0.13/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.13/s noinst_LIBRARIES = libzbxvault.a libzbxvault_a_SOURCES = \ -diff -up zabbix-6.0.13/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.13/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.13/src/libs/zbxxml/Makefile.am.out-of-tree 2023-01-23 01:33:45.979502768 -0700 -+++ zabbix-6.0.13/src/libs/zbxxml/Makefile.am 2023-02-16 12:12:40.739876100 -0700 +diff -up zabbix-6.0.25/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxxml/Makefile.am +--- zabbix-6.0.25/src/libs/zbxxml/Makefile.am.out-of-tree 2023-12-13 01:17:17.068075476 -0700 ++++ zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-04 13:32:00.114044637 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -623,9 +624,9 @@ diff -up zabbix-6.0.13/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.13/src noinst_LIBRARIES = libzbxxml.a libzbxxml_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2023-01-27 02:18:53.054143943 -0700 -+++ zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am 2023-02-16 12:12:40.740876096 -0700 +diff -up zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am +--- zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 ++++ zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-04 13:32:00.114044637 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -634,9 +635,9 @@ diff -up zabbix-6.0.13/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxlogfiles.a libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_agent/Makefile.am ---- zabbix-6.0.13/src/zabbix_agent/Makefile.am.out-of-tree 2023-02-01 00:19:54.620719532 -0700 -+++ zabbix-6.0.13/src/zabbix_agent/Makefile.am 2023-02-16 12:12:40.741876091 -0700 +diff -up zabbix-6.0.25/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_agent/Makefile.am +--- zabbix-6.0.25/src/zabbix_agent/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 ++++ zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-04 13:32:00.116044627 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -645,15 +646,15 @@ diff -up zabbix-6.0.13/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.13/sr SUBDIRS = \ logfiles -@@ -78,4 +80,4 @@ zabbix_agentd_CFLAGS = \ +@@ -79,4 +81,4 @@ zabbix_agentd_CFLAGS = \ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff -up zabbix-6.0.13/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_get/Makefile.am ---- zabbix-6.0.13/src/zabbix_get/Makefile.am.out-of-tree 2023-02-01 00:19:54.624719569 -0700 -+++ zabbix-6.0.13/src/zabbix_get/Makefile.am 2023-02-16 12:12:40.741876091 -0700 +diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_get/Makefile.am +--- zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-04 13:32:00.117044623 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -662,9 +663,9 @@ diff -up zabbix-6.0.13/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.13/src/ bin_PROGRAMS = zabbix_get zabbix_get_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_java/Makefile.am ---- zabbix-6.0.13/src/zabbix_java/Makefile.am.out-of-tree 2023-02-01 00:19:54.624719569 -0700 -+++ zabbix-6.0.13/src/zabbix_java/Makefile.am 2023-02-16 12:12:40.742876086 -0700 +diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_java/Makefile.am +--- zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree 2023-12-13 01:17:17.072075499 -0700 ++++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-04 13:32:00.118044618 -0700 @@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh @@ -694,9 +695,9 @@ diff -up zabbix-6.0.13/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.13/src java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.13/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_js/Makefile.am ---- zabbix-6.0.13/src/zabbix_js/Makefile.am.out-of-tree 2023-02-01 00:19:54.624719569 -0700 -+++ zabbix-6.0.13/src/zabbix_js/Makefile.am 2023-02-16 12:12:40.743876081 -0700 +diff -up zabbix-6.0.25/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_js/Makefile.am +--- zabbix-6.0.25/src/zabbix_js/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-04 13:32:00.119044613 -0700 @@ -1,26 +1,28 @@ ## Process this file with automake to produce Makefile.in @@ -742,9 +743,9 @@ diff -up zabbix-6.0.13/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.13/src/z zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) -diff -up zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2023-01-23 01:33:45.991502925 -0700 -+++ zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am 2023-02-16 12:12:40.744876076 -0700 +diff -up zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-04 13:32:00.119044613 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -753,9 +754,9 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxdatasender.a libzbxdatasender_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2023-01-27 02:18:53.058143998 -0700 -+++ zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am 2023-02-16 12:12:40.745876072 -0700 +diff -up zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-04 13:32:00.120044609 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -764,9 +765,9 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libzbxheart.a libzbxheart_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2023-01-23 01:33:45.991502925 -0700 -+++ zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am 2023-02-16 12:12:40.746876067 -0700 +diff -up zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-04 13:32:00.121044604 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -775,9 +776,9 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.13/src/zabbix_proxy/Makefile.am.out-of-tree 2023-02-01 00:19:54.628719606 -0700 -+++ zabbix-6.0.13/src/zabbix_proxy/Makefile.am 2023-02-16 12:12:40.747876062 -0700 +diff -up zabbix-6.0.25/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-04 13:32:00.122044600 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -792,9 +793,9 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.13/sr $(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.13/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2023-01-27 02:18:53.058143998 -0700 -+++ zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am 2023-02-16 12:12:40.747876062 -0700 +diff -up zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-04 13:32:00.123044595 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -803,9 +804,9 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxproxyconfig.a libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2023-01-23 01:33:45.991502925 -0700 -+++ zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am 2023-02-16 12:12:40.748876057 -0700 +diff -up zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-04 13:32:00.125044586 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -814,9 +815,9 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_sender/Makefile.am ---- zabbix-6.0.13/src/zabbix_sender/Makefile.am.out-of-tree 2023-02-01 00:19:54.628719606 -0700 -+++ zabbix-6.0.13/src/zabbix_sender/Makefile.am 2023-02-16 12:12:40.749876052 -0700 +diff -up zabbix-6.0.25/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_sender/Makefile.am +--- zabbix-6.0.25/src/zabbix_sender/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 ++++ zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-04 13:32:00.126044581 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -825,9 +826,9 @@ diff -up zabbix-6.0.13/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.13/s bin_PROGRAMS = zabbix_sender zabbix_sender_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am.out-of-tree 2023-01-30 00:22:05.008328759 -0700 -+++ zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am 2023-02-16 12:12:40.750876048 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-04 13:32:00.127044576 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -836,9 +837,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxalerter.a libzbxalerter_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/availability/Makefile.am.out-of-tree 2023-02-01 00:19:54.632719646 -0700 -+++ zabbix-6.0.13/src/zabbix_server/availability/Makefile.am 2023-02-16 12:12:40.751876043 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/availability/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/availability/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-04 13:32:00.128044572 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -847,9 +848,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/availability/Makefile.am.out-of-tree za noinst_LIBRARIES = libavailability.a libavailability_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2023-01-27 02:18:53.066144108 -0700 -+++ zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am 2023-02-16 12:12:40.751876043 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-04 13:32:00.128044572 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -858,9 +859,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxdbconfig.a libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 -+++ zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am 2023-02-16 12:12:40.752876038 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-04 13:32:00.129044567 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -869,9 +870,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxdbsyncer.a libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 -+++ zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am 2023-02-16 12:12:40.753876034 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-04 13:32:00.130044563 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -880,9 +881,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxdiscoverer.a libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 -+++ zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am 2023-02-16 12:12:40.754876029 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-04 13:32:00.131044558 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -891,9 +892,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxescalator.a libzbxescalator_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/ha/Makefile.am.out-of-tree 2023-02-01 00:19:54.632719646 -0700 -+++ zabbix-6.0.13/src/zabbix_server/ha/Makefile.am 2023-02-16 12:12:40.754876029 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/ha/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/ha/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 ++++ zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-04 13:32:00.132044553 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -902,9 +903,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.1 noinst_LIBRARIES = libzbxha.a libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2023-02-01 00:19:54.632719646 -0700 -+++ zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am 2023-02-16 12:12:40.755876024 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 ++++ zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-04 13:32:00.133044549 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -913,9 +914,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2023-01-23 01:33:45.995502978 -0700 -+++ zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am 2023-02-16 12:12:40.756876019 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 ++++ zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-04 13:32:00.137044530 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -924,9 +925,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxhttppoller.a libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2023-01-23 01:33:45.999503030 -0700 -+++ zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am 2023-02-16 12:12:40.758876010 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 ++++ zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-04 13:32:00.140044516 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -935,9 +936,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libipmi.a libipmi_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/lld/Makefile.am.out-of-tree 2023-01-30 00:22:05.012328788 -0700 -+++ zabbix-6.0.13/src/zabbix_server/lld/Makefile.am 2023-02-16 12:12:40.758876010 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/lld/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/lld/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 ++++ zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-04 13:32:00.140044516 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -946,9 +947,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0. noinst_LIBRARIES = libzbxlld.a libzbxlld_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/Makefile.am.out-of-tree 2023-02-01 00:19:54.628719606 -0700 -+++ zabbix-6.0.13/src/zabbix_server/Makefile.am 2023-02-16 12:12:40.759876005 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 ++++ zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-04 13:32:00.141044512 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -963,9 +964,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.13/s $(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.13/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am.out-of-tree 2023-01-23 01:33:45.999503030 -0700 -+++ zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am 2023-02-16 12:12:40.760876000 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am.out-of-tree 2023-12-13 01:17:29.148143783 -0700 ++++ zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-04 13:32:00.142044507 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -974,9 +975,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0 noinst_LIBRARIES = libzbxodbc.a libzbxodbc_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am.out-of-tree 2023-01-23 01:33:45.999503030 -0700 -+++ zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am 2023-02-16 12:12:40.761875995 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am.out-of-tree 2023-12-13 01:17:33.248166967 -0700 ++++ zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-04 13:32:00.143044503 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -985,9 +986,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxpinger.a libzbxpinger_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/poller/Makefile.am.out-of-tree 2023-02-01 00:19:54.640719721 -0700 -+++ zabbix-6.0.13/src/zabbix_server/poller/Makefile.am 2023-02-16 12:12:40.761875995 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/poller/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/poller/Makefile.am.out-of-tree 2023-12-13 01:17:33.248166967 -0700 ++++ zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-04 13:32:00.143044503 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -996,9 +997,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6 noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a libzbxpoller_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2023-02-01 00:19:54.644719758 -0700 -+++ zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am 2023-02-16 12:12:40.763875986 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 ++++ zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-04 13:32:00.144044498 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1007,9 +1008,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/preprocessor/Makefile.am.out-of-tree za noinst_LIBRARIES = libpreprocessor.a libpreprocessor_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2023-01-27 02:18:53.086144382 -0700 -+++ zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am 2023-02-16 12:12:40.764875981 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 ++++ zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-04 13:32:00.146044489 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1018,9 +1019,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxproxypoller.a libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am.out-of-tree 2023-02-01 00:19:54.648719797 -0700 -+++ zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am 2023-02-16 12:12:40.766875971 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 ++++ zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-04 13:32:00.150044470 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1029,9 +1030,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxreporter.a libzbxreporter_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 -+++ zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am 2023-02-16 12:12:40.767875967 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-04 13:32:00.151044466 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1040,9 +1041,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxscripts.a libzbxscripts_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2023-01-27 02:18:53.086144382 -0700 -+++ zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am 2023-02-16 12:12:40.769875957 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-04 13:32:00.152044461 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1051,9 +1052,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxselfmon.a libzbxselfmon_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/service/Makefile.am.out-of-tree 2023-02-01 00:19:54.648719797 -0700 -+++ zabbix-6.0.13/src/zabbix_server/service/Makefile.am 2023-02-16 12:12:40.770875952 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/service/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/service/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-04 13:32:00.153044456 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1062,9 +1063,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/service/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libservice.a libservice_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 -+++ zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am 2023-02-16 12:12:40.772875943 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-04 13:32:00.157044438 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1073,9 +1074,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxsnmptrapper.a libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 -+++ zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am 2023-02-16 12:12:40.773875938 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-04 13:32:00.157044438 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1084,9 +1085,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/timer/Makefile.am.out-of-tree 2023-01-23 01:33:46.007503136 -0700 -+++ zabbix-6.0.13/src/zabbix_server/timer/Makefile.am 2023-02-16 12:12:40.773875938 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/timer/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/timer/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-04 13:32:00.158044433 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1095,9 +1096,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6. noinst_LIBRARIES = libzbxtimer.a libzbxtimer_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am.out-of-tree 2023-02-01 00:19:54.648719797 -0700 -+++ zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am 2023-02-16 12:12:40.774875933 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-04 13:32:00.160044424 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1106,9 +1107,9 @@ diff -up zabbix-6.0.13/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am.out-of-tree 2023-01-30 00:22:05.028328900 -0700 -+++ zabbix-6.0.13/src/zabbix_server/vmware/Makefile.am 2023-02-16 12:12:40.775875929 -0700 +diff -up zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 ++++ zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-04 13:32:00.160044424 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in From ad6fda5387da70c2b32c17bd5e3235a552f3fdbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:56:47 +0000 Subject: [PATCH 27/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index b7a7663..e7c1563 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -795,6 +795,9 @@ fi %files web-pgsql %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:6.0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 04 2024 Orion Poplawski - 1:6.0.25-1 - Update to 6.0.25 From e5f68a6acce11fef549de7e1a5a8ebf4c3ac4f20 Mon Sep 17 00:00:00 2001 From: Morten Stevens Date: Wed, 28 Feb 2024 16:34:01 +0100 Subject: [PATCH 28/68] Update to 6.0.27 --- .gitignore | 1 + ZBX-23738-6.0.patch | 218 -------------------------------------------- sources | 2 +- zabbix.spec | 8 +- 4 files changed, 7 insertions(+), 222 deletions(-) delete mode 100644 ZBX-23738-6.0.patch diff --git a/.gitignore b/.gitignore index cf57584..e4b64d6 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.20.tar.gz /zabbix-6.0.22.tar.gz /zabbix-6.0.25.tar.gz +/zabbix-6.0.27.tar.gz diff --git a/ZBX-23738-6.0.patch b/ZBX-23738-6.0.patch deleted file mode 100644 index 8ea5bf1..0000000 --- a/ZBX-23738-6.0.patch +++ /dev/null @@ -1,218 +0,0 @@ -diff --git a/ChangeLog.d/bugfix/ZBX-23738 b/ChangeLog.d/bugfix/ZBX-23738 -new file mode 100644 -index 0000000..f7c7dd5 ---- /dev/null -+++ b/ChangeLog.d/bugfix/ZBX-23738 -@@ -0,0 +1 @@ -+.......PS. [ZBX-23738] fixed Zabbix backend sources for libxml2 2.12.0 version changes (akozlovs) -diff --git a/m4/libxml2.m4 b/m4/libxml2.m4 -index ddb444e..7449f97 100644 ---- a/m4/libxml2.m4 -+++ b/m4/libxml2.m4 -@@ -29,10 +29,13 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa - [ - if test "$withval" = "no"; then - want_libxml2="no" -+ _libxml2_with="no" - elif test "$withval" = "yes"; then - want_libxml2="yes" -+ _libxml2_with="yes" - else - want_libxml2="yes" -+ _libxml2_with=$withval - fi - ], - [want_libxml2="no"] -@@ -48,27 +51,43 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa - dnl - - if test "$want_libxml2" = "yes"; then -- AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -- m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG()], [:]) -+ if test "$_libxml2_with" != "yes"; then -+ XML2_INCDIR=$_libxml2_with/include -+ XML2_LIBDIR=$_libxml2_with/lib -+ LIBXML2_CFLAGS="-I$XML2_INCDIR" -+ LIBXML2_LDFLAGS="-L$XML2_LIBDIR" -+ _full_libxml2_libs=$LIBXML2_LDFLAGS -+ configured_libxml2="yes" -+ else -+ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+ m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG()], [:]) -+ -+ if test -x "$PKG_CONFIG"; then - -- if test -x "$PKG_CONFIG"; then -+ LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" - -- LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" -+ _full_libxml2_libs="`$PKG_CONFIG --libs libxml-2.0`" -+ -+ for i in $_full_libxml2_libs; do -+ case $i in -+ -lxml2) -+ ;; -+ -L*) -+ LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} $i" -+ ;; -+ -R*) -+ LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} -Wl,$i" -+ ;; -+ esac -+ done - -- _full_libxml2_libs="`$PKG_CONFIG --libs libxml-2.0`" -+ configured_libxml2="yes" -+ else -+ configured_libxml2="no" -+ fi -+ fi - -- for i in $_full_libxml2_libs; do -- case $i in -- -lxml2) -- ;; -- -L*) -- LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} $i" -- ;; -- -R*) -- LIBXML2_LDFLAGS="${LIBXML2_LDFLAGS} -Wl,$i" -- ;; -- esac -- done -+ if test "$configured_libxml2" = "yes"; then - - if test "x$enable_static" = "xyes"; then - for i in $_full_libxml2_libs; do -@@ -87,6 +106,20 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa - done - fi - -+ if test "$_libxml2_with" != "yes"; then -+ if test -f $_libxml2_with/include/libxml2/libxml/xmlversion.h; then -+ LIBXML2_VERSION=`cat $_libxml2_with/include/libxml2/libxml/xmlversion.h \ -+ | grep '#define.*LIBXML_DOTTED_VERSION.*' \ -+ | sed -e 's/#define LIBXML_DOTTED_VERSION *//' \ -+ | sed -e 's/ *\/\*.*\*\///' \ -+ | sed -e 's/\"//g'` -+ else -+ AC_MSG_ERROR([Not found libxml2 library]) -+ fi -+ else -+ LIBXML2_VERSION=`$PKG_CONFIG --version libxml-2.0` -+ fi -+ - _save_libxml2_libs="${LIBS}" - _save_libxml2_ldflags="${LDFLAGS}" - _save_libxml2_cflags="${CFLAGS}" -@@ -95,7 +128,7 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa - CFLAGS="${CFLAGS} ${LIBXML2_CFLAGS}" - - AC_CHECK_LIB(xml2, xmlReadMemory, [ -- LIBXML2_LIBS="-lxml2 ${LIBXML2_LIBS}" -+ LIBXML2_LIBS="${LIBXML2_LIBS} -lxml2" - ],[ - AC_MSG_ERROR([Not found libxml2 library]) - ]) -@@ -107,8 +140,6 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],[use libxml2 client library @<:@defa - unset _save_libxml2_ldflags - unset _save_libxml2_cflags - -- LIBXML2_VERSION=`$PKG_CONFIG --version libxml-2.0` -- - AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if libxml2 libraries are available]) - - found_libxml2="yes" -diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c -index 027735d..2058b0f 100644 ---- a/src/libs/zbxserver/expression.c -+++ b/src/libs/zbxserver/expression.c -@@ -6580,7 +6580,11 @@ exit: - * err - [IN] the libxml2 error message * - * * - ******************************************************************************/ -+#if 21200 > LIBXML_VERSION /* version 2.12.0 */ - static void libxml_handle_error(void *user_data, xmlErrorPtr err) -+#else -+static void libxml_handle_error(void *user_data, const xmlError *err) -+#endif - { - zbx_libxml_error_t *err_ctx; - -diff --git a/src/libs/zbxxml/xml.c b/src/libs/zbxxml/xml.c -index 82928e8..e5b3a56 100644 ---- a/src/libs/zbxxml/xml.c -+++ b/src/libs/zbxxml/xml.c -@@ -24,6 +24,7 @@ - - #ifdef HAVE_LIBXML2 - # include -+# include - #endif - - #include "../zbxalgo/vectorimpl.h" -@@ -234,7 +235,7 @@ int zbx_query_xpath(zbx_variant_t *value, const char *params, char **errmsg) - xmlXPathContext *xpathCtx; - xmlXPathObject *xpathObj; - xmlNodeSetPtr nodeset; -- xmlErrorPtr pErr; -+ const xmlError *pErr; - xmlBufferPtr xmlBufferLocal; - - if (NULL == (doc = xmlReadMemory(value->data.str, strlen(value->data.str), "noname.xml", NULL, 0))) -@@ -583,7 +584,7 @@ static void vector_to_json(zbx_vector_xml_node_ptr_t *nodes, struct zbx_json *js - ******************************************************************************/ - int zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void **root_node, char **errmsg) - { -- xmlErrorPtr pErr; -+ const xmlError *pErr; - - if (NULL == (*xml_doc = xmlReadMemory(data, strlen(data), "noname.xml", NULL, options))) - { -@@ -639,7 +640,7 @@ int zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void ** - ******************************************************************************/ - int zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg) - { -- xmlErrorPtr pErr; -+ const xmlError *pErr; - - if (NULL == mem) - { -@@ -894,7 +895,7 @@ int zbx_json_to_xml(char *json_data, char **xstr, char **errmsg) - int size, ret = FAIL; - struct zbx_json_parse jp; - xmlDoc *doc = NULL; -- xmlErrorPtr pErr; -+ const xmlError *pErr; - xmlChar *xmem; - - if (NULL == (doc = xmlNewDoc(BAD_CAST XML_DEFAULT_VERSION))) -diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c -index bd46f3a..f253651 100644 ---- a/src/zabbix_server/preprocessor/item_preproc.c -+++ b/src/zabbix_server/preprocessor/item_preproc.c -@@ -1224,7 +1224,7 @@ static int item_preproc_get_error_from_xml(const zbx_variant_t *value, const cha - xmlDoc *doc = NULL; - xmlXPathContext *xpathCtx = NULL; - xmlXPathObject *xpathObj = NULL; -- xmlErrorPtr pErr; -+ const xmlError *pErr; - xmlBufferPtr xmlBufferLocal; - - zbx_variant_copy(&value_str, value); -diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c -index 5b5cedc..0ff7a34 100644 ---- a/src/zabbix_server/vmware/vmware.c -+++ b/src/zabbix_server/vmware/vmware.c -@@ -7054,7 +7054,11 @@ int zbx_vmware_get_statistics(zbx_vmware_stats_t *stats) - * err - [IN] the libxml2 error message * - * * - ******************************************************************************/ -+#if 21200 > LIBXML_VERSION /* version 2.12.0 */ - static void libxml_handle_error(void *user_data, xmlErrorPtr err) -+#else -+static void libxml_handle_error(void *user_data, const xmlError *err) -+#endif - { - ZBX_UNUSED(user_data); - ZBX_UNUSED(err); diff --git a/sources b/sources index a6417f0..0ac5117 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.25.tar.gz) = 0be1ce76754788e05ff73a02f370c2b6b4bc2f69a463a47304ac9504a8cd9da2697c54d897a95b39841ceb38ded0c985f4772e453a393526aca6475c78eb7a1e +SHA512 (zabbix-6.0.27.tar.gz) = d459f44eca300eb4de9bbf1bc6655f065b50f9a7a1247cebd987e3ccbb8b5cb62847c63dadcb289b837e80a9af609e0a42b110152831de8d4f7398b921783daf diff --git a/zabbix.spec b/zabbix.spec index e7c1563..edd57b8 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.25 -Release: 2%{?dist} +Version: 6.0.27 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -50,7 +50,6 @@ Patch1: %{srcname}-out-of-tree.patch # Enforce Fedora Crypto Policy Patch2: %{srcname}-crypto-policy.patch Patch3: %{srcname}-configure-sscanf.patch -Patch4: ZBX-23738-6.0.patch # Patch1 patches automake files so we need to autoreconf BuildRequires: libtool @@ -795,6 +794,9 @@ fi %files web-pgsql %changelog +* Wed Feb 28 2024 Morten Stevens - 1:6.0.27-1 +- Update to 6.0.27 + * Sat Jan 27 2024 Fedora Release Engineering - 1:6.0.25-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 00b7fe99805160bbcd67b9ab975d71432a07a871 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 3 May 2024 15:21:45 -0600 Subject: [PATCH 29/68] Update to 6.0.29 Hopefully really get the zabbix_run_sudo SELinux boolean working for zabbix-agent and allow it to run lvm when enabled --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 ++++++- zabbix.te | 56 +++++++++++++++++++++++++++++++++++------------------ 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index e4b64d6..52064b7 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.22.tar.gz /zabbix-6.0.25.tar.gz /zabbix-6.0.27.tar.gz +/zabbix-6.0.29.tar.gz diff --git a/sources b/sources index 0ac5117..73bd89e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.27.tar.gz) = d459f44eca300eb4de9bbf1bc6655f065b50f9a7a1247cebd987e3ccbb8b5cb62847c63dadcb289b837e80a9af609e0a42b110152831de8d4f7398b921783daf +SHA512 (zabbix-6.0.29.tar.gz) = 3189a534e250a02f7661340700d6c6d852eeae552db8a15f94e6d917aea84f7292660a22580d6fc59479498aedecdbf58b19c51b649266a9de229f0d0c35c3e0 diff --git a/zabbix.spec b/zabbix.spec index edd57b8..52560e7 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.27 +Version: 6.0.29 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,11 @@ fi %files web-pgsql %changelog +* Fri May 03 2024 Orion Poplawski - 1:6.0.29-1 +- Update to 6.0.29 +- Hopefully really get the zabbix_run_sudo SELinux boolean working for + zabbix-agent and allow it to run lvm when enabled + * Wed Feb 28 2024 Morten Stevens - 1:6.0.27-1 - Update to 6.0.27 diff --git a/zabbix.te b/zabbix.te index f6de1bc..4ff1bb7 100644 --- a/zabbix.te +++ b/zabbix.te @@ -1,4 +1,4 @@ -policy_module(zabbix, 1.6.1) +policy_module(zabbix, 1.7.0) ######################################## # @@ -284,24 +284,6 @@ zabbix_tcp_connect(zabbix_agent_t) zabbix_script_domtrans(zabbix_agent_t) -tunable_policy(`zabbix_run_sudo',` - allow zabbix_agent_t self:capability { 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 }; - - auth_rw_lastlog(zabbix_agent_t) - auth_rw_faillog(zabbix_agent_t) - auth_exec_chkpwd(zabbix_agent_t) - - selinux_compute_access_vector(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) -') - # These are triggered by vfs.dev.discovery enumerating everyting in /dev gen_require(` type devlog_t; @@ -310,6 +292,42 @@ 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 { 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) + + logging_send_audit_msgs(zabbix_agent_t) + + selinux_compute_access_vector(zabbix_agent_t) + + sssd_read_config(zabbix_agent_t) + + systemd_write_inherited_logind_sessions_pipes(zabbix_agent_t) + systemd_dbus_chat_logind(zabbix_agent_t) + + xserver_exec_xauth(zabbix_agent_t) + + # Conceivably this could be under a separate boolean, but the reason to allow sudo + # is to allow check like this + lvm_domtrans(zabbix_agent_t) +') + optional_policy(` rpm_exec(zabbix_agent_t) rpm_read_db(zabbix_agent_t) From 09920057c24cef861ea64a20ce92fc6565213bd1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 May 2024 09:14:55 -0500 Subject: [PATCH 30/68] 6.0.30 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 52064b7..913cdba 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.25.tar.gz /zabbix-6.0.27.tar.gz /zabbix-6.0.29.tar.gz +/zabbix-6.0.30.tar.gz diff --git a/sources b/sources index 73bd89e..d4b1bc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.29.tar.gz) = 3189a534e250a02f7661340700d6c6d852eeae552db8a15f94e6d917aea84f7292660a22580d6fc59479498aedecdbf58b19c51b649266a9de229f0d0c35c3e0 +SHA512 (zabbix-6.0.30.tar.gz) = 8e49b53a30d4c9450ea00600144542cc1c709b2a11f3716462eefedee4d47b59c99334002bfd6644c6c49afaba0a268c86f9824ac7d45305c95b55681fd82eee diff --git a/zabbix.spec b/zabbix.spec index 52560e7..b79ce09 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 6.0.29 +Version: 6.0.30 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Tue May 21 2024 Gwyn Ciesla - 1:6.0.30-1 +- 6.0.30 + * Fri May 03 2024 Orion Poplawski - 1:6.0.29-1 - Update to 6.0.29 - Hopefully really get the zabbix_run_sudo SELinux boolean working for From cb23ac22d0ce387cd2db3dc60923d899aa1473f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:47:09 +0000 Subject: [PATCH 31/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index b79ce09..6782a86 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2 @@ -794,6 +794,9 @@ fi %files web-pgsql %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:6.0.30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 21 2024 Gwyn Ciesla - 1:6.0.30-1 - 6.0.30 From 7cde0209f89167238080479ae29e1dbd44474eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:34:37 +0200 Subject: [PATCH 32/68] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zabbix.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index 6782a86..354b138 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,10 +17,11 @@ Name: zabbix Epoch: 1 Version: 6.0.30 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://www.zabbix.com Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf @@ -794,6 +795,9 @@ fi %files web-pgsql %changelog +* Mon Jul 29 2024 Miroslav Suchý - 1:6.0.30-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1:6.0.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 90c6039bb76aa98effcac39a63c53253ef157a9a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Aug 2024 12:45:47 -0500 Subject: [PATCH 33/68] 6.0.33 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 913cdba..9e7b9a4 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.27.tar.gz /zabbix-6.0.29.tar.gz /zabbix-6.0.30.tar.gz +/zabbix-6.0.33.tar.gz diff --git a/sources b/sources index d4b1bc2..0ef4001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.30.tar.gz) = 8e49b53a30d4c9450ea00600144542cc1c709b2a11f3716462eefedee4d47b59c99334002bfd6644c6c49afaba0a268c86f9824ac7d45305c95b55681fd82eee +SHA512 (zabbix-6.0.33.tar.gz) = 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d diff --git a/zabbix.spec b/zabbix.spec index 354b138..660ff37 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 6.0.30 -Release: 3%{?dist} +Version: 6.0.33 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -795,6 +795,9 @@ fi %files web-pgsql %changelog +* Thu Aug 15 2024 Gwyn Ciesla - 1:6.0.33-1 +- 6.0.33 + * Mon Jul 29 2024 Miroslav Suchý - 1:6.0.30-3 - convert license to SPDX From 4c455b17c3a27613a0c4dd1bfb953141122fe1b4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 15 Aug 2024 15:33:23 -0600 Subject: [PATCH 34/68] Use alternatives name that systemd likes for units (bz#2305855) --- zabbix.spec | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index 660ff37..5750081 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 6.0.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -553,13 +553,25 @@ 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 \ + --slave %{_unitdir}/zabbix-server.service %{srcname}-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. Remove in F45 +%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ + %{srcname}-server %{_sbindir}/%{srcname}_server_mysql 10 \ + --slave %{_unitdir}/zabbix-server.service %{srcname}-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 \ + --slave %{_unitdir}/zabbix-server.service %{srcname}-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. Remove in F45 +%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ + %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql 10 \ + --slave %{_unitdir}/zabbix-server.service %{srcname}-server.service \ %{_unitdir}/zabbix-server-pgsql.service %post proxy @@ -575,19 +587,37 @@ 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 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-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}/%{srcname}_proxy \ + %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-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 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-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}/%{srcname}_proxy \ + %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-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 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-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}/%{srcname}_proxy \ + %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy.service \ %{_unitdir}/zabbix-proxy-sqlite3.service %if 0%{?with_selinux} @@ -795,6 +825,9 @@ fi %files web-pgsql %changelog +* Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 +- Use alternatives name that systemd likes for units (bz#2305855) + * Thu Aug 15 2024 Gwyn Ciesla - 1:6.0.33-1 - 6.0.33 From 0ff9a4461a3617298a978f0019d18aeac9dacb2b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 19 Aug 2024 12:32:52 -0600 Subject: [PATCH 35/68] Update to 7.0.3 License changed upstream to AGPL-3.0-only, note other licenses in source --- .gitignore | 2 + sources | 2 +- zabbix-config.patch | 39 +- zabbix-crypto-policy.patch | 30 +- zabbix-out-of-tree.patch | 1119 +++--------------------------------- zabbix.spec | 51 +- 6 files changed, 158 insertions(+), 1085 deletions(-) diff --git a/.gitignore b/.gitignore index 9e7b9a4..ed37cb9 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,5 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.29.tar.gz /zabbix-6.0.30.tar.gz /zabbix-6.0.33.tar.gz +/zabbix-7.0.2.tar.gz +/zabbix-7.0.3.tar.gz diff --git a/sources b/sources index 0ef4001..de4962e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.33.tar.gz) = 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d +SHA512 (zabbix-7.0.3.tar.gz) = 22149415712017c2fb504972c9673623ea710842611644a934a9f555685a73e516ecbad566048b5ec05ba6404000687feee0815e7b2c8a04fb8fd154c9539671 diff --git a/zabbix-config.patch b/zabbix-config.patch index 9d58fc6..5d61074 100644 --- a/zabbix-config.patch +++ b/zabbix-config.patch @@ -1,7 +1,8 @@ -diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0.2/ui/include/classes/core/CConfigFile.php ---- zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config 2022-03-23 08:38:25.049013803 -0600 -+++ zabbix-6.0.2/ui/include/classes/core/CConfigFile.php 2022-03-23 08:39:25.001657019 -0600 -@@ -25,7 +25,7 @@ class CConfigFile { +diff --git a/ui/include/classes/core/CConfigFile.php b/ui/include/classes/core/CConfigFile.php +index d7ad93a..88b7d5f 100644 +--- a/ui/include/classes/core/CConfigFile.php ++++ b/ui/include/classes/core/CConfigFile.php +@@ -20,7 +20,7 @@ class CConfigFile { const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; @@ -10,10 +11,11 @@ diff -up zabbix-6.0.2/ui/include/classes/core/CConfigFile.php.config zabbix-6.0. private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/include/classes/core/ZBase.php ---- zabbix-6.0.2/ui/include/classes/core/ZBase.php.config 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/ui/include/classes/core/ZBase.php 2022-03-23 08:38:25.052013836 -0600 -@@ -368,7 +368,7 @@ class ZBase { +diff --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php +index 51b2165..e57e5a8 100644 +--- a/ui/include/classes/core/ZBase.php ++++ b/ui/include/classes/core/ZBase.php +@@ -392,7 +392,7 @@ class ZBase { * @throws Exception */ protected function setMaintenanceMode() { @@ -22,23 +24,24 @@ diff -up zabbix-6.0.2/ui/include/classes/core/ZBase.php.config zabbix-6.0.2/ui/i if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -381,7 +381,7 @@ class ZBase { +@@ -405,7 +405,7 @@ class ZBase { * Load zabbix config file. */ - protected function loadConfigFile() { -- $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH; + protected function loadConfigFile(): void { +- $configFile = $this->root_dir.CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; + $config = new CConfigFile($configFile); - $this->config = $config->load(); - } -diff -up zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php ---- zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php.config 2022-03-14 03:57:00.000000000 -0600 -+++ zabbix-6.0.2/ui/include/classes/setup/CSetupWizard.php 2022-03-23 08:38:25.054013857 -0600 -@@ -271,7 +271,7 @@ class CSetupWizard extends CForm { + +diff --git a/ui/include/classes/setup/CSetupWizard.php b/ui/include/classes/setup/CSetupWizard.php +index 8574868..79d0c72 100644 +--- a/ui/include/classes/setup/CSetupWizard.php ++++ b/ui/include/classes/setup/CSetupWizard.php +@@ -328,7 +328,7 @@ class CSetupWizard extends CForm { // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); -- $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH); +- $config = new CConfigFile(APP::getRootDir().CConfigFile::CONFIG_FILE_PATH); + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH); $config->config = [ 'DB' => [ diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index 8a157ce..cf06a65 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -1,7 +1,21 @@ -diff -up zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy zabbix-5.0.2/src/libs/zbxcrypto/tls.c ---- zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy 2020-07-06 03:54:32.000000000 -0600 -+++ zabbix-5.0.2/src/libs/zbxcrypto/tls.c 2020-07-18 21:22:13.125099598 -0600 -@@ -2932,7 +2932,7 @@ void zbx_tls_init_child(void) +diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go +index be8cf4a..e68b435 100644 +--- a/src/go/pkg/tls/tls.go ++++ b/src/go/pkg/tls/tls.go +@@ -393,7 +393,7 @@ static void *tls_new_context(const char *ca_file, const char *crl_file, const ch + goto out; + #endif + +- if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) ++ if (1 != SSL_CTX_set_cipher_list(ctx, "PROFILES=SYSTEM")) + goto out; + + ret = 0; +diff --git a/src/libs/zbxcomms/tls_openssl.c b/src/libs/zbxcomms/tls_openssl.c +index 40394a3..b2eb0f0 100644 +--- a/src/libs/zbxcomms/tls_openssl.c ++++ b/src/libs/zbxcomms/tls_openssl.c +@@ -1212,7 +1212,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type goto out; } } @@ -10,21 +24,21 @@ diff -up zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy zabbix-5.0.2/src/li { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of certificate" " ciphersuites:"); -@@ -3014,7 +3014,7 @@ void zbx_tls_init_child(void) +@@ -1302,7 +1302,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type goto out; } } - else if (1 != SSL_CTX_set_cipher_list(ctx_psk, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILE=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILES=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of PSK ciphersuites:"); goto out; -@@ -3070,7 +3070,7 @@ void zbx_tls_init_child(void) +@@ -1360,7 +1360,7 @@ void zbx_tls_init_child(const zbx_config_tls_t *config_tls, zbx_get_program_type goto out; } } - else if (1 != SSL_CTX_set_cipher_list(ctx_all, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILE=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILES=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of all ciphersuites:"); goto out; diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index cd7012c..901d716 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,671 +1,41 @@ -diff -up zabbix-6.0.25/src/go/Makefile.am.out-of-tree zabbix-6.0.25/src/go/Makefile.am ---- zabbix-6.0.25/src/go/Makefile.am.out-of-tree 2024-01-04 13:32:00.055044909 -0700 -+++ zabbix-6.0.25/src/go/Makefile.am 2024-01-04 13:37:56.640412586 -0700 -@@ -59,7 +59,7 @@ build: ${TARGETS} - clean: clean-go-build clean-sbom +diff --git a/src/go/Makefile.am b/src/go/Makefile.am +index 3e24aa0..308e34b 100644 +--- a/src/go/Makefile.am ++++ b/src/go/Makefile.am +@@ -67,6 +67,7 @@ clean: clean-go-build clean-sbom clean-go-build: -- -go clean ./... -+ -go clean $(srcdir)/... + -$(GO) clean ./... ++ -$(GO) clean $(srcdir)/... -rm -f bin/mock_server -rm -f bin/zabbix_agent2 -rm -f bin/zabbix_web_service -@@ -76,8 +76,8 @@ install-zabbix.com/cmd/zabbix_agent2: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS} - $(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)" -- test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -- for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \ -+ test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" -+ for cfg in $(top_srcdir)conf/zabbix_agent2.d/plugins.d/*.conf; do \ - test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ - cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ - done -@@ -151,7 +151,7 @@ sbom-mod: sbom-mod.json - sbom: sbom-apps sbom-mod - - check: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... - style: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... - format: -diff -up zabbix-6.0.25/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxalgo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxalgo/Makefile.am.out-of-tree 2023-12-13 01:17:33.180166583 -0700 -+++ zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-04 13:32:00.057044900 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalgo.a - - if SERVER -diff -up zabbix-6.0.25/src/libs/zbxaudit/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxaudit/Makefile.am ---- zabbix-6.0.25/src/libs/zbxaudit/Makefile.am.out-of-tree 2023-12-13 01:17:33.184166606 -0700 -+++ zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-04 13:32:00.058044895 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxaudit.a - - libzbxaudit_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxavailability/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxavailability/Makefile.am ---- zabbix-6.0.25/src/libs/zbxavailability/Makefile.am.out-of-tree 2023-12-13 01:17:33.184166606 -0700 -+++ zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-04 13:32:00.059044890 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxavailability.a - - libzbxavailability_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcommon/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommon/Makefile.am.out-of-tree 2023-12-13 01:17:33.188166628 -0700 -+++ zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-04 13:32:00.061044881 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcommon.a - - libzbxcommon_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 -+++ zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-04 13:32:00.062044877 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcommshigh.a - - libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcomms/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcomms/Makefile.am.out-of-tree 2023-12-13 01:17:33.188166628 -0700 -+++ zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-04 13:32:00.063044872 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcomms.a - - libzbxcomms_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcompress/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcompress/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 -+++ zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-04 13:32:00.063044872 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcompress.a - - libzbxcompress_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxconf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxconf/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 -+++ zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-04 13:32:00.064044867 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxconf.a - - libzbxconf_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am ---- zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 -+++ zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-04 13:32:00.065044863 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxcrypto.a - - libzbxcrypto_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am.out-of-tree 2023-12-13 01:17:33.192166650 -0700 -+++ zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-04 13:32:00.065044863 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbcache.a - - libzbxdbcache_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2023-12-13 01:17:33.200166696 -0700 -+++ zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-04 13:32:00.066044858 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - if DBSCHEMA - dbschema.c: $(top_srcdir)/create/src/schema.tmpl - $(top_srcdir)/create/bin/gen_schema.pl c > dbschema.c -diff -up zabbix-6.0.25/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdb/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdb/Makefile.am.out-of-tree 2023-12-13 01:17:17.008075138 -0700 -+++ zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-04 13:32:00.066044858 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdb.a - - libzbxdb_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2023-12-13 01:17:33.204166719 -0700 -+++ zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-04 13:32:00.067044854 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbupgrade.a - - libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxdiag/Makefile.am ---- zabbix-6.0.25/src/libs/zbxdiag/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 -+++ zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-04 13:32:00.068044849 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a - - libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxembed/Makefile.am ---- zabbix-6.0.25/src/libs/zbxembed/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 -+++ zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-04 13:32:00.068044849 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxembed.a - - libzbxembed_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxeval/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxeval/Makefile.am ---- zabbix-6.0.25/src/libs/zbxeval/Makefile.am.out-of-tree 2023-12-13 01:17:33.208166742 -0700 -+++ zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-04 13:32:00.069044844 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxeval.a - - libzbxeval_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxexec/Makefile.am ---- zabbix-6.0.25/src/libs/zbxexec/Makefile.am.out-of-tree 2023-12-13 01:17:17.040075318 -0700 -+++ zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-04 13:32:00.070044840 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxexec.a - - libzbxexec_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxha/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxha/Makefile.am ---- zabbix-6.0.25/src/libs/zbxha/Makefile.am.out-of-tree 2023-12-13 01:17:29.108143557 -0700 -+++ zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-04 13:32:00.071044835 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxha.a - - libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxhistory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhistory/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-04 13:32:00.072044830 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhistory.a - - libzbxhistory_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxhttp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxhttp/Makefile.am.out-of-tree 2023-12-13 01:17:17.044075341 -0700 -+++ zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-04 13:32:00.073044826 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttp.a - - libzbxhttp_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am ---- zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-04 13:32:00.074044821 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxicmpping.a - - libzbxicmpping_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-04 13:32:00.075044817 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxipcservice.a - - libzbxipcservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxjson/Makefile.am ---- zabbix-6.0.25/src/libs/zbxjson/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 -+++ zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-04 13:32:00.076044812 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxjson.a - - libzbxjson_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxlog/Makefile.am ---- zabbix-6.0.25/src/libs/zbxlog/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 -+++ zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-04 13:32:00.077044807 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlog.a - - libzbxlog_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmedia/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmedia/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-04 13:32:00.078044803 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmedia.a - - libzbxmedia_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmemory/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmemory/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-04 13:32:00.079044798 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmemory.a - - libzbxmemory_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxmodules/Makefile.am ---- zabbix-6.0.25/src/libs/zbxmodules/Makefile.am.out-of-tree 2023-12-13 01:17:17.048075363 -0700 -+++ zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-04 13:32:00.082044784 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxmodules.a - - libzbxmodules_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxnix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxnix/Makefile.am.out-of-tree 2023-12-13 01:17:33.212166763 -0700 -+++ zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-04 13:32:00.083044780 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxnix.a - - libzbxnix_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxprof/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxprof/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprof/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 -+++ zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-04 13:32:00.083044780 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxprof.a - - libzbxprof_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am ---- zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 -+++ zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-04 13:32:00.084044775 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxprometheus.a - - libzbxprometheus_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxregexp/Makefile.am ---- zabbix-6.0.25/src/libs/zbxregexp/Makefile.am.out-of-tree 2023-12-13 01:17:17.052075386 -0700 -+++ zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-04 13:32:00.085044770 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxregexp.a - - libzbxregexp_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxrtc/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxrtc/Makefile.am ---- zabbix-6.0.25/src/libs/zbxrtc/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 -+++ zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-04 13:32:00.085044770 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = \ - libzbxrtc.a \ - libzbxrtc_service.a \ -diff -up zabbix-6.0.25/src/libs/zbxself/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxself/Makefile.am ---- zabbix-6.0.25/src/libs/zbxself/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 -+++ zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-04 13:32:00.086044766 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxself.a libzbxself_server.a libzbxself_proxy.a - - libzbxself_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxserver/Makefile.am ---- zabbix-6.0.25/src/libs/zbxserver/Makefile.am.out-of-tree 2023-12-13 01:17:33.216166786 -0700 -+++ zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-04 13:32:00.087044761 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a - - libzbxserver_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxservice/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxservice/Makefile.am ---- zabbix-6.0.25/src/libs/zbxservice/Makefile.am.out-of-tree 2023-12-13 01:17:17.056075408 -0700 -+++ zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-04 13:32:00.087044761 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxservice.a - - libzbxservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2023-12-13 01:17:29.120143625 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-04 13:32:00.088044757 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libagentsysinfo.a - - libagentsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2024-01-04 13:32:00.089044752 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-04 13:34:08.285453006 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-04 13:32:00.090044747 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a - - libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.091044743 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-04 13:35:35.946050650 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2024-01-04 13:32:00.093044733 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-04 13:36:03.172925688 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2024-01-04 13:32:00.095044724 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-04 13:34:22.857386127 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-04 13:32:00.097044715 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - DIST_SUBDIRS = \ - agent \ - common \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.098044710 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-04 13:34:53.065247481 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2024-01-04 13:32:00.099044706 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-04 13:34:38.921312399 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2024-01-04 13:32:00.103044687 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-04 13:35:51.154980846 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2024-01-04 13:32:00.104044683 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-04 13:35:04.864193319 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2023-12-13 01:17:33.228166854 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-04 13:32:00.106044673 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libsimplesysinfo.a - - libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2024-01-04 13:32:00.107044669 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-04 13:35:19.524126021 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2024-01-04 13:32:00.108044664 -0700 -+++ zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-04 13:36:27.379816202 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.a - - libfunclistsysinfo_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxsys/Makefile.am ---- zabbix-6.0.25/src/libs/zbxsys/Makefile.am.out-of-tree 2023-12-13 01:17:33.220166809 -0700 -+++ zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-04 13:32:00.110044655 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsys.a - - libzbxsys_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxtasks/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtasks/Makefile.am.out-of-tree 2023-12-13 01:17:17.064075454 -0700 -+++ zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-04 13:32:00.110044655 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtasks.a - - libzbxtasks_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxtrends/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxtrends/Makefile.am ---- zabbix-6.0.25/src/libs/zbxtrends/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-04 13:32:00.111044650 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = \ - libzbxtrends.a \ - libzbxtrends_baseline.a -diff -up zabbix-6.0.25/src/libs/zbxvault/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxvault/Makefile.am ---- zabbix-6.0.25/src/libs/zbxvault/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-04 13:32:00.113044641 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvault.a - - libzbxvault_a_SOURCES = \ -diff -up zabbix-6.0.25/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-6.0.25/src/libs/zbxxml/Makefile.am ---- zabbix-6.0.25/src/libs/zbxxml/Makefile.am.out-of-tree 2023-12-13 01:17:17.068075476 -0700 -+++ zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-04 13:32:00.114044637 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxxml.a - - libzbxxml_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-04 13:32:00.114044637 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlogfiles.a - - libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_agent/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_agent/Makefile.am ---- zabbix-6.0.25/src/zabbix_agent/Makefile.am.out-of-tree 2023-12-13 01:17:33.232166877 -0700 -+++ zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-04 13:32:00.116044627 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - logfiles - -@@ -79,4 +81,4 @@ zabbix_agentd_CFLAGS = \ +@@ -89,9 +90,9 @@ install-bin/zabbix_agent2: bin/zabbix_agent2 + $(INSTALL) -d "$(DESTDIR)$(sbindir)" + $(INSTALL_PROGRAM) bin/zabbix_agent2 "$(DESTDIR)$(sbindir)" + $(INSTALL) -d "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)" +- $(INSTALL_DATA) conf/zabbix_agent2.conf "$(DESTDIR)$(sysconfdir)" ++ $(INSTALL_DATA) $(top_srcdir)/src/go/conf/zabbix_agent2.conf "$(DESTDIR)$(sysconfdir)" + $(INSTALL) -d "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)" +- (cd conf/zabbix_agent2.d/plugins.d && \ ++ (cd $(top_srcdir)/conf/zabbix_agent2.d/plugins.d && \ + for _f in *.conf; do \ + $(INSTALL_DATA) $${_f} "$(DESTDIR)$(AGENT2_PLUGIN_CONFIG_DIR)"; \ + done) +diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am +index b217fb5..945a673 100644 +--- a/src/zabbix_agent/Makefile.am ++++ b/src/zabbix_agent/Makefile.am +@@ -69,4 +69,4 @@ zabbix_agentd_CFLAGS = \ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(AGENT_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_get/Makefile.am ---- zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-04 13:32:00.117044623 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_get - - zabbix_get_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_java/Makefile.am ---- zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree 2023-12-13 01:17:17.072075499 -0700 -+++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-04 13:32:00.118044618 -0700 +diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am +index 43f8f19..48214c9 100644 +--- a/src/zabbix_java/Makefile.am ++++ b/src/zabbix_java/Makefile.am @@ -9,22 +9,22 @@ EXTRA_DIST = \ startup.sh @@ -695,426 +65,93 @@ diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner class: -diff -up zabbix-6.0.25/src/zabbix_js/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_js/Makefile.am ---- zabbix-6.0.25/src/zabbix_js/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-04 13:32:00.119044613 -0700 -@@ -1,26 +1,28 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_js - +diff --git a/src/zabbix_js/Makefile.am b/src/zabbix_js/Makefile.am +index 1e4fd93..2110656 100644 +--- a/src/zabbix_js/Makefile.am ++++ b/src/zabbix_js/Makefile.am +@@ -5,30 +5,30 @@ zabbix_js_SOURCES = zabbix_js.c zabbix_js_LDADD = \ - $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ -- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ - $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ - $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ - $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ - $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ -- $(top_srcdir)/src/libs/zbxsys/libzbxsys.a \ +- $(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \ +- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \ +- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ - $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ - $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ -- $(top_srcdir)/src/libs/zbxconf/libzbxconf.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxip/libzbxip.a \ +- $(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \ +- $(top_srcdir)/src/libs/zbxhash/libzbxhash.a \ - $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ - $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ - $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ -- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a +- $(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \ +- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a \ +- $(top_srcdir)/src/libs/zbxstr/libzbxstr.a \ +- $(top_srcdir)/src/libs/zbxnum/libzbxnum.a \ +- $(top_srcdir)/src/libs/zbxtime/libzbxtime.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \ +- $(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a + $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ -+ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ + $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ + $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ + $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ -+ $(top_builddir)/src/libs/zbxsys/libzbxsys.a \ ++ $(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \ ++ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \ ++ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ + $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ + $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ -+ $(top_builddir)/src/libs/zbxconf/libzbxconf.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxip/libzbxip.a \ ++ $(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \ ++ $(top_builddir)/src/libs/zbxhash/libzbxhash.a \ + $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ + $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ + $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ -+ $(top_builddir)/src/libs/zbxxml/libzbxxml.a ++ $(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \ ++ $(top_builddir)/src/libs/zbxxml/libzbxxml.a \ ++ $(top_builddir)/src/libs/zbxstr/libzbxstr.a \ ++ $(top_builddir)/src/libs/zbxnum/libzbxnum.a \ ++ $(top_builddir)/src/libs/zbxtime/libzbxtime.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \ ++ $(top_builddir)/src/libs/zbxcurl/libzbxcurl.a zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) -diff -up zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-04 13:32:00.119044613 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdatasender.a - - libzbxdatasender_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-04 13:32:00.120044609 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxheart.a - - libzbxheart_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-04 13:32:00.121044604 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-04 13:32:00.122044600 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - heart \ - housekeeper \ -@@ -112,4 +114,4 @@ install-data-hook: +diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am +index b56f8a8..44800a0 100644 +--- a/src/zabbix_proxy/Makefile.am ++++ b/src/zabbix_proxy/Makefile.am +@@ -151,4 +151,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" + test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-04 13:32:00.123044595 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxyconfig.a - - libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-04 13:32:00.125044586 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_sender/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_sender/Makefile.am ---- zabbix-6.0.25/src/zabbix_sender/Makefile.am.out-of-tree 2023-12-13 01:17:33.236166899 -0700 -+++ zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-04 13:32:00.126044581 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - bin_PROGRAMS = zabbix_sender - - zabbix_sender_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-04 13:32:00.127044576 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxalerter.a - - libzbxalerter_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/availability/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/availability/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/availability/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-04 13:32:00.128044572 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libavailability.a - - libavailability_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-04 13:32:00.128044572 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbconfig.a - - libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-04 13:32:00.129044567 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdbsyncer.a - - libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-04 13:32:00.130044563 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxdiscoverer.a - - libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-04 13:32:00.131044558 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxescalator.a - - libzbxescalator_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/ha/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/ha/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ha/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-04 13:32:00.132044553 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxha.a - - libzbxha_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-04 13:32:00.133044549 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhousekeeper.a - - libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-04 13:32:00.137044530 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxhttppoller.a - - libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-04 13:32:00.140044516 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libipmi.a - - libipmi_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/lld/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/lld/Makefile.am.out-of-tree 2023-12-13 01:17:33.244166945 -0700 -+++ zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-04 13:32:00.140044516 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxlld.a - - libzbxlld_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/Makefile.am.out-of-tree 2023-12-13 01:17:33.240166922 -0700 -+++ zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-04 13:32:00.141044512 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - SUBDIRS = \ - alerter \ - dbsyncer \ -@@ -151,4 +153,4 @@ install-data-hook: +diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am +index 0a55934..a7f6a28 100644 +--- a/src/zabbix_server/Makefile.am ++++ b/src/zabbix_server/Makefile.am +@@ -186,4 +186,4 @@ install-data-hook: $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(ALERT_SCRIPTS_PATH)" $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" -diff -up zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am.out-of-tree 2023-12-13 01:17:29.148143783 -0700 -+++ zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-04 13:32:00.142044507 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +--- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600 ++++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600 +@@ -24,7 +24,7 @@ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxodbc.a + AC_CONFIG_HEADERS(include/common/config.h) - libzbxodbc_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am.out-of-tree 2023-12-13 01:17:33.248166967 -0700 -+++ zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-04 13:32:00.143044503 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in +-AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include']) ++AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include']) -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpinger.a + AC_CANONICAL_HOST - libzbxpinger_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/poller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/poller/Makefile.am.out-of-tree 2023-12-13 01:17:33.248166967 -0700 -+++ zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-04 13:32:00.143044503 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a - - libzbxpoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 -+++ zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-04 13:32:00.144044498 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libpreprocessor.a - - libpreprocessor_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 -+++ zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-04 13:32:00.146044489 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxproxypoller.a - - libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am.out-of-tree 2023-12-13 01:17:33.252166990 -0700 -+++ zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-04 13:32:00.150044470 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxreporter.a - - libzbxreporter_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-04 13:32:00.151044466 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxscripts.a - - libzbxscripts_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-04 13:32:00.152044461 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxselfmon.a - - libzbxselfmon_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/service/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/service/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/service/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-04 13:32:00.153044456 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libservice.a - - libservice_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-04 13:32:00.157044438 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxsnmptrapper.a - - libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-04 13:32:00.157044438 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtaskmanager.a - - libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/timer/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/timer/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-04 13:32:00.158044433 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtimer.a - - libzbxtimer_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-04 13:32:00.160044424 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_server.a libzbxtrapper_proxy.a - - libzbxtrapper_a_SOURCES = \ -diff -up zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am ---- zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am.out-of-tree 2023-12-13 01:17:33.256167013 -0700 -+++ zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-04 13:32:00.160044424 -0700 -@@ -1,5 +1,7 @@ - ## Process this file with automake to produce Makefile.in - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - noinst_LIBRARIES = libzbxvmware.a - - libzbxvmware_a_SOURCES = \ diff --git a/zabbix.spec b/zabbix.spec index 5750081..8b57445 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,14 +16,34 @@ Name: zabbix Epoch: 1 -Version: 6.0.33 -Release: 2%{?dist} +Version: 7.0.3 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +# TODO - Note additional licenses in src/go when we start building with go +# src/libs/zbxembed/duktape.c: MIT License +# src/libs/zbxembed/duktape.h: MIT License +# src/libs/zbxgetopt/getopt.c: GNU General Public License v2.0 or later +# src/libs/zbxhash/md5.c: zlib License +# ui/vendor/composer/LICENSE: MIT License +# ui/js/vendors/D3/LICENSE: ISC License +# ui/js/vendors/Leaflet/LICENSE: BSD 2-Clause License +# ui/js/vendors/Leaflet.markercluster/LICENSE: MIT License +# ui/js/vendors/jQueryUI/LICENSE: MIT License +# ui/js/vendors/qrcode/LICENSE: MIT License +# ui/vendor/duosecurity/duo_universal_php/LICENSE: BSD 3-Clause License +# ui/vendor/firebase/php-jwt/LICENSE: BSD 3-Clause License +# ui/vendor/onelogin/php-saml/LICENSE: MIT License +# ui/vendor/paragonie/constant_time_encoding/LICENSE.txt: MIT License +# ui/vendor/pragmarx/google2fa/LICENSE.md: MIT License +# ui/vendor/symfony/deprecation-contracts/LICENSE: MIT License +# ui/vendor/symfony/polyfill-ctype/LICENSE: MIT License +# ui/vendor/symfony/yaml/LICENSE: MIT License +# ui/assets/styles/vendors/Leaflet/LICENSE: BSD 2-Clause License +# ui/vendor/paragonie/constant_time_encoding/src/*.php: MIT License +License: AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC URL: https://www.zabbix.com -Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -50,16 +70,14 @@ Patch0: %{srcname}-config.patch Patch1: %{srcname}-out-of-tree.patch # Enforce Fedora Crypto Policy Patch2: %{srcname}-crypto-policy.patch -Patch3: %{srcname}-configure-sscanf.patch +# Add to sscanf check +# https://support.zabbix.com/browse/ZBX-21946 +Patch3: %{srcname}-configure-sscanf.patch # Patch1 patches automake files so we need to autoreconf BuildRequires: libtool BuildRequires: make -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: mariadb-connector-c-devel -%else -BuildRequires: mysql-devel -%endif BuildRequires: libpq-devel BuildRequires: sqlite-devel BuildRequires: net-snmp-devel @@ -172,7 +190,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-mysql Requires: %{name}-server = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} @@ -185,7 +202,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-server = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-pgsql Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} @@ -223,7 +239,6 @@ Requires: %{name}-proxy = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-mysql Provides: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives %description proxy-mysql @@ -235,7 +250,6 @@ Requires: %{name}-proxy = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-pgsql Provides: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives %description proxy-pgsql @@ -247,7 +261,6 @@ Requires: %{name}-proxy = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-dbfiles-sqlite3 Provides: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): %{_sbindir}/update-alternatives -Requires(preun): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/update-alternatives %description proxy-sqlite3 @@ -264,9 +277,9 @@ Requires: php-json Requires: php-ldap Requires: php-mbstring Requires: php-xml -# jquery 3.3.1 and jquery-ui 1.12.1 in the sources +# jquery 3.6.0 and jquery-ui 1.13.2 in the sources Requires: js-jquery >= 3.6.0 -Provides: bundled(js-jquery-ui) = 1.12.1 +Provides: bundled(js-jquery-ui) = 1.13.2 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype Requires: dejavu-sans-fonts @@ -825,6 +838,10 @@ fi %files web-pgsql %changelog +* Sat Aug 24 2024 Orion Poplawski - 1:7.0.3-1 +- Update to 7.0.3 +- License changed upstream to AGPL-3.0-only, note other licenses in source + * Mon Aug 19 2024 Orion Poplawski - 1:6.0.33-2 - Use alternatives name that systemd likes for units (bz#2305855) From 22167b38b7321adfa6e37ef6f1c5ef466c7a6ae2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 25 Sep 2024 21:41:09 -0600 Subject: [PATCH 36/68] Update to 7.0.4 --- .gitignore | 1 + sources | 2 +- zabbix-crypto-policy.patch | 14 +++++++------- zabbix.spec | 5 ++++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ed37cb9..58a7a92 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ zabbix-1.8.2.tar.gz /zabbix-6.0.33.tar.gz /zabbix-7.0.2.tar.gz /zabbix-7.0.3.tar.gz +/zabbix-7.0.4.tar.gz diff --git a/sources b/sources index de4962e..d8c6cb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.3.tar.gz) = 22149415712017c2fb504972c9673623ea710842611644a934a9f555685a73e516ecbad566048b5ec05ba6404000687feee0815e7b2c8a04fb8fd154c9539671 +SHA512 (zabbix-7.0.4.tar.gz) = 4c4b05d2371a2e78c0b419e467ecb261911096b3603b52aab296aa40ab86cdb4e7006703c9aa5a63f0cfee93bc5320c402b083b45497cdd5d804ed7e774f291e diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index cf06a65..c81adb0 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -1,16 +1,16 @@ diff --git a/src/go/pkg/tls/tls.go b/src/go/pkg/tls/tls.go -index be8cf4a..e68b435 100644 +index b7ddff4..063eb02 100644 --- a/src/go/pkg/tls/tls.go +++ b/src/go/pkg/tls/tls.go -@@ -393,7 +393,7 @@ static void *tls_new_context(const char *ca_file, const char *crl_file, const ch - goto out; +@@ -406,6 +406,8 @@ static void *tls_new_context(const char *ca_file, const char *crl_file, const ch #endif + if (NULL != cipher) + ciphers = cipher; ++ else ++ ciphers = "PROFILES=SYSTEM"; -- if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) -+ if (1 != SSL_CTX_set_cipher_list(ctx, "PROFILES=SYSTEM")) + if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) goto out; - - ret = 0; diff --git a/src/libs/zbxcomms/tls_openssl.c b/src/libs/zbxcomms/tls_openssl.c index 40394a3..b2eb0f0 100644 --- a/src/libs/zbxcomms/tls_openssl.c diff --git a/zabbix.spec b/zabbix.spec index 8b57445..a7dd07e 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.0.3 +Version: 7.0.4 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Thu Sep 26 2024 Orion Poplawski - 1:7.0.4-1 +- Update to 7.0.4 + * Sat Aug 24 2024 Orion Poplawski - 1:7.0.3-1 - Update to 7.0.3 - License changed upstream to AGPL-3.0-only, note other licenses in source From 70dbeedb8a771b5a1996a037bf12430a4336d7a4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 6 Oct 2024 19:46:22 -0600 Subject: [PATCH 37/68] Fix typo in crypto policy patch that broke SSL connections --- zabbix-crypto-policy.patch | 6 +++--- zabbix.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch index c81adb0..4f9f49a 100644 --- a/zabbix-crypto-policy.patch +++ b/zabbix-crypto-policy.patch @@ -7,7 +7,7 @@ index b7ddff4..063eb02 100644 if (NULL != cipher) ciphers = cipher; + else -+ ciphers = "PROFILES=SYSTEM"; ++ ciphers = "PROFILE=SYSTEM"; if (1 != SSL_CTX_set_cipher_list(ctx, ciphers)) goto out; @@ -29,7 +29,7 @@ index 40394a3..b2eb0f0 100644 } } - else if (1 != SSL_CTX_set_cipher_list(ctx_psk, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILES=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_psk, "PROFILE=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of PSK ciphersuites:"); goto out; @@ -38,7 +38,7 @@ index 40394a3..b2eb0f0 100644 } } - else if (1 != SSL_CTX_set_cipher_list(ctx_all, ciphers)) -+ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILES=SYSTEM")) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_all, "PROFILE=SYSTEM")) { zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of all ciphersuites:"); goto out; diff --git a/zabbix.spec b/zabbix.spec index a7dd07e..0458f59 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Mon Oct 07 2024 Orion Poplawski - 1:7.0.4-2 +- Fix typo in crypto policy patch that broke SSL connections + * Thu Sep 26 2024 Orion Poplawski - 1:7.0.4-1 - Update to 7.0.4 From 4f152bb914863a6b686722bd055c947cc6d49075 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 22 Oct 2024 07:52:57 -0600 Subject: [PATCH 38/68] Update to 7.0.5 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 58a7a92..3cacd56 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.2.tar.gz /zabbix-7.0.3.tar.gz /zabbix-7.0.4.tar.gz +/zabbix-7.0.5.tar.gz diff --git a/sources b/sources index d8c6cb8..5ed4b16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.4.tar.gz) = 4c4b05d2371a2e78c0b419e467ecb261911096b3603b52aab296aa40ab86cdb4e7006703c9aa5a63f0cfee93bc5320c402b083b45497cdd5d804ed7e774f291e +SHA512 (zabbix-7.0.5.tar.gz) = 4538dd76c8c9518e2238afb67b355cdbb6a7094a6a2b9a6705d9cba0b0515ae0797e593538514469cbf74c4eed2ce142d7f815f8ad90a311cc9c1f7c92f05744 diff --git a/zabbix.spec b/zabbix.spec index 0458f59..ce6f6e5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.0.4 -Release: 2%{?dist} +Version: 7.0.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Tue Oct 22 2024 Orion Poplawski - 1:7.0.5-1 +- Update to 7.0.5 + * Mon Oct 07 2024 Orion Poplawski - 1:7.0.4-2 - Fix typo in crypto policy patch that broke SSL connections From 6ee862cdc31d4385708faa7a5fafc654f42f7357 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 30 Nov 2024 16:56:44 -0700 Subject: [PATCH 39/68] Update to 7.0.6 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3cacd56..cd93590 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.3.tar.gz /zabbix-7.0.4.tar.gz /zabbix-7.0.5.tar.gz +/zabbix-7.0.6.tar.gz diff --git a/sources b/sources index 5ed4b16..9368fb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.5.tar.gz) = 4538dd76c8c9518e2238afb67b355cdbb6a7094a6a2b9a6705d9cba0b0515ae0797e593538514469cbf74c4eed2ce142d7f815f8ad90a311cc9c1f7c92f05744 +SHA512 (zabbix-7.0.6.tar.gz) = ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa diff --git a/zabbix.spec b/zabbix.spec index ce6f6e5..7b07ec2 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.0.5 +Version: 7.0.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Sat Nov 30 2024 Orion Poplawski - 1:7.0.6-1 +- Update to 7.0.6 + * Tue Oct 22 2024 Orion Poplawski - 1:7.0.5-1 - Update to 7.0.5 From 51402e148153028b047d2e14bb819e5a363b7696 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 11 Dec 2024 20:34:19 -0700 Subject: [PATCH 40/68] Update to 7.2.0 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 13 +++++++------ zabbix.spec | 7 +++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cd93590..f70518b 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.4.tar.gz /zabbix-7.0.5.tar.gz /zabbix-7.0.6.tar.gz +/zabbix-7.2.0.tar.gz diff --git a/sources b/sources index 9368fb5..5079626 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.0.6.tar.gz) = ea74e1b45487333579cfe3c421d9467895efc3ce511fc4795b6e18950128ee9ead6599934b7dcb3aa393f32fd81847b48c61924196d111e99f26f65b620d83aa +SHA512 (zabbix-7.2.0.tar.gz) = be8f3a7f58af15ab5b0ee5e47666fdf7888937d99bbe8f491be1ab668f3812237c652f4ebbdbdcfd747a9b90fe489ffbbe2c199468ab19c618f4e3bda12cc5fb diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 901d716..170e636 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -144,14 +144,15 @@ index 0a55934..a7f6a28 100644 $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "../../conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" + test -f "$(DESTDIR)$(SERVER_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_server.conf" "$(DESTDIR)$(SERVER_CONFIG_FILE)" ---- zabbix-7.0.3/configure.ac.out-of-tree 2024-08-19 14:38:13.426482392 -0600 -+++ zabbix-7.0.3/configure.ac 2024-08-19 14:40:30.842129965 -0600 -@@ -24,7 +24,7 @@ - - AC_CONFIG_HEADERS(include/common/config.h) +diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac +--- zabbix-7.2.0/configure.ac.out-of-tree 2024-12-09 04:53:54.274588489 -0700 ++++ zabbix-7.2.0/configure.ac 2024-12-11 20:31:44.684746169 -0700 +@@ -22,7 +22,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([src/zabbix_server/server.c]) + AC_CONFIG_HEADERS([include/common/config.h]) -AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_srcdir)/include/common -I$(top_srcdir)/include']) +AC_SUBST(DEFAULT_INCLUDES, ['-I$(top_builddir)/include/common -I$(top_srcdir)/include/common -I$(top_srcdir)/include']) + AC_CANONICAL_BUILD AC_CANONICAL_HOST - diff --git a/zabbix.spec b/zabbix.spec index 7b07ec2..4cd916b 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.0.6 +Version: 7.2.0 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -43,7 +43,7 @@ Summary: Open-source monitoring solution for your IT infrastructure # ui/vendor/paragonie/constant_time_encoding/src/*.php: MIT License License: AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC URL: https://www.zabbix.com -Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.0/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.2/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Thu Dec 12 2024 Orion Poplawski - 1:7.2.0-1 +- Update to 7.2.0 + * Sat Nov 30 2024 Orion Poplawski - 1:7.0.6-1 - Update to 7.0.6 From 469b5b2420df4da39aa6330aeaece2c2a34f7fe5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 6 Jan 2025 08:16:54 -0700 Subject: [PATCH 41/68] Update to 7.2.2 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f70518b..37ce90c 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.5.tar.gz /zabbix-7.0.6.tar.gz /zabbix-7.2.0.tar.gz +/zabbix-7.2.2.tar.gz diff --git a/sources b/sources index 5079626..0136b87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.0.tar.gz) = be8f3a7f58af15ab5b0ee5e47666fdf7888937d99bbe8f491be1ab668f3812237c652f4ebbdbdcfd747a9b90fe489ffbbe2c199468ab19c618f4e3bda12cc5fb +SHA512 (zabbix-7.2.2.tar.gz) = 98e4a21c4235dee36e050cfc1506cbef5cd5c9409ee6bb3cac663346826a80dd2c59c6f5e6cfaeb770975785b19689d4775b0eee407093a12ed6f1169621aa1f diff --git a/zabbix.spec b/zabbix.spec index 4cd916b..7a24506 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.2.0 +Version: 7.2.2 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Mon Jan 06 2025 Orion Poplawski - 1:7.2.2-1 +- Update to 7.2.2 + * Thu Dec 12 2024 Orion Poplawski - 1:7.2.0-1 - Update to 7.2.0 From 33312afaccfcbe055a3f5cd72e6ad9be318ebfb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:40:04 +0000 Subject: [PATCH 42/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 7a24506..df6c876 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -838,6 +838,9 @@ fi %files web-pgsql %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:7.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 06 2025 Orion Poplawski - 1:7.2.2-1 - Update to 7.2.2 From ac9d4d8a64ccce93a960c6da079eaa165949c28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:14 +0100 Subject: [PATCH 43/68] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- zabbix.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/zabbix.spec b/zabbix.spec index df6c876..f5aae4d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -176,7 +176,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} Requires: fping Requires: traceroute -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -211,7 +210,6 @@ Zabbix server compiled to use PostgreSQL %package agent Summary: Zabbix agent Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -224,7 +222,6 @@ Summary: Zabbix proxy common files BuildArch: noarch Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-proxy-implementation = %{?epoch:%{epoch}:}%{version}-%{release} -Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -395,6 +392,11 @@ sed -i \ # Install README file install -m 0644 -p %{SOURCE16} . +# Create a sysusers.d config file +cat >zabbix.sysusers.conf < /dev/null || groupadd -r zabbix -getent passwd zabbix > /dev/null || \ - useradd -r -g zabbix -d %{_sharedstatedir}/zabbix -s /sbin/nologin \ - -c "Zabbix Monitoring System" zabbix -: %post agent %systemd_post zabbix-agent.service @@ -797,6 +795,7 @@ fi %{_unitdir}/zabbix-agent.service %{_sbindir}/zabbix_agentd %{_mandir}/man8/zabbix_agentd.8* +%{_sysusersdir}/zabbix.conf %files proxy %doc misc/snmptrap/zabbix_trap_receiver.pl @@ -838,6 +837,9 @@ fi %files web-pgsql %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:7.2.2-3 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 1:7.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 64b349486e8b4c9ed85367a96b7d692ca4f51340 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 2 Apr 2025 16:39:36 -0600 Subject: [PATCH 44/68] Update to 7.2.5 (CVE-2024-36469, CVE-2024-42325, CVE-2024-45700) --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 7 ++++--- zabbix.spec | 7 +++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 37ce90c..f7bb5b9 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.0.6.tar.gz /zabbix-7.2.0.tar.gz /zabbix-7.2.2.tar.gz +/zabbix-7.2.5.tar.gz diff --git a/sources b/sources index 0136b87..3dd08a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.2.tar.gz) = 98e4a21c4235dee36e050cfc1506cbef5cd5c9409ee6bb3cac663346826a80dd2c59c6f5e6cfaeb770975785b19689d4775b0eee407093a12ed6f1169621aa1f +SHA512 (zabbix-7.2.5.tar.gz) = a1bee511bee868f2f289518ac84f156acaf2adb5640dbb44a259359a5ffd5a8ce793504e1a25124b91eb329af16341571a2492e15720ffdda822ec05d4855a22 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 170e636..48ddc52 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -36,13 +36,14 @@ diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am index 43f8f19..48214c9 100644 --- a/src/zabbix_java/Makefile.am +++ b/src/zabbix_java/Makefile.am -@@ -9,22 +9,22 @@ EXTRA_DIST = \ +@@ -9,23 +9,23 @@ EXTRA_DIST = \ startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).jar --LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.2.9.jar:lib/logback-classic-1.2.9.jar:lib/slf4j-api-1.7.32.jar +-LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.5.16.jar:lib/logback-classic-1.5.16.jar:lib/slf4j-api-2.0.16.jar ++LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.5.16.jar:$(srcdir)/lib/logback-classic-1.5.16.jar:$(srcdir)/lib/slf4j-api-2.0.16.jar + -JUNIT = tests/junit-4.8.2.jar -+LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.2.3.jar:$(srcdir)/lib/logback-classic-1.2.3.jar:$(srcdir)/lib/slf4j-api-1.7.30.jar +JUNIT = $(srcdir)/tests/junit-4.8.2.jar ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java diff --git a/zabbix.spec b/zabbix.spec index f5aae4d..e501228 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.2.2 -Release: 3%{?dist} +Version: 7.2.5 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -837,6 +837,9 @@ fi %files web-pgsql %changelog +* Wed Apr 02 2025 Orion Poplawski - 1:7.2.5-1 +- Update to 7.2.5 (CVE-2024-36469, CVE-2024-42325, CVE-2024-45700) + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1:7.2.2-3 - Add sysusers.d config file to allow rpm to create users/groups automatically From 19a5a7ebeac8275c480361b6d3945ba28de01181 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 9 Apr 2025 12:05:05 -0500 Subject: [PATCH 45/68] Add user/group provides to -server to fix FTI --- zabbix.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index e501228..28ec6e6 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -179,6 +179,8 @@ Requires: traceroute Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +Provides: user(zabbixsrv) +Provides: group(zabbixsrv) %description server Zabbix server common files @@ -837,6 +839,9 @@ fi %files web-pgsql %changelog +* Wed Apr 09 2025 Gwyn Ciesla - 1:7.2.5-2 +- Add user/group provides to -server to fix FTI + * Wed Apr 02 2025 Orion Poplawski - 1:7.2.5-1 - Update to 7.2.5 (CVE-2024-36469, CVE-2024-42325, CVE-2024-45700) From b48bf08356b50f7952c248ffc11583f5492ffc00 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 20 Jun 2025 14:34:05 -0500 Subject: [PATCH 46/68] 7.2.9 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f7bb5b9..99c8322 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.0.tar.gz /zabbix-7.2.2.tar.gz /zabbix-7.2.5.tar.gz +/zabbix-7.2.9.tar.gz diff --git a/sources b/sources index 3dd08a8..ff7e83c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.5.tar.gz) = a1bee511bee868f2f289518ac84f156acaf2adb5640dbb44a259359a5ffd5a8ce793504e1a25124b91eb329af16341571a2492e15720ffdda822ec05d4855a22 +SHA512 (zabbix-7.2.9.tar.gz) = 72e5e9d4d87af8a3008e961009704cfdb55ac2dec8de5f2768625df3be28ab13eb0ba7a55a0b2679977dd7cec1956774d4e2e1a14aa84509d7693508c20f7c71 diff --git a/zabbix.spec b/zabbix.spec index 28ec6e6..7d6d35c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.2.5 -Release: 2%{?dist} +Version: 7.2.9 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jun 20 2025 Gwyn Ciesla - 1:7.2.9-1 +- 7.2.9 + * Wed Apr 09 2025 Gwyn Ciesla - 1:7.2.5-2 - Add user/group provides to -server to fix FTI From 8c79fb4660a948d4458f1731a0a489d8a592598a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 27 Jun 2025 11:05:18 -0500 Subject: [PATCH 47/68] 7.2.10 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99c8322..60115df 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.2.tar.gz /zabbix-7.2.5.tar.gz /zabbix-7.2.9.tar.gz +/zabbix-7.2.10.tar.gz diff --git a/sources b/sources index ff7e83c..4810340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.9.tar.gz) = 72e5e9d4d87af8a3008e961009704cfdb55ac2dec8de5f2768625df3be28ab13eb0ba7a55a0b2679977dd7cec1956774d4e2e1a14aa84509d7693508c20f7c71 +SHA512 (zabbix-7.2.10.tar.gz) = 47f18b96a4bbca410d01ee877053fb96c02e6f596aff6ad6ff976842cf695b073e050f6028952c85965b8969dc0c3c12dd2afcebb11dcb14ad44972e7a85ba52 diff --git a/zabbix.spec b/zabbix.spec index 7d6d35c..07d7381 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.2.9 +Version: 7.2.10 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jun 27 2025 Gwyn Ciesla - 1:7.2.10-1 +- 7.2.10 + * Fri Jun 20 2025 Gwyn Ciesla - 1:7.2.9-1 - 7.2.9 From f0a29a829e0f888cb72c0abaeee3e00c28fbc935 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 22 Jul 2025 10:36:04 -0500 Subject: [PATCH 48/68] 7.2.11 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 60115df..76ed428 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.5.tar.gz /zabbix-7.2.9.tar.gz /zabbix-7.2.10.tar.gz +/zabbix-7.2.11.tar.gz diff --git a/sources b/sources index 4810340..31e6d62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.10.tar.gz) = 47f18b96a4bbca410d01ee877053fb96c02e6f596aff6ad6ff976842cf695b073e050f6028952c85965b8969dc0c3c12dd2afcebb11dcb14ad44972e7a85ba52 +SHA512 (zabbix-7.2.11.tar.gz) = 6ddf058f822acbc133543dbc15253335cd48f25ccd5cf50641e9109ba3df1c98c1a211ce510f4ad3ebf9c221e7acbdb8619f3aa39c0d2d5d6e189a75b55bafcd diff --git a/zabbix.spec b/zabbix.spec index 07d7381..6ff2de1 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.2.10 +Version: 7.2.11 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Tue Jul 22 2025 Gwyn Ciesla - 1:7.2.11-1 +- 7.2.11 + * Fri Jun 27 2025 Gwyn Ciesla - 1:7.2.10-1 - 7.2.10 From ed2d2f1c814778059b3412852639050eed160db6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:15:24 +0000 Subject: [PATCH 49/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 6ff2de1..00eaf4c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:7.2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Gwyn Ciesla - 1:7.2.11-1 - 7.2.11 From d685d7ddd2fc79fec07035c0b439cf644421a34e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 31 Jul 2025 14:29:24 -0500 Subject: [PATCH 50/68] 7.4.1 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 76ed428..0168ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.9.tar.gz /zabbix-7.2.10.tar.gz /zabbix-7.2.11.tar.gz +/zabbix-7.4.1.tar.gz diff --git a/sources b/sources index 31e6d62..d0db62f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.2.11.tar.gz) = 6ddf058f822acbc133543dbc15253335cd48f25ccd5cf50641e9109ba3df1c98c1a211ce510f4ad3ebf9c221e7acbdb8619f3aa39c0d2d5d6e189a75b55bafcd +SHA512 (zabbix-7.4.1.tar.gz) = 45765f21b0e71fe435eb1957bbf1111580221a5ecfb0cf7aed280573f0751bc14cd85bfe101a1199974e9df5b430fc19c71ffc937bd235cdeaf159988efc9987 diff --git a/zabbix.spec b/zabbix.spec index 00eaf4c..afa6288 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.2.11 -Release: 2%{?dist} +Version: 7.4.1 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -43,7 +43,7 @@ Summary: Open-source monitoring solution for your IT infrastructure # ui/vendor/paragonie/constant_time_encoding/src/*.php: MIT License License: AGPL-3.0-only AND MIT AND GPL-2.0-or-later AND Zlib AND BSD-3-Clause AND BSD-2-Clause AND ISC URL: https://www.zabbix.com -Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.2/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/7.4/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Thu Jul 31 2025 Gwyn Ciesla - 1:7.4.1-1 +- 7.4.1 + * Fri Jul 25 2025 Fedora Release Engineering - 1:7.2.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 15702963d5686acf8327a309e3ab7bed26abf95c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 25 Aug 2025 10:17:41 -0500 Subject: [PATCH 51/68] 7.4.2 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0168ea0..a6ee1fe 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.10.tar.gz /zabbix-7.2.11.tar.gz /zabbix-7.4.1.tar.gz +/zabbix-7.4.2.tar.gz diff --git a/sources b/sources index d0db62f..15188c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.1.tar.gz) = 45765f21b0e71fe435eb1957bbf1111580221a5ecfb0cf7aed280573f0751bc14cd85bfe101a1199974e9df5b430fc19c71ffc937bd235cdeaf159988efc9987 +SHA512 (zabbix-7.4.2.tar.gz) = 3bf1f915c2cd5a59f1dd3afc10dd1a6e596840e576013839d6eae057cd327893f87cc5cec1d32b6a8ca8bd00735c0070327084aae01dc8d3399202f5a3e365c1 diff --git a/zabbix.spec b/zabbix.spec index afa6288..80605f7 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.1 +Version: 7.4.2 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Mon Aug 25 2025 Gwyn Ciesla - 1:7.4.2-1 +- 7.4.2 + * Thu Jul 31 2025 Gwyn Ciesla - 1:7.4.1-1 - 7.4.1 From d630adcb769de2983108d18caf65c59046fb9df2 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Tue, 26 Aug 2025 09:55:47 +0200 Subject: [PATCH 52/68] tests/DSP: use TMT intead of STI STI is being obsoleted: https://fedoraproject.org/wiki/Changes/DisableSTI Signed-off-by: Vit Mojzis --- .fmf/version | 1 + plans/dsp.fmf | 22 ++++++++++++++++++++++ tests/tests-DSP.yml | 37 ------------------------------------- 3 files changed, 23 insertions(+), 37 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/dsp.fmf delete mode 100644 tests/tests-DSP.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/dsp.fmf b/plans/dsp.fmf new file mode 100644 index 0000000..464783d --- /dev/null +++ b/plans/dsp.fmf @@ -0,0 +1,22 @@ +summary: DSP test suite +discover: + - name: DSP_test + how: fmf + url: https://pagure.io/DSP_test.git + ref: master + +execute: + how: tmt + +environment: + trigger: FedoraCI + # DSP_test specific variables: + TEST_RPM: "zabbix-selinux" + TEST_POLICY: "zabbix" + +prepare: + how: install + package: + - zabbix-selinux + - autoconf + - automake diff --git a/tests/tests-DSP.yml b/tests/tests-DSP.yml deleted file mode 100644 index 498df08..0000000 --- a/tests/tests-DSP.yml +++ /dev/null @@ -1,37 +0,0 @@ -- hosts: localhost - - roles: - - role: standard-test-beakerlib - tags: - - classic - repositories: - - repo: https://pagure.io/DSP_test.git - dest: DSP_test - version: master - - tests: - - DSP_test - environment: - # RPM package containing the policy module - TEST_RPM: zabbix-selinux - # policy module name - TEST_POLICY: zabbix - # policy sources will be extracted from corresponding .src.rpm - # policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz") - # or empty string if policy sources are not inside a tar archive - POLICY_TAR: '' - # path to policy sources (in of the tar archive) -- //.(te|if|fc) - # or path in the src.rpm if there is no tar archive -- //.(te|if|fc) - # can contain wildcards (e.g. for versions etc.) - POLICY_PATH: . - - required_packages: - - policycoreutils - - selinux-policy - - selinux-policy-targeted - - setools-console - - libselinux-utils - - rpm - - tar - - git - - zabbix-selinux From 60d93295d4dc2b01f5bbc12febcaa5f3e09489f3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Oct 2025 11:06:40 -0500 Subject: [PATCH 53/68] 7.4.3 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 18 ++++++++++-------- zabbix.spec | 5 ++++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a6ee1fe..8517a66 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.2.11.tar.gz /zabbix-7.4.1.tar.gz /zabbix-7.4.2.tar.gz +/zabbix-7.4.3.tar.gz diff --git a/sources b/sources index 15188c9..168511b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.2.tar.gz) = 3bf1f915c2cd5a59f1dd3afc10dd1a6e596840e576013839d6eae057cd327893f87cc5cec1d32b6a8ca8bd00735c0070327084aae01dc8d3399202f5a3e365c1 +SHA512 (zabbix-7.4.3.tar.gz) = ce4e9bb3ba8162c2df8c86ddee1713c296cf4deeb6fb97ee8fbc2857d550ba38c6c18305be954f8742098522f9cfca3a9fe715dc0808b549fb3390b85eb2e963 diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 48ddc52..29f7da3 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -2,14 +2,6 @@ diff --git a/src/go/Makefile.am b/src/go/Makefile.am index 3e24aa0..308e34b 100644 --- a/src/go/Makefile.am +++ b/src/go/Makefile.am -@@ -67,6 +67,7 @@ clean: clean-go-build clean-sbom - - clean-go-build: - -$(GO) clean ./... -+ -$(GO) clean $(srcdir)/... - -rm -f bin/mock_server - -rm -f bin/zabbix_agent2 - -rm -f bin/zabbix_web_service @@ -89,9 +90,9 @@ install-bin/zabbix_agent2: bin/zabbix_agent2 $(INSTALL) -d "$(DESTDIR)$(sbindir)" $(INSTALL_PROGRAM) bin/zabbix_agent2 "$(DESTDIR)$(sbindir)" @@ -157,3 +149,13 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac AC_CANONICAL_BUILD AC_CANONICAL_HOST +--- zabbix-7.4.3/src/go/Makefile.am~ 2025-10-01 09:49:27.351910250 -0500 ++++ zabbix-7.4.3/src/go/Makefile.am 2025-10-01 10:33:26.662210424 -0500 +@@ -64,6 +64,7 @@ + clean-go-build: + -$(GO) clean ./... + -$(GO) clean -cache ++ -$(GO) clean $(srcdir)/... + -rm -f bin/mock_server + -rm -f bin/zabbix_agent2 + -rm -f bin/zabbix_web_service diff --git a/zabbix.spec b/zabbix.spec index 80605f7..99cf7ff 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.2 +Version: 7.4.3 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Wed Oct 01 2025 Gwyn Ciesla - 1:7.4.3-1 +- 7.4.3 + * Mon Aug 25 2025 Gwyn Ciesla - 1:7.4.2-1 - 7.4.2 From 0808d83ad8cc7a754b46c9333cc614e7edffa07b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 29 Oct 2025 10:28:08 -0500 Subject: [PATCH 54/68] 7.4.4 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8517a66..6003b25 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.1.tar.gz /zabbix-7.4.2.tar.gz /zabbix-7.4.3.tar.gz +/zabbix-7.4.4.tar.gz diff --git a/sources b/sources index 168511b..f654b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.3.tar.gz) = ce4e9bb3ba8162c2df8c86ddee1713c296cf4deeb6fb97ee8fbc2857d550ba38c6c18305be954f8742098522f9cfca3a9fe715dc0808b549fb3390b85eb2e963 +SHA512 (zabbix-7.4.4.tar.gz) = 2a4faebe2cec1861d784115b91a7b107790d157fa37a584007e81a3c8ba334d43d7647d57d602ab07a70707e8039815df33dabb022b92b33e4d208aaba5eb894 diff --git a/zabbix.spec b/zabbix.spec index 99cf7ff..24f25bc 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.3 +Version: 7.4.4 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Wed Oct 29 2025 Gwyn Ciesla - 1:7.4.4-1 +- 7.4.4 + * Wed Oct 01 2025 Gwyn Ciesla - 1:7.4.3-1 - 7.4.3 From 0bec2cefd71e83a56ff80a9bea6446f0d16c01e1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Nov 2025 10:09:31 -0600 Subject: [PATCH 55/68] 7.4.5 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6003b25..cd8280f 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.2.tar.gz /zabbix-7.4.3.tar.gz /zabbix-7.4.4.tar.gz +/zabbix-7.4.5.tar.gz diff --git a/sources b/sources index f654b5e..ae771ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.4.tar.gz) = 2a4faebe2cec1861d784115b91a7b107790d157fa37a584007e81a3c8ba334d43d7647d57d602ab07a70707e8039815df33dabb022b92b33e4d208aaba5eb894 +SHA512 (zabbix-7.4.5.tar.gz) = 0d8dbf3b2ac79074ec929e5ae6d4435081067222f1b00bd1f0104f776ac745eb563d48f544a1b991a6202ddc2dcf8f2eb5ebe08e70c50a77923eda552ca927ef diff --git a/zabbix.spec b/zabbix.spec index 24f25bc..35f6b2f 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.4 +Version: 7.4.5 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Mon Nov 03 2025 Gwyn Ciesla - 1:7.4.5-1 +- 7.4.5 + * Wed Oct 29 2025 Gwyn Ciesla - 1:7.4.4-1 - 7.4.4 From 021eed34082f302d0997e5b0db1498dff4e5e0b4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 18 Dec 2025 14:24:08 -0600 Subject: [PATCH 56/68] 7.4.6 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd8280f..b707fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.3.tar.gz /zabbix-7.4.4.tar.gz /zabbix-7.4.5.tar.gz +/zabbix-7.4.6.tar.gz diff --git a/sources b/sources index ae771ab..4a11399 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.5.tar.gz) = 0d8dbf3b2ac79074ec929e5ae6d4435081067222f1b00bd1f0104f776ac745eb563d48f544a1b991a6202ddc2dcf8f2eb5ebe08e70c50a77923eda552ca927ef +SHA512 (zabbix-7.4.6.tar.gz) = 2f593e210409c74974395bf163be127159136eac86216443122f5d2104cb85b5b652c6f445ed7408532b894f7ddbc3f1f060465f7797326f1198d3354f48e2e9 diff --git a/zabbix.spec b/zabbix.spec index 35f6b2f..5e76c0d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.5 +Version: 7.4.6 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Thu Dec 18 2025 Gwyn Ciesla - 1:7.4.6-1 +- 7.4.6 + * Mon Nov 03 2025 Gwyn Ciesla - 1:7.4.5-1 - 7.4.5 From bfec638230a27a71c4099c9afff20fb35d37b6d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:05:21 +0000 Subject: [PATCH 57/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 5e76c0d..d1eec9c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1:7.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Dec 18 2025 Gwyn Ciesla - 1:7.4.6-1 - 7.4.6 From dcb907d6f3e1687076a2982c9484e386d78c0b9e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 23 Jan 2026 09:32:42 +0000 Subject: [PATCH 58/68] Rebuilt for net-snmp 5.9.5.2 --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index d1eec9c..00db79a 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jan 23 2026 Benjamin A. Beasley - 1:7.4.6-3 +- Rebuilt for net-snmp 5.9.5.2 + * Sat Jan 17 2026 Fedora Release Engineering - 1:7.4.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3d76032971ac359392b6f960b3814951ac4e4e32 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 13 Feb 2026 10:40:29 -0600 Subject: [PATCH 59/68] 7.4.7 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b707fa1..1db374e 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.4.tar.gz /zabbix-7.4.5.tar.gz /zabbix-7.4.6.tar.gz +/zabbix-7.4.7.tar.gz diff --git a/sources b/sources index 4a11399..bf0e732 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.6.tar.gz) = 2f593e210409c74974395bf163be127159136eac86216443122f5d2104cb85b5b652c6f445ed7408532b894f7ddbc3f1f060465f7797326f1198d3354f48e2e9 +SHA512 (zabbix-7.4.7.tar.gz) = f2e42592d89c0f7fe39cb55f70fb07211d713c36448221a78a8cf9f7b426d5c830ac51fabac09adf477a12bc2eb1cc8c361922aa94e30bc36df1fd566c1a3c3d diff --git a/zabbix.spec b/zabbix.spec index 00db79a..3f58661 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.4.6 -Release: 3%{?dist} +Version: 7.4.7 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Feb 13 2026 Gwyn Ciesla - 1:7.4.7-1 +- 7.4.7 + * Fri Jan 23 2026 Benjamin A. Beasley - 1:7.4.6-3 - Rebuilt for net-snmp 5.9.5.2 From 05e9520e065917af55b51351497210a8e64bf56e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 13 Mar 2026 10:01:20 -0500 Subject: [PATCH 60/68] 7.4.8 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1db374e..f6843f2 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.5.tar.gz /zabbix-7.4.6.tar.gz /zabbix-7.4.7.tar.gz +/zabbix-7.4.8.tar.gz diff --git a/sources b/sources index bf0e732..b77b9c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.7.tar.gz) = f2e42592d89c0f7fe39cb55f70fb07211d713c36448221a78a8cf9f7b426d5c830ac51fabac09adf477a12bc2eb1cc8c361922aa94e30bc36df1fd566c1a3c3d +SHA512 (zabbix-7.4.8.tar.gz) = 7f123690832441575ea61b4e8500f39c0ec1aa94cad18a76f3972d658239b360c78485cfd4a52e3acda51ea87ab326184d2f531b3816533e531a1b8961582404 diff --git a/zabbix.spec b/zabbix.spec index 3f58661..6a1ea7c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.7 +Version: 7.4.8 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Mar 13 2026 Gwyn Ciesla - 1:7.4.8-1 +- 7.4.8 + * Fri Feb 13 2026 Gwyn Ciesla - 1:7.4.7-1 - 7.4.7 From c26fba9f423b1ddf1334e7822da7e5f4665abab8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 9 Apr 2026 11:32:43 -0500 Subject: [PATCH 61/68] 7.4.9 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f6843f2..bbc1a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.6.tar.gz /zabbix-7.4.7.tar.gz /zabbix-7.4.8.tar.gz +/zabbix-7.4.9.tar.gz diff --git a/sources b/sources index b77b9c9..e2da8ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.8.tar.gz) = 7f123690832441575ea61b4e8500f39c0ec1aa94cad18a76f3972d658239b360c78485cfd4a52e3acda51ea87ab326184d2f531b3816533e531a1b8961582404 +SHA512 (zabbix-7.4.9.tar.gz) = 981d12923e8343f8cf189a7aa8bda88912c240e31a73eeb61517c8d7fd1db27b29e8189f7478e9bc89c550f0968a070fe6f8573abbd3f58b319b4b1779517eb0 diff --git a/zabbix.spec b/zabbix.spec index 6a1ea7c..c14d234 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.8 +Version: 7.4.9 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Thu Apr 09 2026 Gwyn Ciesla - 1:7.4.9-1 +- 7.4.9 + * Fri Mar 13 2026 Gwyn Ciesla - 1:7.4.8-1 - 7.4.8 From d887788c852bba54c7d35e2c34988a1811acea94 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 13 Apr 2026 10:03:15 -0500 Subject: [PATCH 62/68] Openssl rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index c14d234..eabbdd2 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Mon Apr 13 2026 Gwyn Ciesla - 1:7.4.9-2 +- Openssl rebuild + * Thu Apr 09 2026 Gwyn Ciesla - 1:7.4.9-1 - 7.4.9 From 793044564c02f2da77c20ae33d7796864b26a9e3 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Mon, 1 Jun 2026 19:28:49 +0200 Subject: [PATCH 63/68] plans/dsp.fmf: Update the test repo URL The test repo was migrated to github due to Pagure being retired. https://communityblog.fedoraproject.org/the-forge-is-our-new-home/ --- plans/dsp.fmf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plans/dsp.fmf b/plans/dsp.fmf index 464783d..9fefb8a 100644 --- a/plans/dsp.fmf +++ b/plans/dsp.fmf @@ -2,8 +2,8 @@ summary: DSP test suite discover: - name: DSP_test how: fmf - url: https://pagure.io/DSP_test.git - ref: master + url: https://github.com/fedora-selinux/DSP_test.git + ref: main execute: how: tmt From 307797fb4aafe50c14ac85bda0c2a9681978c766 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:09:45 -0400 Subject: [PATCH 64/68] Rebuilt for openssl 4.0 --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index eabbdd2..6d87dd5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 1:7.4.9-3 +- Rebuilt for openssl 4.0 + * Mon Apr 13 2026 Gwyn Ciesla - 1:7.4.9-2 - Openssl rebuild From 58378901e3da0d99bef1a66fe341dc80f4f86d33 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 9 Jul 2026 11:51:13 -0500 Subject: [PATCH 65/68] 7.4.12 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 182 +++++++++++++++++++-------------------- zabbix.spec | 7 +- 4 files changed, 96 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index bbc1a7b..5d9666f 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.7.tar.gz /zabbix-7.4.8.tar.gz /zabbix-7.4.9.tar.gz +/zabbix-7.4.12.tar.gz diff --git a/sources b/sources index e2da8ea..ff25d9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.9.tar.gz) = 981d12923e8343f8cf189a7aa8bda88912c240e31a73eeb61517c8d7fd1db27b29e8189f7478e9bc89c550f0968a070fe6f8573abbd3f58b319b4b1779517eb0 +SHA512 (zabbix-7.4.12.tar.gz) = 1b1711a8a03e1bf0e62397a6b97981793d241461ae72b4d866a5263017fe4f715c2a670c57fe0e219f44ee56729bd660577348c3c32be93259940d27d08e319d diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 29f7da3..b584193 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -24,99 +24,6 @@ index b217fb5..945a673 100644 $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff --git a/src/zabbix_java/Makefile.am b/src/zabbix_java/Makefile.am -index 43f8f19..48214c9 100644 ---- a/src/zabbix_java/Makefile.am -+++ b/src/zabbix_java/Makefile.am -@@ -9,23 +9,23 @@ EXTRA_DIST = \ - startup.sh - - ZJG = bin/zabbix-java-gateway-$(VERSION).jar --LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.5.16.jar:lib/logback-classic-1.5.16.jar:lib/slf4j-api-2.0.16.jar -+LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.5.16.jar:$(srcdir)/lib/logback-classic-1.5.16.jar:$(srcdir)/lib/slf4j-api-2.0.16.jar - --JUNIT = tests/junit-4.8.2.jar -+JUNIT = $(srcdir)/tests/junit-4.8.2.jar - - ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java - - all: $(ZJG) - --$(ZJG): class src/com/zabbix/gateway/*.java -- $(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java -+$(ZJG): class $(srcdir)/src/com/zabbix/gateway/*.java -+ $(JAVAC) -d class/src -classpath $(LIB) $(srcdir)/src/com/zabbix/gateway/*.java - $(JAR) cf $(ZJG) -C class/src . - - test: class - echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password - chmod 600 tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password -- $(JAVAC) tests/com/zabbix/gateway/jmx_test_beans/*.java -- $(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/gateway/*.java -+ $(JAVAC) tests/com/zabbix/gateway/jmx_$(srcdir)/test_beans/*.java -+ $(JAVAC) -d class/tests -classpath class/src:$(JUNIT) $(srcdir)/tests/com/zabbix/gateway/*.java - java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner - - class: -diff --git a/src/zabbix_js/Makefile.am b/src/zabbix_js/Makefile.am -index 1e4fd93..2110656 100644 ---- a/src/zabbix_js/Makefile.am -+++ b/src/zabbix_js/Makefile.am -@@ -5,30 +5,30 @@ - zabbix_js_SOURCES = zabbix_js.c - - zabbix_js_LDADD = \ -- $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ -- $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ -- $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ -- $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ -- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ -- $(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \ -- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \ -- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ -- $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ -- $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ -- $(top_srcdir)/src/libs/zbxip/libzbxip.a \ -- $(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \ -- $(top_srcdir)/src/libs/zbxhash/libzbxhash.a \ -- $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ -- $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ -- $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ -- $(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \ -- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a \ -- $(top_srcdir)/src/libs/zbxstr/libzbxstr.a \ -- $(top_srcdir)/src/libs/zbxnum/libzbxnum.a \ -- $(top_srcdir)/src/libs/zbxtime/libzbxtime.a \ -- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ -- $(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \ -- $(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a -+ $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ -+ $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ -+ $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ -+ $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ -+ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ -+ $(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \ -+ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \ -+ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ -+ $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ -+ $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ -+ $(top_builddir)/src/libs/zbxip/libzbxip.a \ -+ $(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \ -+ $(top_builddir)/src/libs/zbxhash/libzbxhash.a \ -+ $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ -+ $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ -+ $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ -+ $(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \ -+ $(top_builddir)/src/libs/zbxxml/libzbxxml.a \ -+ $(top_builddir)/src/libs/zbxstr/libzbxstr.a \ -+ $(top_builddir)/src/libs/zbxnum/libzbxnum.a \ -+ $(top_builddir)/src/libs/zbxtime/libzbxtime.a \ -+ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ -+ $(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \ -+ $(top_builddir)/src/libs/zbxcurl/libzbxcurl.a - - zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) - diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am index b56f8a8..44800a0 100644 --- a/src/zabbix_proxy/Makefile.am @@ -159,3 +66,92 @@ diff -up zabbix-7.2.0/configure.ac.out-of-tree zabbix-7.2.0/configure.ac -rm -f bin/mock_server -rm -f bin/zabbix_agent2 -rm -f bin/zabbix_web_service +--- a/src/zabbix_java/Makefile.am~ 2026-07-07 09:04:30.341683492 -0500 ++++ b/src/zabbix_java/Makefile.am 2026-07-09 10:47:55.481651595 -0500 +@@ -9,23 +9,23 @@ + startup.sh + + ZJG = bin/zabbix-java-gateway-$(VERSION).jar +-LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.5.16.jar:lib/logback-classic-1.5.16.jar:lib/slf4j-api-2.0.16.jar:lib/dnsjava-3.6.4.jar ++LIB = $(srcdir)lib/android-json-4.3_r3.1.jar:$(srcdir)lib/logback-core-1.5.16.jar:$(srcdir)lib/logback-classic-1.5.16.jar:$(srcdir)lib/slf4j-api-2.0.16.jar:$(srcdir)lib/dnsjava-3.6.4.jar + +-JUNIT = tests/junit-4.8.2.jar ++JUNIT = $(srcdir)tests/junit-4.8.2.jar + + ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java + + all: $(ZJG) + +-$(ZJG): class src/com/zabbix/gateway/*.java +- $(JAVAC) -d class/src -classpath $(LIB) src/com/zabbix/gateway/*.java ++$(ZJG): class $(srcdir)src/com/zabbix/gateway/*.java ++ $(JAVAC) -d class/src -classpath $(LIB) $(srcdir)src/com/zabbix/gateway/*.java + $(JAR) cf $(ZJG) -C class/src . + + test: class + echo "badger useruser" > tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password + chmod 600 tests/com/zabbix/gateway/jmx_test_beans/jmxremote.password +- $(JAVAC) tests/com/zabbix/gateway/jmx_test_beans/*.java +- $(JAVAC) -d class/tests -classpath class/src:$(JUNIT) tests/com/zabbix/gateway/*.java ++ $(JAVAC) tests/com/zabbix/gateway/jmx_$(srcdir)/test_beans/*.java ++ $(JAVAC) -d class/tests -classpath class/src:$(JUNIT) $(srcdir)tests/com/zabbix/gateway/*.java + java -classpath class/tests:$(LIB):$(ZJG):$(JUNIT) com.zabbix.gateway.AllTestRunner + + class: +--- a/src/zabbix_js/Makefile.am.orig 2026-07-09 10:49:49.036634968 -0500 ++++ b/src/zabbix_js/Makefile.am 2026-07-09 10:50:03.475753570 -0500 +@@ -5,30 +5,30 @@ + zabbix_js_SOURCES = zabbix_js.c + + zabbix_js_LDADD = \ +- $(top_srcdir)/src/libs/zbxlog/libzbxlog.a \ +- $(top_srcdir)/src/libs/zbxembed/libzbxembed.a \ +- $(top_srcdir)/src/libs/zbxjson/libzbxjson.a \ +- $(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \ +- $(top_srcdir)/src/libs/zbxthreads/libzbxthreads.a \ +- $(top_srcdir)/src/libs/zbxmutexs/libzbxmutexs.a \ +- $(top_srcdir)/src/libs/zbxprof/libzbxprof.a \ +- $(top_srcdir)/src/libs/zbxnix/libzbxnix.a \ +- $(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \ +- $(top_srcdir)/src/libs/zbxip/libzbxip.a \ +- $(top_srcdir)/src/libs/zbxgetopt/libzbxgetopt.a \ +- $(top_srcdir)/src/libs/zbxhash/libzbxhash.a \ +- $(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \ +- $(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \ +- $(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \ +- $(top_srcdir)/src/libs/zbxvariant/libzbxvariant.a \ +- $(top_srcdir)/src/libs/zbxxml/libzbxxml.a \ +- $(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \ +- $(top_srcdir)/src/libs/zbxstr/libzbxstr.a \ +- $(top_srcdir)/src/libs/zbxnum/libzbxnum.a \ +- $(top_srcdir)/src/libs/zbxtime/libzbxtime.a \ +- $(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \ +- $(top_srcdir)/src/libs/zbxbincommon/libzbxbincommon.a \ +- $(top_srcdir)/src/libs/zbxcurl/libzbxcurl.a ++ $(top_builddir)/src/libs/zbxlog/libzbxlog.a \ ++ $(top_builddir)/src/libs/zbxembed/libzbxembed.a \ ++ $(top_builddir)/src/libs/zbxjson/libzbxjson.a \ ++ $(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \ ++ $(top_builddir)/src/libs/zbxthreads/libzbxthreads.a \ ++ $(top_builddir)/src/libs/zbxmutexs/libzbxmutexs.a \ ++ $(top_builddir)/src/libs/zbxprof/libzbxprof.a \ ++ $(top_builddir)/src/libs/zbxnix/libzbxnix.a \ ++ $(top_builddir)/src/libs/zbxcomms/libzbxcomms.a \ ++ $(top_builddir)/src/libs/zbxip/libzbxip.a \ ++ $(top_builddir)/src/libs/zbxgetopt/libzbxgetopt.a \ ++ $(top_builddir)/src/libs/zbxhash/libzbxhash.a \ ++ $(top_builddir)/src/libs/zbxcrypto/libzbxcrypto.a \ ++ $(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \ ++ $(top_builddir)/src/libs/zbxhttp/libzbxhttp.a \ ++ $(top_builddir)/src/libs/zbxvariant/libzbxvariant.a \ ++ $(top_builddir)/src/libs/zbxxml/libzbxxml.a \ ++ $(top_builddir)/src/libs/zbxalgo/libzbxalgo.a \ ++ $(top_builddir)/src/libs/zbxstr/libzbxstr.a \ ++ $(top_builddir)/src/libs/zbxnum/libzbxnum.a \ ++ $(top_builddir)/src/libs/zbxtime/libzbxtime.a \ ++ $(top_builddir)/src/libs/zbxcommon/libzbxcommon.a \ ++ $(top_builddir)/src/libs/zbxbincommon/libzbxbincommon.a \ ++ $(top_builddir)/src/libs/zbxcurl/libzbxcurl.a + + zabbix_js_LDADD += @ZBXJS_LIBS@ $(LIBXML2_LIBS) + diff --git a/zabbix.spec b/zabbix.spec index 6d87dd5..5b40b6c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.4.9 -Release: 3%{?dist} +Version: 7.4.12 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Thu Jul 09 2026 Gwyn Ciesla - 1:7.4.12-1 +- 7.4.12 + * Sat Jun 13 2026 Yaakov Selkowitz - 1:7.4.9-3 - Rebuilt for openssl 4.0 From 4c30392e6451b7fa3c13277b1be77de861796ef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:37:52 +0000 Subject: [PATCH 66/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zabbix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 5b40b6c..5ba1b9f 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -17,7 +17,7 @@ Name: zabbix Epoch: 1 Version: 7.4.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1:7.4.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jul 09 2026 Gwyn Ciesla - 1:7.4.12-1 - 7.4.12 From 7f38ab7d855a374c0c60d05b9b1d46225286d444 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 20 Aug 2026 10:59:03 -0500 Subject: [PATCH 67/68] 7.4.13 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5d9666f..6372527 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.8.tar.gz /zabbix-7.4.9.tar.gz /zabbix-7.4.12.tar.gz +/zabbix-7.4.13.tar.gz diff --git a/sources b/sources index ff25d9e..8c9264b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.12.tar.gz) = 1b1711a8a03e1bf0e62397a6b97981793d241461ae72b4d866a5263017fe4f715c2a670c57fe0e219f44ee56729bd660577348c3c32be93259940d27d08e319d +SHA512 (zabbix-7.4.13.tar.gz) = 38d8971daac5583ee77fd07f9f118be70408f0e826b13b7578bf5e1866655b462807b083ad584a2c6e8e5ccfb8ce01d75cbd76867279818a3a62edc63a054ed4 diff --git a/zabbix.spec b/zabbix.spec index 5ba1b9f..79f56b8 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,8 +16,8 @@ Name: zabbix Epoch: 1 -Version: 7.4.12 -Release: 2%{?dist} +Version: 7.4.13 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure # TODO - Note additional licenses in src/go when we start building with go @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Thu Aug 20 2026 Gwyn Ciesla - 1:7.4.13-1 +- 7.4.13 + * Fri Jul 17 2026 Fedora Release Engineering - 1:7.4.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 8ae98fdd832f0821e571ad056c10504a22a9d5c5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 25 Aug 2026 10:40:22 -0500 Subject: [PATCH 68/68] 7.4.14 --- .gitignore | 1 + sources | 2 +- zabbix.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6372527..cf2dbe2 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ zabbix-1.8.2.tar.gz /zabbix-7.4.9.tar.gz /zabbix-7.4.12.tar.gz /zabbix-7.4.13.tar.gz +/zabbix-7.4.14.tar.gz diff --git a/sources b/sources index 8c9264b..5e8c08d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-7.4.13.tar.gz) = 38d8971daac5583ee77fd07f9f118be70408f0e826b13b7578bf5e1866655b462807b083ad584a2c6e8e5ccfb8ce01d75cbd76867279818a3a62edc63a054ed4 +SHA512 (zabbix-7.4.14.tar.gz) = 98b26bfcd3b1803b23d85af70094fe875d138263cabbc4f6fa5c63ea9b07c4bedaa86eeed79ede74919f55515d6c17408391ea999ed204948320dc8ec29bbdc6 diff --git a/zabbix.spec b/zabbix.spec index 79f56b8..d01b2d9 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 7.4.13 +Version: 7.4.14 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -839,6 +839,9 @@ fi %files web-pgsql %changelog +* Tue Aug 25 2026 Gwyn Ciesla - 1:7.4.14-1 +- 7.4.14 + * Thu Aug 20 2026 Gwyn Ciesla - 1:7.4.13-1 - 7.4.13