From be957d936d805db9ee4d5e4d01b7be957d5c829b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 28 Sep 2022 14:01:57 -0600 Subject: [PATCH 01/14] Initial import --- .gitignore | 1 + sources | 1 + zabbix-agent.service | 11 + zabbix-config.patch | 45 ++ zabbix-crypto-policy.patch | 30 + zabbix-fedora-epel.README | 217 +++++++ zabbix-logrotate.in | 8 + zabbix-out-of-tree.patch | 1106 ++++++++++++++++++++++++++++++++ zabbix-php-fpm.conf | 24 + zabbix-proxy-mysql.service | 11 + zabbix-proxy-pgsql.service | 11 + zabbix-proxy-sqlite3.service | 11 + zabbix-server-mysql.service | 11 + zabbix-server-pgsql.service | 11 + zabbix-tmpfiles-zabbix.conf | 1 + zabbix-tmpfiles-zabbixsrv.conf | 1 + zabbix-web.conf | 35 + zabbix.fc | 25 + zabbix.if | 199 ++++++ zabbix.te | 339 ++++++++++ zabbix6.0.spec | 799 +++++++++++++++++++++++ 21 files changed, 2897 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 zabbix-agent.service create mode 100644 zabbix-config.patch create mode 100644 zabbix-crypto-policy.patch create mode 100644 zabbix-fedora-epel.README create mode 100644 zabbix-logrotate.in create mode 100644 zabbix-out-of-tree.patch create mode 100644 zabbix-php-fpm.conf create mode 100644 zabbix-proxy-mysql.service create mode 100644 zabbix-proxy-pgsql.service create mode 100644 zabbix-proxy-sqlite3.service create mode 100644 zabbix-server-mysql.service create mode 100644 zabbix-server-pgsql.service create mode 100644 zabbix-tmpfiles-zabbix.conf create mode 100644 zabbix-tmpfiles-zabbixsrv.conf create mode 100644 zabbix-web.conf create mode 100644 zabbix.fc create mode 100644 zabbix.if create mode 100644 zabbix.te create mode 100644 zabbix6.0.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2729ffe --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/zabbix-6.0.8.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..e1a3b8c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (zabbix-6.0.8.tar.gz) = 76e3ec798b4cb4474ef6c0f936aea04cc9e15ce3aefb146e1de09b08c64559bdaa1caaa011fdfa94c23765417d8c3be3da9aa22dfb2cb403e588befa25fcc668 diff --git a/zabbix-agent.service b/zabbix-agent.service new file mode 100644 index 0000000..aeed01b --- /dev/null +++ b/zabbix-agent.service @@ -0,0 +1,11 @@ +[Unit] +Description=Zabbix Monitor Agent +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/zabbix_agentd -f +User=zabbix + +[Install] +WantedBy=multi-user.target diff --git a/zabbix-config.patch b/zabbix-config.patch new file mode 100644 index 0000000..9d58fc6 --- /dev/null +++ b/zabbix-config.patch @@ -0,0 +1,45 @@ +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-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() { +- require_once 'conf/maintenance.inc.php'; ++ require_once '/etc/zabbix/web/maintenance.inc.php'; + + 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 { + * Load zabbix config file. + */ + protected function loadConfigFile() { +- $configFile = $this->getRootDir().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 { + // 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(CConfigFile::CONFIG_FILE_PATH); + $config->config = [ + 'DB' => [ + 'TYPE' => $this->getConfig('DB_TYPE'), diff --git a/zabbix-crypto-policy.patch b/zabbix-crypto-policy.patch new file mode 100644 index 0000000..8a157ce --- /dev/null +++ b/zabbix-crypto-policy.patch @@ -0,0 +1,30 @@ +diff -up zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy zabbix-5.0.2/src/libs/zbxcrypto/tls.c +--- zabbix-5.0.2/src/libs/zbxcrypto/tls.c.crypto-policy 2020-07-06 03:54:32.000000000 -0600 ++++ zabbix-5.0.2/src/libs/zbxcrypto/tls.c 2020-07-18 21:22:13.125099598 -0600 +@@ -2932,7 +2932,7 @@ void zbx_tls_init_child(void) + goto out; + } + } +- else if (1 != SSL_CTX_set_cipher_list(ctx_cert, ciphers)) ++ else if (1 != SSL_CTX_set_cipher_list(ctx_cert, "PROFILE=SYSTEM")) + { + zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of certificate" + " ciphersuites:"); +@@ -3014,7 +3014,7 @@ void zbx_tls_init_child(void) + 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")) + { + 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) + 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")) + { + zbx_snprintf_alloc(&error, &error_alloc, &error_offset, "cannot set list of all ciphersuites:"); + goto out; diff --git a/zabbix-fedora-epel.README b/zabbix-fedora-epel.README new file mode 100644 index 0000000..38268ad --- /dev/null +++ b/zabbix-fedora-epel.README @@ -0,0 +1,217 @@ +=Custom in Fedora/EPEL= + +==Pinger files== + +Since /tmp is not a good place to spool files, the pinger files shall now reside +in /var/lib/zabbixsrv/tmp. This directory is automatically created and proxy and +server configuration files are changed accordingly from 2.0.8 on. + + +==Web configuration== + +Web configuration resides in /etc/zabbix/web. The configuration file can be +created manually or by walking through the frontend setup tool, as soon as your +httpd configuration allows. The directory also contains maintenance.inc.php! + + +==Log files== + +Log files are located in /var/log/zabbix for the agent and /var/log/zabbixsrv. +for server and proxy. + + +==No htaccess files== + +Fedora ships an Apache configuration file instead. This solutions performs +better and is easier to maintain. + + +==Two users and groups== + +There's a certain security risk involved, running agent and proxy/server as the +same user. This package therefore introduces an additional zabbixsrv user, used +for proxy and server. Please check the permissions of your scripts and group +memberships, if necessary. + + +==Using the Alternatives system instead of conflicting sub-packages== + +You can now install Zabbix proxies or servers compiled for different database +back-ends on the same system. While this is not intended to happily switch back +and forth, it allows you to: + +- Stop the daemon +- "Run alternatives --config zabbix-server" or + "alternatives --config zabbix-proxy" +- Make your choice +- If you're using systemd, run systemctl reload +- Adjust the configuration file +- Start the daemon +- In some cases you have to use "restart" instead of "start". + The reason is not yet clear to me. + +"Alternatives" considers the first installed implementation of server or proxy as +default, respectively. + +Don't forget to reconfigure the front-end when you switch the server to a +different DB implementation! + + +==How to run multiple instances of a Zabbix daemon with init scripts== + +If you want to run multiple instances on the same host, do the following: + +- Copy or symlink the init scripts +- Create a file of the same name as the new init script in /etc/sysconfig +- Define CFG_FILE="" in this file +- Create the file defined as CFG_FILE and adjust settings; in particular: + - DB settings if you set up multiple instances of server and proxy daemons; + IMPORTANT: Two daemons using the same database at the same time could act + destructive! + - PidFile + - ListenPort and/or ListenIP, if you plan for simultaneous operation; + Don't forget to review your firewall settings! + - LogFile, if you don't use syslog +- Optionally run the following to register the new instance as a service and + start it up automatically: + chkconfig --add + chkconfig on +- service start + + +==Configuration changes== + +Zabbix 2.0 and later place configuration files directly in /etc. Symlinks preserve +compatibility. maintenance.inc.php moved from /usr/share/zabbix/conf to +/etc/zabbix/web. Be careful not to replace the symlinks with files by mistake, +as the agent will not pick them up! + + +==Media scripts and external scripts== + +The directories for external scripts and media scripts have moved to +/var/lib/zabbixsrv. Symlinks preserve compatibility. + +/var/lib/zabbix is now intended for scripts run by the agent. Please move your +server or proxy scripts to /var/lib/zabbixsrv. Be sure to check permissions and +ownership. + + +==No Java bridge== + +The Zabbix Java bridge can not be included now, due to missing dependencies. + + +=SELinux= + +The settings necessary for you vary, depending on how you set up your system/s. +Most of the time, the only adjustments necessary should be on the machine that +holds the frontend: + +#Allow to connect the frontend to a database by other means than sockets +setsebool -P httpd_can_network_connect_db 1 + +#Allow the frontend to create a connection to the server listening port +#That's the check the frontend uses to see whether the server is running. +#This option effectively supersedes the previous +setsebool -P httpd_can_network_connect 1 + +Using sebools is a somewhat coarse method of allowing things. +A more fine-grained approach for the latter would be to grab an actual +avc denial from the audit log, pipe it through audit2allow, put it in a +module package and load that: + +echo "avc: denied { name_connect } for pid=20619 comm="httpd" dest=10051 scontext=system_u:system_r:httpd_t:s0 tcontext=system_u:object_r:zabbix_port_t:s0 tclass=tcp_socket" | audit2allow -M zabbix_conn_httpd; sudo semodule -i zabbix_conn_httpd.pp + +If you're using ping from the frontend: + +echo "avc: denied { setpgid } for pid=31880 comm="zabbix_server_p" scontext=system_u:system_r:zabbix_t:s0 tcontext=system_u:system_r:zabbix_t:s0 tclass=process" | audit2allow -M zabbix_ping_frontend; sudo semodule -i zabbix_ping_frontend.pp + + +=Additional packaging changes in Fedora/EPEL since 3.0= + +==Configuration files contain the actual defaults== +Previously, the defaults in the config file were replaced by settings that +are suitable for Fedora. For non-mandatory settings, the daemon would default +to the hardcoded setting though, which is confusing. To make this +obvious, the original default settings are left in place and additional lines +added instead. + +==Daemons are running in the foreground mode== +Systemd is more happy with this and it also solves the problem for the pidfile +setting, described in BZ #1220392. It is related to the above-mentioned. + +==Minimal PHP configuration== +The httpd configuration contains the minimal settings necessary to operate +the frontend. Please refer to the manual for details: +https://www.zabbix.com/documentation/3.0/manual/installation/install + +Make sure to review these settings! + + +=Additional packaging changes in Fedora/EPEL since 2.0= + +==Zabbix 2.2 conflicts 1.8 and 2.0== + +Please see the below section for the reason! + + +==Agent init script/unit file name== +For the sake of consistency between distributions, the agent init script, +respectively the systemd unit file, was renamed to zabbix-agentd -- mind the +trailing "d"! Symlinks with the old names are in place. Keep in mind, if +you created a configuration file in /etc/sysconfig, the sourced file must +the name of the init script you invoke! Consequently, if you decide to use +zabbix-agentd in the future, copy or symlink this file. + + +==zabbixsrv now has its own user group== + +zabbixsrv used to be a member of the zabbix user group. Completely fresh +installations will create the zabbixsrv group and assign it as the primary +group. If the user zabbixsrv already exists (upgrade from 2.0), the user group +is replaced. + + +==Log and lock file locations, group membership== + +All logs used to be in /var/log/zabbix. With zabbixsrv having its own +user group, the logs are now split between /var/log/zabbix for the agent and +/var/log/zabbixsrv for server and proxy. + + +=Additional packaging changes in Fedora/EPEL since 1.8= + +==Zabbix 2.0 packages conflict Zabbix 1.8; 2.2 conflicts 1.8 and 2.0== + +This measure was taken because this major version introduces various database +schema changes. A silent update would render Zabbix non-operational and possibly +break the database. Besides that, Zabbix 2.0/2.2 server only works with the +respective major versions of servers and proxies. Distributed setups must +therefore be updated at the same time to keep working. + +http://www.zabbix.com/documentation/2.0/manual/appendix/compatibility +http://www.zabbix.com/documentation/2.2/manual/appendix/compatibility + +-------------------------------------------------------------------------------- + +=Guide for upgrading to 2.2 from 2.0= + +https://www.zabbix.com/documentation/2.2/manual/installation/upgrade +https://www.zabbix.com/documentation/2.2/manual/installation/upgrade_notes_220 + +Be sure to read the upgrades notes of the latest minor release too! + +- Review all rpmnew and rpmsave files; merge where necessary +- Review permissions, ownerships and group memberships for zabbixsrv +- Migrate server and proxy logs to the new location, if you want +- Back up the Zabbix database (really!) +- Remove custom database changes, if any +- Make sure the database user has sufficing permissions + (ALTER TABLE, DROP INDEX, DROP TABLE, ...) +- Start the server +- Check the server log for progress and possible errors + The schema conversion should finish within minutes or hours + + +Volker Fröhlich volker27@gmx.at Jan 5 2013 diff --git a/zabbix-logrotate.in b/zabbix-logrotate.in new file mode 100644 index 0000000..6eeea97 --- /dev/null +++ b/zabbix-logrotate.in @@ -0,0 +1,8 @@ +/var/log/USER/zabbix_COMPONENT.log { + missingok + monthly + notifempty + compress + copytruncate + su USER USER +} diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch new file mode 100644 index 0000000..9b366ec --- /dev/null +++ b/zabbix-out-of-tree.patch @@ -0,0 +1,1106 @@ +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} + + 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,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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + + libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent +diff -up zabbix-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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + + libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent +diff -up zabbix-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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + + libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent +diff -up zabbix-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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a + + libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent +diff -up zabbix-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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + SUBDIRS = \ + logfiles + +@@ -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-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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -9,22 +9,22 @@ 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 +-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 + + 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 -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 + ++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_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@ $(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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + SUBDIRS = \ + heart \ + housekeeper \ +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + SUBDIRS = \ + alerter \ + dbsyncer \ +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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.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 + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + 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 +@@ -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-php-fpm.conf b/zabbix-php-fpm.conf new file mode 100644 index 0000000..fa38188 --- /dev/null +++ b/zabbix-php-fpm.conf @@ -0,0 +1,24 @@ +[zabbix] +user = apache +group = apache + +listen = /run/php-fpm/zabbix.sock +listen.acl_users = apache,nginx +listen.allowed_clients = 127.0.0.1 + +pm = dynamic +pm.max_children = 50 +pm.start_servers = 5 +pm.min_spare_servers = 5 +pm.max_spare_servers = 35 + +php_value[session.save_handler] = files +php_value[session.save_path] = /var/lib/php/session + +php_value[max_execution_time] = 300 +php_value[memory_limit] = 128M +php_value[post_max_size] = 16M +php_value[upload_max_filesize] = 2M +php_value[max_input_time] = 300 +php_value[max_input_vars] = 10000 +; php_value[date.timezone] = Europe/Riga diff --git a/zabbix-proxy-mysql.service b/zabbix-proxy-mysql.service new file mode 100644 index 0000000..ac9fad0 --- /dev/null +++ b/zabbix-proxy-mysql.service @@ -0,0 +1,11 @@ +[Unit] +Description=Zabbix MySQL Proxy +After=syslog.target network.target mysqld.service + +[Service] +Type=simple +ExecStart=/usr/sbin/zabbix_proxy -f +User=zabbixsrv + +[Install] +WantedBy=multi-user.target diff --git a/zabbix-proxy-pgsql.service b/zabbix-proxy-pgsql.service new file mode 100644 index 0000000..f31cbac --- /dev/null +++ b/zabbix-proxy-pgsql.service @@ -0,0 +1,11 @@ +[Unit] +Description=Zabbix PostgreSQL Proxy +After=syslog.target network.target postgresql.service + +[Service] +Type=simple +ExecStart=/usr/sbin/zabbix_proxy -f +User=zabbixsrv + +[Install] +WantedBy=multi-user.target diff --git a/zabbix-proxy-sqlite3.service b/zabbix-proxy-sqlite3.service new file mode 100644 index 0000000..703d7cd --- /dev/null +++ b/zabbix-proxy-sqlite3.service @@ -0,0 +1,11 @@ +[Unit] +Description=Zabbix SQLite3 Proxy +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/zabbix_proxy -f +User=zabbixsrv + +[Install] +WantedBy=multi-user.target diff --git a/zabbix-server-mysql.service b/zabbix-server-mysql.service new file mode 100644 index 0000000..d8d8a5a --- /dev/null +++ b/zabbix-server-mysql.service @@ -0,0 +1,11 @@ +[Unit] +Description=Zabbix Server with MySQL DB +After=syslog.target network.target mysqld.service + +[Service] +Type=simple +ExecStart=/usr/sbin/zabbix_server -f +User=zabbixsrv + +[Install] +WantedBy=multi-user.target diff --git a/zabbix-server-pgsql.service b/zabbix-server-pgsql.service new file mode 100644 index 0000000..182b7e1 --- /dev/null +++ b/zabbix-server-pgsql.service @@ -0,0 +1,11 @@ +[Unit] +Description=Zabbix Server with PostgreSQL DB +After=syslog.target network.target postgresql.service + +[Service] +Type=simple +ExecStart=/usr/sbin/zabbix_server -f +User=zabbixsrv + +[Install] +WantedBy=multi-user.target diff --git a/zabbix-tmpfiles-zabbix.conf b/zabbix-tmpfiles-zabbix.conf new file mode 100644 index 0000000..cce12dd --- /dev/null +++ b/zabbix-tmpfiles-zabbix.conf @@ -0,0 +1 @@ +D /run/zabbix 0755 zabbix zabbix - diff --git a/zabbix-tmpfiles-zabbixsrv.conf b/zabbix-tmpfiles-zabbixsrv.conf new file mode 100644 index 0000000..f3f4b90 --- /dev/null +++ b/zabbix-tmpfiles-zabbixsrv.conf @@ -0,0 +1 @@ +D /run/zabbixsrv 0755 zabbixsrv zabbixsrv - diff --git a/zabbix-web.conf b/zabbix-web.conf new file mode 100644 index 0000000..34c38b4 --- /dev/null +++ b/zabbix-web.conf @@ -0,0 +1,35 @@ +# +# Zabbix monitoring system php web frontend +# + +Alias /zabbix /usr/share/zabbix + + + Options FollowSymLinks + AllowOverride None + Require all granted + + + DirectoryIndex index.php + + + + SetHandler "proxy:unix:/run/php-fpm/zabbix.sock|fcgi://localhost" + + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + diff --git a/zabbix.fc b/zabbix.fc new file mode 100644 index 0000000..a1e3556 --- /dev/null +++ b/zabbix.fc @@ -0,0 +1,25 @@ +/etc/rc\.d/init\.d/(zabbix|zabbix-server) -- gen_context(system_u:object_r:zabbix_initrc_exec_t,s0) +/etc/rc\.d/init\.d/zabbix-agentd -- gen_context(system_u:object_r:zabbix_agent_initrc_exec_t,s0) + +/usr/bin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/bin/zabbix_agentd -- gen_context(system_u:object_r:zabbix_agent_exec_t,s0) + +/usr/sbin/zabbix_agentd -- gen_context(system_u:object_r:zabbix_agent_exec_t,s0) +/usr/sbin/zabbix_server -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_server_mysql -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_server_pgsql -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_server_sqlite3 -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_proxy -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_proxy_mysql -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_proxy_pgsql -- gen_context(system_u:object_r:zabbix_exec_t,s0) +/usr/sbin/zabbix_proxy_sqlite3 -- gen_context(system_u:object_r:zabbix_exec_t,s0) + +/var/lib/zabbix(/.*)? gen_context(system_u:object_r:zabbix_var_lib_t,s0) + +/var/lib/zabbixsrv(/.*)? gen_context(system_u:object_r:zabbix_var_lib_t,s0) +/var/lib/zabbixsrv/.*scripts(/.*)? gen_context(system_u:object_r:zabbix_script_exec_t,s0) +/var/lib/zabbixsrv/tmp(/.*)? gen_context(system_u:object_r:zabbix_tmp_t,s0) + +/var/log/zabbix.* gen_context(system_u:object_r:zabbix_log_t,s0) + +/var/run/zabbix(/.*)? gen_context(system_u:object_r:zabbix_var_run_t,s0) diff --git a/zabbix.if b/zabbix.if new file mode 100644 index 0000000..7cf8202 --- /dev/null +++ b/zabbix.if @@ -0,0 +1,199 @@ +## Distributed infrastructure monitoring + +######################################## +## +## Execute a domain transition to run zabbix. +## +## +## +## Domain allowed to transition. +## +## +# +interface(`zabbix_domtrans',` + gen_require(` + type zabbix_t, zabbix_exec_t; + ') + + domtrans_pattern($1, zabbix_exec_t, zabbix_t) +') + +######################################## +## +## Execute a domain transition to run zabbix_script. +## +## +## +## Domain allowed to transition. +## +## +# +interface(`zabbix_script_domtrans',` + gen_require(` + type zabbix_script_t, zabbix_script_exec_t; + ') + + domtrans_pattern($1, zabbix_script_exec_t, zabbix_script_t) +') + +######################################## +## +## Allow connectivity to the zabbix server +## +## +## +## Domain allowed access. +## +## +# +interface(`zabbix_tcp_connect',` + gen_require(` + type zabbix_t; + ') + + corenet_sendrecv_zabbix_agent_client_packets($1) + corenet_tcp_connect_zabbix_port($1) + corenet_tcp_recvfrom_labeled($1, zabbix_t) + corenet_tcp_sendrecv_zabbix_port($1) +') + +######################################## +## +## Allow the specified domain to read zabbix's log files. +## +## +## +## Domain allowed access. +## +## +## +# +interface(`zabbix_read_log',` + gen_require(` + type zabbix_log_t; + ') + + logging_search_logs($1) + read_files_pattern($1, zabbix_log_t, zabbix_log_t) +') + +######################################## +## +## Allow the specified domain to read zabbix's tmp files. +## +## +## +## Domain allowed access. +## +## +## +# +interface(`zabbix_read_tmp',` + gen_require(` + type zabbix_tmp_t; + ') + + files_search_tmp($1) + read_files_pattern($1, zabbix_tmp_t, zabbix_tmp_t) +') + +######################################## +## +## Allow the specified domain to append +## zabbix log files. +## +## +## +## Domain allowed access. +## +## +# +interface(`zabbix_append_log',` + gen_require(` + type zabbix_log_t; + ') + + logging_search_logs($1) + append_files_pattern($1, zabbix_log_t, zabbix_log_t) +') + +######################################## +## +## Read zabbix PID files. +## +## +## +## Domain allowed access. +## +## +# +interface(`zabbix_read_pid_files',` + gen_require(` + type zabbix_var_run_t; + ') + + files_search_pids($1) + allow $1 zabbix_var_run_t:file read_file_perms; +') + +######################################## +## +## Allow connectivity to a zabbix agent +## +## +## +## Domain allowed access. +## +## +# +interface(`zabbix_agent_tcp_connect',` + gen_require(` + type zabbix_t, zabbix_agent_t; + ') + + corenet_sendrecv_zabbix_agent_client_packets($1) + corenet_tcp_connect_zabbix_agent_port($1) + corenet_tcp_recvfrom_labeled($1, zabbix_t) + corenet_tcp_sendrecv_zabbix_agent_port($1) +') + +######################################## +## +## All of the rules required to administrate +## an zabbix environment +## +## +## +## Domain allowed access. +## +## +## +## +## The role to be allowed to manage the zabbix domain. +## +## +## +# +interface(`zabbix_admin',` + gen_require(` + type zabbix_t, zabbix_log_t, zabbix_var_run_t; + type zabbix_initrc_exec_t; + ') + + allow $1 zabbix_t:process signal_perms; + ps_process_pattern($1, zabbix_t) + tunable_policy(`deny_ptrace',`',` + allow $1 zabbix_t:process ptrace; + ') + + init_labeled_script_domtrans($1, zabbix_initrc_exec_t) + domain_system_change_exemption($1) + role_transition $2 zabbix_initrc_exec_t system_r; + allow $2 system_r; + + logging_list_logs($1) + admin_pattern($1, zabbix_log_t) + + files_list_pids($1) + admin_pattern($1, zabbix_var_run_t) +') diff --git a/zabbix.te b/zabbix.te new file mode 100644 index 0000000..273e394 --- /dev/null +++ b/zabbix.te @@ -0,0 +1,339 @@ +policy_module(zabbix, 1.6.0) + +######################################## +# +# Declarations +# + +## +##

+## Determine whether zabbix can +## connect to all TCP ports +##

+## +gen_tunable(zabbix_can_network, false) + + +## +##

+## Allow Zabbix to run su/sudo. +##

+## +gen_tunable(zabbix_run_sudo, false) + +gen_require(` + class passwd rootok; + class passwd passwd; +') + +attribute zabbix_domain; + +type zabbix_t, zabbix_domain; +type zabbix_exec_t; +init_daemon_domain(zabbix_t, zabbix_exec_t) + +type zabbix_initrc_exec_t; +init_script_file(zabbix_initrc_exec_t) + +type zabbix_agent_t, zabbix_domain; +type zabbix_agent_exec_t; +init_daemon_domain(zabbix_agent_t, zabbix_agent_exec_t) + +type zabbix_agent_initrc_exec_t; +init_script_file(zabbix_agent_initrc_exec_t) + +type zabbixd_var_lib_t; +files_type(zabbixd_var_lib_t) + +type zabbix_log_t; +logging_log_file(zabbix_log_t) + +type zabbix_tmp_t; +files_tmp_file(zabbix_tmp_t) + +type zabbix_tmpfs_t; +files_tmpfs_file(zabbix_tmpfs_t) + +type zabbix_var_lib_t; +files_type(zabbix_var_lib_t) + +type zabbix_var_run_t; +files_pid_file(zabbix_var_run_t) + +type zabbix_script_t; +type zabbix_script_exec_t; +domain_type(zabbix_script_t) +domain_entry_file(zabbix_script_t, zabbix_script_exec_t) +application_executable_file(zabbix_script_exec_t) +role system_r types zabbix_script_t; + +######################################## +# +# zabbix domain local policy +# + +allow zabbix_domain self:capability { setgid setuid }; +allow zabbix_domain self:process { getsched setpgid setsched signal_perms }; +allow zabbix_domain self:fifo_file rw_fifo_file_perms; +allow zabbix_domain self:sem create_sem_perms; +allow zabbix_domain self:shm create_shm_perms; +allow zabbix_domain self:tcp_socket { accept listen }; +allow zabbix_domain self:unix_stream_socket create_stream_socket_perms; + +kernel_read_all_sysctls(zabbix_domain) +kernel_read_network_state(zabbix_domain) + +corenet_tcp_sendrecv_generic_if(zabbix_domain) +corenet_tcp_sendrecv_generic_node(zabbix_domain) +corenet_tcp_bind_generic_node(zabbix_domain) + +corecmd_exec_shell(zabbix_domain) +corecmd_exec_bin(zabbix_domain) + +dev_read_sysfs(zabbix_domain) +dev_read_urand(zabbix_domain) + +######################################## +# +# Local policy +# + +allow zabbix_t self:capability { dac_read_search }; +allow zabbix_t self:process { setrlimit }; +allow zabbix_t self:unix_stream_socket connectto; + +manage_dirs_pattern(zabbix_t, zabbix_var_lib_t, zabbix_var_lib_t) +manage_files_pattern(zabbix_t, zabbix_var_lib_t, zabbix_var_lib_t) +manage_lnk_files_pattern(zabbix_t, zabbix_var_lib_t, zabbix_var_lib_t) +manage_sock_files_pattern(zabbix_t, zabbix_var_lib_t, zabbix_var_lib_t) +files_var_lib_filetrans(zabbix_t, zabbix_var_lib_t, dir, "zabbixsrv") + +manage_dirs_pattern(zabbix_t, zabbix_log_t, zabbix_log_t) +manage_files_pattern(zabbix_t, zabbix_log_t, zabbix_log_t) +manage_lnk_files_pattern(zabbix_t, zabbix_log_t, zabbix_log_t) +logging_log_filetrans(zabbix_t, zabbix_log_t, { dir file }) + +manage_dirs_pattern(zabbix_t, zabbix_tmp_t, zabbix_tmp_t) +manage_files_pattern(zabbix_t, zabbix_tmp_t, zabbix_tmp_t) +manage_sock_files_pattern(zabbix_t, zabbix_tmp_t, zabbix_tmp_t) +files_tmp_filetrans(zabbix_t, zabbix_tmp_t, { dir file sock_file }) + +rw_files_pattern(zabbix_t, zabbix_tmpfs_t, zabbix_tmpfs_t) +fs_tmpfs_filetrans(zabbix_t, zabbix_tmpfs_t, file) + +manage_dirs_pattern(zabbix_t, zabbix_var_run_t, zabbix_var_run_t) +manage_files_pattern(zabbix_t, zabbix_var_run_t, zabbix_var_run_t) +manage_sock_files_pattern(zabbix_t, zabbix_var_run_t, zabbix_var_run_t) +files_pid_filetrans(zabbix_t, zabbix_var_run_t, { dir file sock_file }) + +kernel_read_system_state(zabbix_t) + +corenet_all_recvfrom_unlabeled(zabbix_t) +corenet_all_recvfrom_netlabel(zabbix_t) + +corenet_sendrecv_ftp_client_packets(zabbix_t) +corenet_tcp_connect_ftp_port(zabbix_t) +corenet_tcp_sendrecv_ftp_port(zabbix_t) + +corenet_sendrecv_http_client_packets(zabbix_t) +corenet_tcp_connect_http_port(zabbix_t) +corenet_tcp_sendrecv_http_port(zabbix_t) +corenet_tcp_connect_smtp_port(zabbix_t) + +corenet_sendrecv_zabbix_server_packets(zabbix_t) +corenet_tcp_bind_zabbix_port(zabbix_t) +corenet_tcp_sendrecv_zabbix_port(zabbix_t) + +auth_use_nsswitch(zabbix_t) + +zabbix_agent_tcp_connect(zabbix_t) + +logging_send_syslog_msg(zabbix_t) + +tunable_policy(`zabbix_can_network',` + corenet_sendrecv_all_client_packets(zabbix_t) + corenet_tcp_connect_all_ports(zabbix_t) + corenet_tcp_sendrecv_all_ports(zabbix_t) +') + +tunable_policy(`zabbix_run_sudo',` + allow zabbix_t self:capability { setgid setuid sys_resource }; + allow zabbix_t self:process { setrlimit setsched }; + allow zabbix_t self:key write; + allow zabbix_t self:passwd { passwd rootok }; + + auth_rw_lastlog(zabbix_t) + auth_rw_faillog(zabbix_t) + auth_exec_chkpwd(zabbix_t) + + selinux_compute_access_vector(zabbix_t) + + systemd_write_inherited_logind_sessions_pipes(zabbix_t) + systemd_dbus_chat_logind(zabbix_t) + + xserver_exec_xauth(zabbix_t) +') + +optional_policy(` + tunable_policy(`zabbix_run_sudo',` + sudo_exec(zabbix_t) + su_exec(zabbix_t) + ') +') + +optional_policy(` + mysql_stream_connect(zabbix_t) +') + +optional_policy(` + netutils_domtrans_ping(zabbix_t) +') + +optional_policy(` + postgresql_stream_connect(zabbix_t) + postgresql_tcp_connect(zabbix_t) +') + +optional_policy(` + snmp_read_snmp_var_lib_files(zabbix_t) + snmp_read_snmp_var_lib_dirs(zabbix_t) +') + +######################################## +# +# Agent local policy +# + +allow zabbix_agent_t self:process { setrlimit }; + +manage_files_pattern(zabbix_agent_t, zabbix_log_t, zabbix_log_t) + +rw_files_pattern(zabbix_agent_t, zabbix_tmpfs_t, zabbix_tmpfs_t) +fs_tmpfs_filetrans(zabbix_agent_t, zabbix_tmpfs_t, file) + +manage_files_pattern(zabbix_agent_t, zabbix_var_run_t, zabbix_var_run_t) +files_pid_filetrans(zabbix_agent_t, zabbix_var_run_t, file) + +kernel_read_system_state(zabbix_agent_t) +kernel_read_network_state(zabbix_agent_t) + +corenet_all_recvfrom_unlabeled(zabbix_agent_t) +corenet_all_recvfrom_netlabel(zabbix_agent_t) + +corecmd_read_all_executables(zabbix_agent_t) + +corenet_sendrecv_zabbix_agent_server_packets(zabbix_agent_t) +corenet_tcp_bind_zabbix_agent_port(zabbix_agent_t) +corenet_tcp_sendrecv_zabbix_agent_port(zabbix_agent_t) + +corenet_sendrecv_ssh_client_packets(zabbix_agent_t) +corenet_tcp_connect_ssh_port(zabbix_agent_t) +corenet_tcp_sendrecv_ssh_port(zabbix_agent_t) + +corenet_sendrecv_ftp_client_packets(zabbix_agent_t) +corenet_tcp_connect_ftp_port(zabbix_agent_t) +corenet_tcp_sendrecv_ftp_port(zabbix_agent_t) + +corenet_sendrecv_http_client_packets(zabbix_agent_t) +corenet_tcp_connect_http_port(zabbix_agent_t) +corenet_tcp_sendrecv_http_port(zabbix_agent_t) + +corenet_sendrecv_innd_client_packets(zabbix_agent_t) +corenet_tcp_connect_innd_port(zabbix_agent_t) +corenet_tcp_sendrecv_innd_port(zabbix_agent_t) + +corenet_sendrecv_pop_client_packets(zabbix_agent_t) +corenet_tcp_connect_pop_port(zabbix_agent_t) +corenet_tcp_sendrecv_pop_port(zabbix_agent_t) + +corenet_sendrecv_postgresql_client_packets(zabbix_agent_t) +corenet_tcp_connect_postgresql_port(zabbix_agent_t) +corenet_tcp_sendrecv_postgresql_port(zabbix_agent_t) + +corenet_sendrecv_smtp_client_packets(zabbix_agent_t) +corenet_tcp_connect_smtp_port(zabbix_agent_t) +corenet_tcp_sendrecv_smtp_port(zabbix_agent_t) + +corenet_sendrecv_zabbix_client_packets(zabbix_agent_t) +corenet_tcp_connect_zabbix_port(zabbix_agent_t) +corenet_tcp_sendrecv_zabbix_port(zabbix_agent_t) + +corenet_tcp_connect_redis_port(zabbix_agent_t) +corenet_tcp_sendrecv_redis_port(zabbix_agent_t) + +dev_getattr_all_blk_files(zabbix_agent_t) +dev_getattr_all_chr_files(zabbix_agent_t) + +domain_read_all_domains_state(zabbix_agent_t) + +files_getattr_all_dirs(zabbix_agent_t) +files_getattr_all_files(zabbix_agent_t) +files_read_all_symlinks(zabbix_agent_t) + +fs_getattr_all_fs(zabbix_agent_t) + +auth_use_nsswitch(zabbix_agent_t) + +init_read_utmp(zabbix_agent_t) + +logging_search_logs(zabbix_agent_t) + +sysnet_dns_name_resolve(zabbix_agent_t) + +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) +') + +optional_policy(` + tunable_policy(`zabbix_run_sudo',` + sudo_exec(zabbix_agent_t) + su_exec(zabbix_agent_t) + ') +') + +optional_policy(` + dmidecode_domtrans(zabbix_agent_t) +') + +optional_policy(` + hostname_exec(zabbix_agent_t) +') + +######################################## +# +# zabbix_script_t local policy +# + +domtrans_pattern(zabbix_t, zabbix_script_exec_t, zabbix_script_t) + +allow zabbix_t zabbix_script_exec_t:dir list_dir_perms; +allow zabbix_t zabbix_script_exec_t:file ioctl; +allow zabbix_t zabbix_script_t:process signal; + +init_domtrans_script(zabbix_script_t) + +optional_policy(` + mta_send_mail(zabbix_script_t) +') + +optional_policy(` + unconfined_domain(zabbix_script_t) +') diff --git a/zabbix6.0.spec b/zabbix6.0.spec new file mode 100644 index 0000000..eaad37f --- /dev/null +++ b/zabbix6.0.spec @@ -0,0 +1,799 @@ +# TODO, maybe sometime: +# * Allow for nginx? +# * Consider using systemd's ReadWriteDirectories + +#TODO: systemctl reload seems to be necessary after switching with Alternatives +#TODO: If the DB path for a Sqlite proxy is configured wrong, it requires systemctl restart. Start doesn't work. + +%global srcname zabbix +%global with_selinux 1 +%global selinuxtype targeted +# go is needed for agent2, but there are missing deps +%bcond_with go +# Missing dependencies for the java connector +%bcond_with java +#%%global prerelease rc2 + +Name: zabbix6.0 +Version: 6.0.8 +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/6.0/zabbix-%{version}.tar.gz +Source1: %{srcname}-web.conf +Source2: %{srcname}-php-fpm.conf +Source5: %{srcname}-logrotate.in +Source9: %{srcname}-tmpfiles-zabbix.conf +# systemd units -- Alternatives switches between them (they state their dependencies) +# https://support.zabbix.com/browse/ZBXNEXT-1593 +Source10: %{srcname}-agent.service +Source11: %{srcname}-proxy-mysql.service +Source12: %{srcname}-proxy-pgsql.service +Source13: %{srcname}-proxy-sqlite3.service +Source14: %{srcname}-server-mysql.service +Source15: %{srcname}-server-pgsql.service +Source16: %{srcname}-fedora-epel.README +Source17: %{srcname}-tmpfiles-zabbixsrv.conf +Source18: %{srcname}.te +Source19: %{srcname}.if +Source20: %{srcname}.fc + +# This is not a symlink, because we don't want the webserver to possibly ever serve it. +# local rules for config files +Patch0: %{srcname}-config.patch +# Allow out-of-tree builds +# https://support.zabbix.com/browse/ZBXNEXT-6077 +Patch1: %{srcname}-out-of-tree.patch +# Enforce Fedora Crypto Policy +Patch2: %{srcname}-crypto-policy.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 +BuildRequires: openldap-devel +BuildRequires: openssl-devel +BuildRequires: gnutls-devel +BuildRequires: unixODBC-devel +BuildRequires: curl-devel +BuildRequires: OpenIPMI-devel +BuildRequires: libssh2-devel +BuildRequires: libxml2-devel +BuildRequires: libevent-devel +BuildRequires: pcre2-devel +BuildRequires: gcc +# For Agent 2 - has missing deps +%if %{with go} +BuildRequires: gcc-go +#BuildRequires: golang(github.com/alimy/mc/v2) +BuildRequires: golang(github.com/docker/go-connections) +#BuildRequires: golang(github.com/dustin/gomemcached) +BuildRequires: golang(github.com/fsnotify/fsnotify) +BuildRequires: golang(github.com/go-ldap/ldap) +#BuildRequires: golang(github.com/go-ole/go-ole) +BuildRequires: golang(github.com/go-sql-driver/mysql) +BuildRequires: golang(github.com/godbus/dbus) +#BuildRequires: golang(github.com/jackc/pgx/v4) +BuildRequires: golang(github.com/mattn/go-sqlite3) +#BuildRequires: golang(github.com/mediocregopher/radix/v3) +#BuildRequires: golang(github.com/natefinch/npipe) +#BuildRequires: golang(github.com/testcontainers/testcontainers-go) +#BuildRequires: golang(golang.org/x/sys) +%endif +BuildRequires: systemd +# Needed to determine path to link to +BuildRequires: dejavu-sans-fonts + +Requires: logrotate + +%if 0%{?with_selinux} +# This ensures that the *-selinux package and all it’s dependencies are not pulled +# into containers and other systems that do not use SELinux +Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) +%endif + +Provides: bundled(md5-deutsch) +# Could alternatively be conditional on Fedora/EL +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname} = %{version}-%{release} +Conflicts: %{srcname} < 6.0 +%endif + +%description +Zabbix is software that monitors numerous parameters of a network and the +health and integrity of servers. Zabbix uses a flexible notification mechanism +that allows users to configure e-mail based alerts for virtually any event. +This allows a fast reaction to server problems. Zabbix offers excellent +reporting and data visualization features based on the stored data. +This makes Zabbix ideal for capacity planning. + +Zabbix supports both polling and trapping. All Zabbix reports and statistics, +as well as configuration parameters are accessed through a web-based front end. +A web-based front end ensures that the status of your network and the health of +your servers can be assessed from any location. Properly configured, Zabbix can +play an important role in monitoring IT infrastructure. This is equally true +for small organizations with a few servers and for large companies with a +multitude of servers. + +%package dbfiles-mysql +Summary: Zabbix database schemas, images, data and patches +BuildArch: noarch + +%description dbfiles-mysql +Zabbix database schemas, images, data and patches necessary for creating +and/or updating MySQL databases + +%package dbfiles-pgsql +Summary: Zabbix database schemas, images, data and patches +BuildArch: noarch + +%description dbfiles-pgsql +Zabbix database schemas, images, data and patches necessary for creating +and/or updating PostgreSQL databases + +%package dbfiles-sqlite3 +Summary: Zabbix database schemas and patches +BuildArch: noarch + +%description dbfiles-sqlite3 +Zabbix database schemas and patches necessary for creating +and/or updating SQLite databases + +%package server +Summary: Zabbix server common files +BuildArch: noarch +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 + +%description server +Zabbix server common files + +%package server-mysql +Summary: Zabbix server compiled to use MySQL +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} + +%description server-mysql +Zabbix server compiled to use MySQL + +%package server-pgsql +Summary: Zabbix server compiled to use PostgreSQL +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} + +%description server-pgsql +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 + +%description agent +Zabbix agent, to be installed on monitored systems + +%package proxy +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 +Requires: fping + +%description proxy +Zabbix proxy commmon files + +%package proxy-mysql +Summary: Zabbix proxy compiled to use MySQL +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 +Zabbix proxy compiled to use MySQL + +%package proxy-pgsql +Summary: Zabbix proxy compiled to use PostgreSQL +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 +Zabbix proxy compiled to use PostgreSQL + +%package proxy-sqlite3 +Summary: Zabbix proxy compiled to use SQLite +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 +Zabbix proxy compiled to use SQLite + +%package web +Summary: Zabbix Web Frontend +BuildArch: noarch +Requires: php-bcmath +Requires: php-fpm +Requires: php-gd +Requires: php-gettext +Requires: php-json +Requires: php-ldap +Requires: php-mbstring +Requires: php-xml +# jquery 3.3.1 and jquery-ui 1.12.1 in the sources +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 +Requires: dejavu-sans-fonts +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} + +%description web +The php frontend to display the Zabbix web interface. + +%package web-mysql +Summary: Zabbix web frontend for MySQL +BuildArch: noarch +Requires: %{name}-web = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: php-mysqli +Provides: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} + +%description web-mysql +Zabbix web frontend for MySQL + +%package web-pgsql +Summary: Zabbix web frontend for PostgreSQL +BuildArch: noarch +Requires: %{name}-web = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: php-pgsql +Provides: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} + +%description web-pgsql +Zabbix web frontend for PostgreSQL + +%if %{with java} +%package -n java-%{srcname} +Summary: Zabbix Java connector +BuildArch: noarch +BuildRequires: java-devel +BuildRequires: osgi(org.junit) +BuildRequires: osgi(slf4j.api) +BuildRequires: osgi(logback) + +%description -n java-%{srcname} +Zabbix Java connector. +%endif + +%if 0%{?with_selinux} +# SELinux subpackage +%package selinux +Summary: Zabbix SELinux policy +BuildArch: noarch +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description selinux +Custom SELinux policy module +%endif + + +%prep +%setup0 -q -n %{srcname}-%{version}%{?prerelease:.%{prerelease}} +%patch0 -p1 -b .config +%patch1 -p1 -b .out-of-tree +%patch2 -p1 -b .crypto-policy +autoreconf + +# Remove bundled java libs +find -name \*.jar -delete + +# Remove prebuilt Windows binaries +rm -rf bin + +# Override creation of statically named directory for alertscripts and externalscripts +# https://support.zabbix.com/browse/ZBX-6159 +sed -i '/CURL_SSL_.*_LOCATION\|SCRIPTS_PATH/s|\${datadir}/zabbix|/var/lib/zabbixsrv|' \ + configure + +# Kill off .htaccess files, options set in SOURCE1 +find -name .htaccess -delete + +# Fix path to traceroute utility (on all Linux targets) +find database -name 'data.sql' -exec sed -i 's|/usr/bin/traceroute|/bin/traceroute|' {} \; + +# Common +# Settings with hard-coded defaults that are not suitable for Fedora +# are explicitly set, leaving the comment with the default value in place. +# Settings without hard-coded defaults are simply replaced -- be they +# comments or explicit settings! + +# Also replace the datadir placeholder that is not expanded, but effective +sed -i \ + -e '\|^# LogFileSize=.*|a LogFileSize=0' \ + -e 's|^DBUser=root|DBUser=zabbix|' \ + -e 's|^# DBSocket=.*|DBSocket=%{_sharedstatedir}/mysql/mysql.sock|' \ + -e '\|^# ExternalScripts=|a ExternalScripts=%{_sharedstatedir}/zabbixsrv/externalscripts' \ + -e '\|^# AlertScriptsPath=|a AlertScriptsPath=%{_sharedstatedir}/zabbixsrv/alertscripts' \ + -e '\|^# TmpDir=\/tmp|a TmpDir=%{_sharedstatedir}/zabbixsrv/tmp' \ + -e 's|/usr/local||' \ + -e 's|\${datadir}|/usr/share|' \ + conf/zabbix_agentd.conf conf/zabbix_proxy.conf conf/zabbix_server.conf + +# Specific +sed -i \ + -e '\|^# PidFile=.*|a PidFile=%{_rundir}/zabbix/zabbix_agentd.pid' \ + -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbix/zabbix_agentd.log|' \ + conf/zabbix_agentd.conf + +sed -i \ + -e '\|^# PidFile=.*|a PidFile=%{_rundir}/zabbixsrv/zabbix_proxy.pid' \ + -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbixsrv/zabbix_proxy.log|' \ + conf/zabbix_proxy.conf + +sed -i \ + -e '\|^# PidFile=.*|a PidFile=%{_rundir}/zabbixsrv/zabbix_server.pid' \ + -e 's|^LogFile=.*|LogFile=%{_localstatedir}/log/zabbixsrv/zabbix_server.log|' \ + conf/zabbix_server.conf + +# Install README file +install -m 0644 -p %{SOURCE16} . + + +%build + +common_flags=" + --enable-dependency-tracking + --enable-proxy + --enable-ipv6 + --with-net-snmp + --with-ldap + --with-libcurl + --with-openipmi + --with-unixodbc + --with-ssh2 + --with-libxml2 + --with-libevent + --with-libpcre2 + --with-openssl +" +# Setup out of tree builds +%global _configure ../configure + +%if %{with java} +export CLASSPATH=$(build-classpath junit slf4j-api logback-core logback-classic android-json) +%endif + +# Frontend doesn't work for SQLite, thus don't build server +mkdir -p build-frontend +cd build-frontend +%configure $common_flags --enable-agent --with-sqlite3 %{?with_go:--enable-agent2} %{?with_java:--enable-java} +%make_build +cd - + +mkdir -p build-server-mysql +cd build-server-mysql +%configure $common_flags --with-mysql --enable-server +%make_build +cd - + +mkdir -p build-server-postgresql +cd build-server-postgresql +%configure $common_flags --with-postgresql --enable-server +%make_build +cd - + +%if 0%{?with_selinux} +# SELinux policy (originally from selinux-policy-contrib) +# this policy module will override the production module +mkdir selinux +cp -p %{SOURCE18} selinux/ +cp -p %{SOURCE19} selinux/ +cp -p %{SOURCE20} selinux/ + +make -f %{_datadir}/selinux/devel/Makefile %{srcname}.pp +bzip2 -9 %{srcname}.pp +%endif + + +%install +# Install binaries +%make_install -C build-frontend +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_sqlite3} +%make_install -C build-server-mysql +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_mysql} +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_server{,_mysql} +%make_install -C build-server-postgresql +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy{,_pgsql} +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_server{,_pgsql} + +# Ghosted alternatives +touch $RPM_BUILD_ROOT%{_sbindir}/zabbix_{proxy,server} + +# Home directory for the agent; +# The other home directory is created during installation +mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/zabbix + +# Log directories +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbix +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbixsrv + +# systemd tmpfiles +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d +install -m 0644 -p %{SOURCE9} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix.conf +install -m 0644 -p %{SOURCE17} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf +mkdir -p $RPM_BUILD_ROOT%{_rundir} +install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbix/ +install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbixsrv/ + +# Install the frontend after removing backup files from patching +find ui -name '*.orig' -delete +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{srcname} +cp -a ui/* $RPM_BUILD_ROOT%{_datadir}/%{srcname}/ + +# Prepare ghosted config file +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web +touch $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php + +# Replace bundled font +[ -d %{_fontbasedir}/dejavu ] && + ln -sf ../../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/assets/fonts/ +[ -d %{_fontbasedir}/dejavu-sans-fonts ] && + ln -sf ../../../fonts/dejavu-sans-fonts/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/assets/fonts/ + +# Replace JS libraries +# There is no jquery-ui package yet +ln -sf ../../../javascript/jquery/3/jquery.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery.js +#ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery-ui.js + +# This file is used to switch the frontend to maintenance mode +mv $RPM_BUILD_ROOT%{_datadir}/%{srcname}/conf/maintenance.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/maintenance.inc.php || : + +# Drop Apache config file in place +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d +install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{srcname}.conf + +# Drop php-fpm config file in place +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d +install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/%{srcname}.conf + +# Install log rotation +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +sed -e 's|COMPONENT|agentd|g; s|USER|zabbix|g' %{SOURCE5} > \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent +sed -e 's|COMPONENT|server|g; s|USER|zabbixsrv|g' %{SOURCE5} > \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server +sed -e 's|COMPONENT|proxy|g; s|USER|zabbixsrv|g' %{SOURCE5} > \ + $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy + +# Install different systemd units because of the requirements for DBMS daemons +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -m 0644 -p %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent.service +install -m 0644 -p %{SOURCE11} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-mysql.service +install -m 0644 -p %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-pgsql.service +install -m 0644 -p %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy-sqlite3.service +install -m 0644 -p %{SOURCE14} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server-mysql.service +install -m 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server-pgsql.service + +# Ghosted alternatives +touch $RPM_BUILD_ROOT%{_unitdir}/zabbix-server.service +touch $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy.service + +# Directory for fping spooling files +mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/zabbixsrv/tmp + +# Install sql files +for db in postgresql mysql; do + mkdir $RPM_BUILD_ROOT%{_datadir}/%{srcname}-$db + cp -p database/$db/*.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-$db +done + +install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{srcname}-sqlite3 +cp -p database/sqlite3/schema.sql $RPM_BUILD_ROOT%{_datadir}/%{srcname}-sqlite3 + +%if 0%{?with_selinux} +install -D -m 0644 %{srcname}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{srcname}.pp.bz2 +install -D -p -m 0644 selinux/%{srcname}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{srcname}.if +%endif + + +%post server +%systemd_post zabbix-server.service + +if [ $1 -gt 1 ] ; then + # Apply permissions also in *.rpmnew upgrades from old permissive ones + chmod 0640 %{_sysconfdir}/zabbix_server.conf + chown root:zabbixsrv %{_sysconfdir}/zabbix_server.conf +fi +: + +%post server-mysql +%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ + %{srcname}-server %{_sbindir}/%{srcname}_server_mysql 10 \ + --slave %{_unitdir}/zabbix-server.service %{srcname}-server-systemd \ + %{_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 \ + %{_unitdir}/zabbix-server-pgsql.service + +%post proxy +%systemd_post zabbix-proxy.service + +if [ $1 -gt 1 ] ; then + # Apply permissions also in *.rpmnew upgrades from old permissive ones + chmod 0640 %{_sysconfdir}/zabbix_proxy.conf + chown root:zabbixsrv %{_sysconfdir}/zabbix_proxy.conf +fi +: + +%post proxy-mysql +%{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ + %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql 10 \ + --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ + %{_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 \ + %{_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 \ + %{_unitdir}/zabbix-proxy-sqlite3.service + +%if 0%{?with_selinux} +# SELinux contexts are saved so that only affected files can be +# relabeled after the policy module installation +%pre selinux +%selinux_relabel_pre -s %{selinuxtype} + +%post selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{srcname}.pp.bz2 + +%postun selinux +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{name} +fi + +%posttrans selinux +%selinux_relabel_post -s %{selinuxtype} +%endif + +%pre agent +getent group zabbix > /dev/null || groupadd -r zabbix +getent passwd zabbix > /dev/null || \ + useradd -r -g zabbix -d %{_sharedstatedir}/zabbix -s /sbin/nologin \ + -c "Zabbix Monitoring System" zabbix +: + +%post agent +%systemd_post zabbix-agent.service + +%pre server +getent group zabbixsrv > /dev/null || groupadd -r zabbixsrv +# The zabbixsrv group is introduced by 2.2 packaging +# The zabbixsrv user was a member of the zabbix group in 2.0 +if getent passwd zabbixsrv > /dev/null; then + if [[ $(id -gn zabbixsrv) == "zabbix" ]]; then + usermod -c "Zabbix Monitoring System -- Proxy or server" -g zabbixsrv zabbixsrv + fi +else + useradd -r -g zabbixsrv -d %{_sharedstatedir}/zabbixsrv -s /sbin/nologin \ + -c "Zabbix Monitoring System -- Proxy or server" zabbixsrv +fi +: + +%preun server + %systemd_preun zabbix-server.service + +%pre proxy +getent group zabbixsrv > /dev/null || groupadd -r zabbixsrv +# The zabbixsrv group is introduced by 2.2 packaging +# The zabbixsrv user was a member of the zabbix group in 2.0 +if getent passwd zabbixsrv > /dev/null; then + if [[ $(id -gn zabbixsrv) == "zabbix" ]]; then + usermod -c "Zabbix Monitoring System -- Proxy or server" -g zabbixsrv zabbixsrv + fi +else + useradd -r -g zabbixsrv -d %{_sharedstatedir}/zabbixsrv -s /sbin/nologin \ + -c "Zabbix Monitoring System -- Proxy or server" zabbixsrv +fi +: + +%preun proxy +%systemd_preun zabbix-proxy.service + +%preun agent +%systemd_preun zabbix-agent.service + +%postun server +%systemd_postun_with_restart zabbix-server.service + +%postun server-mysql +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{srcname}-server %{_sbindir}/%{srcname}_server_mysql +fi + +%postun server-pgsql +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql +fi + +%postun proxy +%systemd_postun_with_restart zabbix-proxy.service + +%postun proxy-mysql +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql +fi + +%postun proxy-pgsql +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql +fi + +%postun proxy-sqlite3 +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 +fi + +%postun agent +%systemd_postun_with_restart zabbix-agent.service + + +%files +%license COPYING +%doc AUTHORS ChangeLog NEWS README zabbix-fedora-epel.README +%dir %{_sysconfdir}/%{srcname} +%config(noreplace) %{_sysconfdir}/zabbix_agentd.conf +%{_bindir}/zabbix_get +%{_bindir}/zabbix_js +%{_bindir}/zabbix_sender +%{_mandir}/man1/zabbix_get.1* +%{_mandir}/man1/zabbix_sender.1* + +%files dbfiles-mysql +%license COPYING +%{_datadir}/%{srcname}-mysql/ + +%files dbfiles-pgsql +%license COPYING +%{_datadir}/%{srcname}-postgresql/ + +%files dbfiles-sqlite3 +%license COPYING +%{_datadir}/%{srcname}-sqlite3/ + +%files server +%doc misc/snmptrap/zabbix_trap_receiver.pl +%attr(0755,zabbixsrv,zabbixsrv) %dir %{_rundir}/zabbixsrv/ +%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf +%attr(0640,root,zabbixsrv) %config(noreplace) %{_sysconfdir}/zabbix_server.conf +%attr(0775,root,zabbixsrv) %dir %{_localstatedir}/log/zabbixsrv +%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server +%ghost %{_sbindir}/zabbix_server +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/tmp +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/alertscripts +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/externalscripts +%ghost %{_unitdir}/zabbix-server.service +%{_mandir}/man8/zabbix_server.8* + +%files server-mysql +%{_sbindir}/zabbix_server_mysql +%{_unitdir}/zabbix-server-mysql.service + +%files server-pgsql +%{_sbindir}/zabbix_server_pgsql +%{_unitdir}/zabbix-server-pgsql.service + +%if 0%{?with_selinux} +%files selinux +%{_datadir}/selinux/packages/%{selinuxtype}/%{srcname}.pp.* +%{_datadir}/selinux/devel/include/distributed/%{srcname}.if +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name} +%endif + +%files agent +%doc conf/zabbix_agentd/*.conf +%attr(0755,zabbix,zabbix) %dir %{_rundir}/zabbix/ +%{_prefix}/lib/tmpfiles.d/zabbix.conf +%attr(0775,root,zabbix) %dir %{_localstatedir}/log/zabbix +%config(noreplace) %{_sysconfdir}/zabbix_agentd.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent +%attr(750,zabbix,zabbix) %dir %{_sharedstatedir}/zabbix +%{_unitdir}/zabbix-agent.service +%{_sbindir}/zabbix_agentd +%{_mandir}/man8/zabbix_agentd.8* + +%files proxy +%doc misc/snmptrap/zabbix_trap_receiver.pl +%attr(0755,zabbixsrv,zabbixsrv) %dir %{_rundir}/zabbixsrv/ +%{_prefix}/lib/tmpfiles.d/zabbixsrv.conf +%attr(0640,root,zabbixsrv) %config(noreplace) %{_sysconfdir}/zabbix_proxy.conf +%attr(0775,root,zabbixsrv) %dir %{_localstatedir}/log/zabbixsrv +%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy +%ghost %{_sbindir}/zabbix_proxy +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/tmp +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/alertscripts +%attr(0750,zabbixsrv,zabbixsrv) %dir %{_sharedstatedir}/zabbixsrv/externalscripts +%ghost %{_unitdir}/zabbix-proxy.service +%{_mandir}/man8/zabbix_proxy.8* + +%files proxy-mysql +%{_sbindir}/zabbix_proxy_mysql +%{_unitdir}/zabbix-proxy-mysql.service + +%files proxy-pgsql +%{_sbindir}/zabbix_proxy_pgsql +%{_unitdir}/zabbix-proxy-pgsql.service + +%files proxy-sqlite3 +%{_sbindir}/zabbix_proxy_sqlite3 +%{_unitdir}/zabbix-proxy-sqlite3.service + +%files web +%dir %attr(0750,apache,apache) %{_sysconfdir}/%{srcname}/web +%ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/zabbix.conf.php +%attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/maintenance.inc.php +%config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf +%config(noreplace) %{_sysconfdir}/php-fpm.d/zabbix.conf +%{_datadir}/%{srcname}/ + +%files web-mysql + +%files web-pgsql + +%changelog +* Wed Sep 14 2022 Orion Poplawski - 6.0.8-1 +- Build for EPEL From e18fae44a129e2959ec6e0037c36d2c397831bff Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 17 Feb 2023 15:26:02 -0700 Subject: [PATCH 02/14] 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 Fix up alternatives scripts to allow better upgrades from other zabbix packages --- .gitignore | 2 + sources | 2 +- zabbix-out-of-tree.patch | 573 ++++++++++++++++++++------------------- zabbix.te | 9 + zabbix6.0.spec | 134 +++++++-- 5 files changed, 414 insertions(+), 306 deletions(-) diff --git a/.gitignore b/.gitignore index 2729ffe..2cd5c04 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /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 e1a3b8c..5e0073f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.8.tar.gz) = 76e3ec798b4cb4474ef6c0f936aea04cc9e15ce3aefb146e1de09b08c64559bdaa1caaa011fdfa94c23765417d8c3be3da9aa22dfb2cb403e588befa25fcc668 +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.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) ') diff --git a/zabbix6.0.spec b/zabbix6.0.spec index eaad37f..7e401d4 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -12,16 +12,18 @@ %bcond_with go # Missing dependencies for the java connector %bcond_with java + +%global majver 6.0 #%%global prerelease rc2 -Name: zabbix6.0 -Version: 6.0.8 +Name: zabbix%{majver} +Version: 6.0.13 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/6.0/zabbix-%{version}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/stable/%{majver}/zabbix-%{version}.tar.gz Source1: %{srcname}-web.conf Source2: %{srcname}-php-fpm.conf Source5: %{srcname}-logrotate.in @@ -105,7 +107,8 @@ Provides: bundled(md5-deutsch) # Could alternatively be conditional on Fedora/EL %if "x%{?srcname}" != "x%{name}" Provides: %{srcname} = %{version}-%{release} -Conflicts: %{srcname} < 6.0 +Obsoletes: %{srcname} = 6.0.6 +Conflicts: %{srcname} < %{majver} %endif %description @@ -125,24 +128,39 @@ for small organizations with a few servers and for large companies with a multitude of servers. %package dbfiles-mysql -Summary: Zabbix database schemas, images, data and patches -BuildArch: noarch +Summary: Zabbix database schemas, images, data and patches +BuildArch: noarch +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-dbfiles-mysql = %{version}-%{release} +Obsoletes: %{srcname}-dbfiles-mysql = 6.0.6 +Conflicts: %{srcname}-dbfiles-mysql < %{majver} +%endif %description dbfiles-mysql Zabbix database schemas, images, data and patches necessary for creating and/or updating MySQL databases %package dbfiles-pgsql -Summary: Zabbix database schemas, images, data and patches -BuildArch: noarch +Summary: Zabbix database schemas, images, data and patches +BuildArch: noarch +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-dbfiles-pgsql = %{version}-%{release} +Obsoletes: %{srcname}-dbfiles-pgsql = 6.0.6 +Conflicts: %{srcname}-dbfiles-pgsql < %{majver} +%endif %description dbfiles-pgsql Zabbix database schemas, images, data and patches necessary for creating and/or updating PostgreSQL databases %package dbfiles-sqlite3 -Summary: Zabbix database schemas and patches -BuildArch: noarch +Summary: Zabbix database schemas and patches +BuildArch: noarch +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-dbfiles-sqlite3 = %{version}-%{release} +Obsoletes: %{srcname}-dbfiles-sqlite3 = 6.0.6 +Conflicts: %{srcname}-dbfiles-sqlite3 < %{majver} +%endif %description dbfiles-sqlite3 Zabbix database schemas and patches necessary for creating @@ -159,6 +177,11 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-server = %{version}-%{release} +Obsoletes: %{srcname}-server = 6.0.6 +Conflicts: %{srcname}-server < %{majver} +%endif %description server Zabbix server common files @@ -168,10 +191,14 @@ Summary: Zabbix server compiled to use MySQL 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(posttrans): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-server-mysql = %{version}-%{release} +Obsoletes: %{srcname}-server-mysql = 6.0.6 +Conflicts: %{srcname}-server-mysql < %{majver} +%endif %description server-mysql Zabbix server compiled to use MySQL @@ -181,10 +208,14 @@ Summary: Zabbix server compiled to use PostgreSQL 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(posttrans): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: %{name}-server-implementation = %{?epoch:%{epoch}:}%{version}-%{release} +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-server-pgsql = %{version}-%{release} +Obsoletes: %{srcname}-server-pgsql = 6.0.6 +Conflicts: %{srcname}-server-pgsql < %{majver} +%endif %description server-pgsql Zabbix server compiled to use PostgreSQL @@ -196,6 +227,11 @@ Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-agent = %{version}-%{release} +Obsoletes: %{srcname}-agent = 6.0.6 +Conflicts: %{srcname}-agent < %{majver} +%endif %description agent Zabbix agent, to be installed on monitored systems @@ -210,6 +246,11 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires: fping +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-proxy = %{version}-%{release} +Obsoletes: %{srcname}-proxy = 6.0.6 +Conflicts: %{srcname}-proxy < %{majver} +%endif %description proxy Zabbix proxy commmon files @@ -219,9 +260,13 @@ Summary: Zabbix proxy compiled to use MySQL 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(posttrans): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-proxy-mysql = %{version}-%{release} +Obsoletes: %{srcname}-proxy-mysql = 6.0.6 +Conflicts: %{srcname}-proxy-mysql < %{majver} +%endif %description proxy-mysql Zabbix proxy compiled to use MySQL @@ -231,9 +276,13 @@ Summary: Zabbix proxy compiled to use PostgreSQL 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(posttrans): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-proxy-pgsql = %{version}-%{release} +Obsoletes: %{srcname}-proxy-pgsql = 6.0.6 +Conflicts: %{srcname}-proxy-pgsql < %{majver} +%endif %description proxy-pgsql Zabbix proxy compiled to use PostgreSQL @@ -243,9 +292,13 @@ Summary: Zabbix proxy compiled to use SQLite 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(posttrans): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-proxy-sqlite3 = %{version}-%{release} +Obsoletes: %{srcname}-proxy-sqlite3 = 6.0.6 +Conflicts: %{srcname}-proxy-sqlite3 < %{majver} +%endif %description proxy-sqlite3 Zabbix proxy compiled to use SQLite @@ -269,6 +322,11 @@ Provides: bundled(js-jquery-ui) = 1.12.1 Requires: dejavu-sans-fonts Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-web = %{version}-%{release} +Obsoletes: %{srcname}-web = 6.0.6 +Conflicts: %{srcname}-web < %{majver} +%endif %description web The php frontend to display the Zabbix web interface. @@ -279,6 +337,11 @@ BuildArch: noarch Requires: %{name}-web = %{?epoch:%{epoch}:}%{version}-%{release} Requires: php-mysqli Provides: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-web-mysql = %{version}-%{release} +Obsoletes: %{srcname}-web-mysql = 6.0.6 +Conflicts: %{srcname}-web-mysql < %{majver} +%endif %description web-mysql Zabbix web frontend for MySQL @@ -289,6 +352,11 @@ BuildArch: noarch Requires: %{name}-web = %{?epoch:%{epoch}:}%{version}-%{release} Requires: php-pgsql Provides: %{name}-web-database = %{?epoch:%{epoch}:}%{version}-%{release} +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-web-pgsql = %{version}-%{release} +Obsoletes: %{srcname}-web-pgsql = 6.0.6 +Conflicts: %{srcname}-web-pgsql < %{majver} +%endif %description web-pgsql Zabbix web frontend for PostgreSQL @@ -301,6 +369,11 @@ BuildRequires: java-devel BuildRequires: osgi(org.junit) BuildRequires: osgi(slf4j.api) BuildRequires: osgi(logback) +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-java = %{version}-%{release} +Obsoletes: %{srcname}-java = 6.0.6 +Conflicts: %{srcname}-java < %{majver} +%endif %description -n java-%{srcname} Zabbix Java connector. @@ -315,6 +388,11 @@ Requires: selinux-policy-%{selinuxtype} Requires(post): selinux-policy-%{selinuxtype} BuildRequires: selinux-policy-devel %{?selinux_requires} +%if "x%{?srcname}" != "x%{name}" +Provides: %{srcname}-selinux = %{version}-%{release} +Obsoletes: %{srcname}-selinux = 6.0.6 +Conflicts: %{srcname}-selinux < %{majver} +%endif %description selinux Custom SELinux policy module @@ -550,13 +628,13 @@ if [ $1 -gt 1 ] ; then fi : -%post server-mysql +%posttrans server-mysql %{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ %{srcname}-server %{_sbindir}/%{srcname}_server_mysql 10 \ --slave %{_unitdir}/zabbix-server.service %{srcname}-server-systemd \ %{_unitdir}/zabbix-server-mysql.service -%post server-pgsql +%posttrans server-pgsql %{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_server \ %{srcname}-server %{_sbindir}/%{srcname}_server_pgsql 10 \ --slave %{_unitdir}/zabbix-server.service %{srcname}-server-systemd \ @@ -572,19 +650,19 @@ if [ $1 -gt 1 ] ; then fi : -%post proxy-mysql +%posttrans proxy-mysql %{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_mysql 10 \ --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ %{_unitdir}/zabbix-proxy-mysql.service -%post proxy-pgsql +%posttrans proxy-pgsql %{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_pgsql 10 \ --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ %{_unitdir}/zabbix-proxy-pgsql.service -%post proxy-sqlite3 +%posttrans proxy-sqlite3 %{_sbindir}/update-alternatives --install %{_sbindir}/%{srcname}_proxy \ %{srcname}-proxy %{_sbindir}/%{srcname}_proxy_sqlite3 10 \ --slave %{_unitdir}/zabbix-proxy.service %{srcname}-proxy-systemd \ @@ -795,5 +873,11 @@ fi %files web-pgsql %changelog +* Fri Feb 17 2023 Orion Poplawski - 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 +- Fix up alternatives scripts to allow better upgrades from other zabbix packages + * Wed Sep 14 2022 Orion Poplawski - 6.0.8-1 - Build for EPEL From 4ef55388127deae13449bce69e51efa80e823e0f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 27 Feb 2023 11:40:06 -0700 Subject: [PATCH 03/14] Fix builds for EPEL 7 --- zabbix6.0.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/zabbix6.0.spec b/zabbix6.0.spec index 7e401d4..1e982ea 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -59,7 +59,11 @@ BuildRequires: mariadb-connector-c-devel %else BuildRequires: mysql-devel %endif -BuildRequires: libpq-devel +%if 0%{?el7} +BuildRequires: postgresql-devel +%else +BuildRequires: libpq-devel +%endif BuildRequires: sqlite-devel BuildRequires: net-snmp-devel BuildRequires: openldap-devel @@ -100,8 +104,12 @@ Requires: logrotate %if 0%{?with_selinux} # This ensures that the *-selinux package and all it’s dependencies are not pulled # into containers and other systems that do not use SELinux +%if 0%{?el7} +Requires: %{name}-selinux +%else Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) %endif +%endif Provides: bundled(md5-deutsch) # Could alternatively be conditional on Fedora/EL @@ -314,8 +322,12 @@ 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.12.1 in the sources +%if 0%{?el7} +Provides: bundled(js-jquery) = 3.6.0 +%else Requires: js-jquery >= 3.6.0 +%endif Provides: bundled(js-jquery-ui) = 1.12.1 # prototype 1.6.1 in the sources, Fedora package is dead #Requires: prototype @@ -481,6 +493,10 @@ common_flags=" # Setup out of tree builds %global _configure ../configure +%if 0%{?el7} +export CFLAGS="%{optflags} -std=gnu99" +%endif + %if %{with java} export CLASSPATH=$(build-classpath junit slf4j-api logback-core logback-classic android-json) %endif @@ -564,7 +580,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php # Replace JS libraries # There is no jquery-ui package yet +%if !0%{?el7} ln -sf ../../../javascript/jquery/3/jquery.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery.js +%endif #ln -sf ../../../javascript/jquery-ui/1/jquery-ui.min.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendors/jquery-ui.js # This file is used to switch the frontend to maintenance mode From 21bcd94fce01bdb2a02dcc3c4b297b463fcfc1c3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 22 Mar 2023 10:38:02 -0600 Subject: [PATCH 04/14] Update to 6.0.14 --- zabbix6.0.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zabbix6.0.spec b/zabbix6.0.spec index 1e982ea..b002162 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,7 +17,7 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.13 +Version: 6.0.14 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -891,7 +891,10 @@ fi %files web-pgsql %changelog -* Fri Feb 17 2023 Orion Poplawski - 6.0.13-1 +* Wed Mar 22 2023 Orion Poplawski - 6.0.14-1 +- Update to 6.0.14 + +* Fri Feb 17 2023 Orion Poplawski - 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 From 125e8b274264029199aa53d403af8f78f277f8c1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 22 Mar 2023 11:37:20 -0600 Subject: [PATCH 05/14] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2cd5c04..3426005 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 From f3b1c8bd8ee670629fa158d3339b20ecf889a574 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 4 Apr 2023 19:18:09 -0600 Subject: [PATCH 06/14] Update to 6.0.15 --- .gitignore | 1 + sources | 2 +- zabbix6.0.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3426005..e1d7942 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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/zabbix6.0.spec b/zabbix6.0.spec index b002162..ff4caac 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,7 +17,7 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.14 +Version: 6.0.15 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Wed Apr 05 2023 Orion Poplawski - 6.0.15-1 +- Update to 6.0.15 + * Wed Mar 22 2023 Orion Poplawski - 6.0.14-1 - Update to 6.0.14 From 3e916a126fa549711d8e36313343bb1864a1a16f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 11 Apr 2023 10:41:59 -0600 Subject: [PATCH 07/14] Update to 6.0.16 --- .gitignore | 1 + sources | 2 +- zabbix6.0.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1d7942..bad8142 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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/zabbix6.0.spec b/zabbix6.0.spec index ff4caac..40c14bd 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,7 +17,7 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.15 +Version: 6.0.16 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Tue Apr 11 2023 Orion Poplawski - 6.0.16-1 +- Update to 6.0.16 + * Wed Apr 05 2023 Orion Poplawski - 6.0.15-1 - Update to 6.0.15 From 5db8a1fbc4389a6d2069061d084e70babd49ea2d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 16 Jul 2023 14:56:31 -0600 Subject: [PATCH 08/14] Update to 6.0.19 --- .gitignore | 1 + sources | 2 +- zabbix6.0.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bad8142..df97d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zabbix-6.0.14.tar.gz /zabbix-6.0.15.tar.gz /zabbix-6.0.16.tar.gz +/zabbix-6.0.19.tar.gz diff --git a/sources b/sources index 02dc788..9f73b5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.16.tar.gz) = 256c634fee53cdc9b898774499b6853aad3f9b27a045bac4dbed8bf1013fb478a1c5596f8db95346faf86a0350aff5623b3ac5161536cd7f3b85292a688e3360 +SHA512 (zabbix-6.0.19.tar.gz) = 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e diff --git a/zabbix6.0.spec b/zabbix6.0.spec index 40c14bd..aa89c9b 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,7 +17,7 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.16 +Version: 6.0.19 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Sun Jul 16 2023 Orion Poplawski - 6.0.19-1 +- Update to 6.0.19 + * Tue Apr 11 2023 Orion Poplawski - 6.0.16-1 - Update to 6.0.16 From 13ad086bf4f9e41c2ab7750c9689c57d5ed94cf1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 30 Oct 2023 13:46:13 -0600 Subject: [PATCH 09/14] Update to 6.0.22 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 10 +++++----- zabbix6.0.spec | 5 ++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index df97d6c..b13eabf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zabbix-6.0.15.tar.gz /zabbix-6.0.16.tar.gz /zabbix-6.0.19.tar.gz +/zabbix-6.0.22.tar.gz diff --git a/sources b/sources index 9f73b5d..6c0aeb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.19.tar.gz) = 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e +SHA512 (zabbix-6.0.22.tar.gz) = d26903d6272e22dd960d3bac5d93857de09a9f64a91e542a43fe1169ed1a7d7fbcf69975d152a227028ebbeb250cd0dd96501d15cbd7c8f7bdd7222a0b97a2a2 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/zabbix6.0.spec b/zabbix6.0.spec index aa89c9b..d3788c6 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,7 +17,7 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.19 +Version: 6.0.22 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Mon Oct 30 2023 Orion Poplawski - 6.0.22-1 +- Update to 6.0.22 + * Sun Jul 16 2023 Orion Poplawski - 6.0.19-1 - Update to 6.0.19 From 9d2baf599a61ee7f5d43703e06b15c8c61e85a1f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 30 Oct 2023 17:00:43 -0600 Subject: [PATCH 10/14] Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) --- zabbix.te | 8 +++++++- zabbix6.0.spec | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/zabbix.te b/zabbix.te index a456bd5..1db2730 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,12 @@ tunable_policy(`zabbix_run_sudo',` xserver_exec_xauth(zabbix_agent_t) ') +# These are triggered by vfs.dev.discovery enumerating everyting in /dev +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) diff --git a/zabbix6.0.spec b/zabbix6.0.spec index d3788c6..8a23d73 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -18,7 +18,7 @@ Name: zabbix%{majver} Version: 6.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Mon Oct 30 2023 Orion Poplawski - 6.0.22-2 +- Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) + * Mon Oct 30 2023 Orion Poplawski - 6.0.22-1 - Update to 6.0.22 From 43636de6ac9d8a967e6f137cbe584db595db86ac Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 30 Oct 2023 18:10:36 -0600 Subject: [PATCH 11/14] Fix SELinux policy --- zabbix.te | 4 +++- zabbix6.0.spec | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zabbix.te b/zabbix.te index 1db2730..f6de1bc 100644 --- a/zabbix.te +++ b/zabbix.te @@ -303,7 +303,9 @@ tunable_policy(`zabbix_run_sudo',` ') # These are triggered by vfs.dev.discovery enumerating everyting in /dev -type devlog_t; +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) diff --git a/zabbix6.0.spec b/zabbix6.0.spec index 8a23d73..d4204e2 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -18,7 +18,7 @@ Name: zabbix%{majver} Version: 6.0.22 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Mon Oct 30 2023 Orion Poplawski - 6.0.22-2.1 +- Fix SELinux policy + * Mon Oct 30 2023 Orion Poplawski - 6.0.22-2 - Add dontaudit SELinux rules for spurious AVC denial messages (bz#2170630) From d440861715a5ae045084ee10fe019a97b6c44d0e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Jan 2024 13:59:23 -0700 Subject: [PATCH 12/14] Update to 6.0.25 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 621 ++++++++++++++++++++------------------- zabbix6.0.spec | 7 +- 4 files changed, 318 insertions(+), 313 deletions(-) diff --git a/.gitignore b/.gitignore index b13eabf..abc0cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zabbix-6.0.16.tar.gz /zabbix-6.0.19.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-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 diff --git a/zabbix6.0.spec b/zabbix6.0.spec index d4204e2..7473853 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,8 +17,8 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.22 -Release: 2%{?dist}.1 +Version: 6.0.25 +Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure License: GPLv2+ @@ -891,6 +891,9 @@ fi %files web-pgsql %changelog +* Thu Jan 04 2024 Orion Poplawski - 6.0.25-1 +- Update to 6.0.25 + * Mon Oct 30 2023 Orion Poplawski - 6.0.22-2.1 - Fix SELinux policy From c6ab2b369afd45409ed5aec67a45cc0da46d1571 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Jan 2024 14:51:06 -0700 Subject: [PATCH 13/14] Drop crypto-policies patch on EL7 - not applicable --- zabbix6.0.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zabbix6.0.spec b/zabbix6.0.spec index 7473853..aee3f32 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -415,7 +415,10 @@ Custom SELinux policy module %setup0 -q -n %{srcname}-%{version}%{?prerelease:.%{prerelease}} %patch0 -p1 -b .config %patch1 -p1 -b .out-of-tree +# No crypto policies on EL7 +%if !0%{?el7} %patch2 -p1 -b .crypto-policy +%endif autoreconf # Remove bundled java libs @@ -893,6 +896,7 @@ fi %changelog * Thu Jan 04 2024 Orion Poplawski - 6.0.25-1 - Update to 6.0.25 +- Drop crypto-policies patch on EL7 - not applicable * Mon Oct 30 2023 Orion Poplawski - 6.0.22-2.1 - Fix SELinux policy From 802cd05a3ff65c56d12b8ca44a4c87a2fd714a4c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 3 May 2024 15:17:52 -0600 Subject: [PATCH 14/14] 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.te | 56 +++++++++++++++++++++++++++++++++----------------- zabbix6.0.spec | 7 ++++++- 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index abc0cdb..e8c3de7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zabbix-6.0.19.tar.gz /zabbix-6.0.22.tar.gz /zabbix-6.0.25.tar.gz +/zabbix-6.0.29.tar.gz diff --git a/sources b/sources index a6417f0..73bd89e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-6.0.25.tar.gz) = 0be1ce76754788e05ff73a02f370c2b6b4bc2f69a463a47304ac9504a8cd9da2697c54d897a95b39841ceb38ded0c985f4772e453a393526aca6475c78eb7a1e +SHA512 (zabbix-6.0.29.tar.gz) = 3189a534e250a02f7661340700d6c6d852eeae552db8a15f94e6d917aea84f7292660a22580d6fc59479498aedecdbf58b19c51b649266a9de229f0d0c35c3e0 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) diff --git a/zabbix6.0.spec b/zabbix6.0.spec index aee3f32..b34df45 100644 --- a/zabbix6.0.spec +++ b/zabbix6.0.spec @@ -17,7 +17,7 @@ #%%global prerelease rc2 Name: zabbix%{majver} -Version: 6.0.25 +Version: 6.0.29 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -894,6 +894,11 @@ fi %files web-pgsql %changelog +* Fri May 03 2024 Orion Poplawski - 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 + * Thu Jan 04 2024 Orion Poplawski - 6.0.25-1 - Update to 6.0.25 - Drop crypto-policies patch on EL7 - not applicable