diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-01-27 08:50:56 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-01-27 08:50:56 +0000 |
| commit | bb432e6c61c3c7bcd8a41ae2e120bc7816d35623 (patch) | |
| tree | 522cb4ac4714e3d17aa808094466afe9cab63336 /zabbix-out-of-tree.patch | |
| parent | 544048a120e19bcc0ce89e696993fe40ed04eec6 (diff) | |
automatic import of zabbixopeneuler23.03
Diffstat (limited to 'zabbix-out-of-tree.patch')
| -rw-r--r-- | zabbix-out-of-tree.patch | 674 |
1 files changed, 338 insertions, 336 deletions
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 5d47998..59d3e6d 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,27 +1,28 @@ -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 @@ - build: ${TARGETS} - - clean: -- go clean ./... -+ go clean $(srcdir)/... - rm -f bin/zabbix_agent2 bin/mock_server - - install-zabbix.com/cmd/zabbix_agent2: +diff -up zabbix-6.0.25/src/go/Makefile.am zabbix-6.0.25/src/go/Makefile.am +--- zabbix-6.0.25/src/go/Makefile.am 2024-01-27 12:18:10.203573218 +0800 ++++ zabbix-6.0.25/src/go/Makefile.am 2024-01-27 12:32:26.677126253 +0800 +@@ -59,7 +59,7 @@ + clean: clean-go-build clean-sbom + + 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 @@ 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_FILE)" || cp "$(srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)" ++ for cfg in $(srcdir)conf/zabbix_agent2.d/plugins.d/*.conf; do \ test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \ cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \ done -@@ -90,7 +90,7 @@ - sbom: sbom.json +@@ -151,7 +151,7 @@ + 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.13/src/go/Makefile.am.out-of-tree zabbix-6.0.13/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 zabbix-6.0.25/src/libs/zbxalgo/Makefile.am +--- zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-27 12:18:10.998582084 +0800 ++++ zabbix-6.0.25/src/libs/zbxalgo/Makefile.am 2024-01-27 12:26:48.415352368 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxaudit/Makefile.am +--- zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-27 12:18:11.144583713 +0800 ++++ zabbix-6.0.25/src/libs/zbxaudit/Makefile.am 2024-01-27 12:26:48.415352368 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxavailability/Makefile.am +--- zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-27 12:18:11.139583657 +0800 ++++ zabbix-6.0.25/src/libs/zbxavailability/Makefile.am 2024-01-27 12:26:48.415352368 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxcommon/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-27 12:18:10.905581047 +0800 ++++ zabbix-6.0.25/src/libs/zbxcommon/Makefile.am 2024-01-27 12:26:48.415352368 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -73,31 +74,31 @@ 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/zbxcomms/Makefile.am zabbix-6.0.25/src/libs/zbxcomms/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-27 12:18:10.984581928 +0800 ++++ zabbix-6.0.25/src/libs/zbxcomms/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libzbxcommshigh.a + noinst_LIBRARIES = libzbxcomms.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 + libzbxcomms_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-27 12:18:11.130583556 +0800 ++++ zabbix-6.0.25/src/libs/zbxcommshigh/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libzbxcomms.a + noinst_LIBRARIES = libzbxcommshigh.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 + libzbxcommshigh_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxcompress/Makefile.am zabbix-6.0.25/src/libs/zbxcompress/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-27 12:18:10.925581270 +0800 ++++ zabbix-6.0.25/src/libs/zbxcompress/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxconf/Makefile.am +--- zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-27 12:18:11.129583545 +0800 ++++ zabbix-6.0.25/src/libs/zbxconf/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am +--- zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-27 12:18:10.920581214 +0800 ++++ zabbix-6.0.25/src/libs/zbxcrypto/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -128,42 +129,42 @@ 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/zbxdb/Makefile.am zabbix-6.0.25/src/libs/zbxdb/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-27 12:18:10.913581136 +0800 ++++ zabbix-6.0.25/src/libs/zbxdb/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libzbxdbcache.a + noinst_LIBRARIES = libzbxdb.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 + libzbxdb_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-27 12:18:11.006582173 +0800 ++++ zabbix-6.0.25/src/libs/zbxdbcache/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - 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 + noinst_LIBRARIES = libzbxdbcache.a + + libzbxdbcache_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-27 12:18:10.950581549 +0800 ++++ zabbix-6.0.25/src/libs/zbxdbhigh/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - 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 + if DBSCHEMA + dbschema.c: $(top_srcdir)/create/src/schema.tmpl + $(top_srcdir)/create/bin/gen_schema.pl c > dbschema.c +diff -up zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-27 12:18:10.935581381 +0800 ++++ zabbix-6.0.25/src/libs/zbxdbupgrade/Makefile.am 2024-01-27 12:26:48.416352379 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxdiag/Makefile.am +--- zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-27 12:18:11.137583635 +0800 ++++ zabbix-6.0.25/src/libs/zbxdiag/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxembed/Makefile.am +--- zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-27 12:18:10.959581649 +0800 ++++ zabbix-6.0.25/src/libs/zbxembed/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxeval/Makefile.am +--- zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-27 12:18:10.988581973 +0800 ++++ zabbix-6.0.25/src/libs/zbxeval/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxexec/Makefile.am +--- zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-27 12:18:10.992582017 +0800 ++++ zabbix-6.0.25/src/libs/zbxexec/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxha/Makefile.am +--- zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-27 12:18:10.965581716 +0800 ++++ zabbix-6.0.25/src/libs/zbxha/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxhistory/Makefile.am +--- zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-27 12:18:11.149583768 +0800 ++++ zabbix-6.0.25/src/libs/zbxhistory/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxhttp/Makefile.am +--- zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-27 12:18:10.908581080 +0800 ++++ zabbix-6.0.25/src/libs/zbxhttp/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am +--- zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-27 12:18:11.014582263 +0800 ++++ zabbix-6.0.25/src/libs/zbxicmpping/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am +--- zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-27 12:18:11.149583768 +0800 ++++ zabbix-6.0.25/src/libs/zbxipcservice/Makefile.am 2024-01-27 12:26:48.417352390 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxjson/Makefile.am +--- zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-27 12:18:11.134583601 +0800 ++++ zabbix-6.0.25/src/libs/zbxjson/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxlog/Makefile.am +--- zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-27 12:18:11.013582251 +0800 ++++ zabbix-6.0.25/src/libs/zbxlog/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxmedia/Makefile.am +--- zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-27 12:18:11.010582218 +0800 ++++ zabbix-6.0.25/src/libs/zbxmedia/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxmemory/Makefile.am +--- zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-27 12:18:10.923581248 +0800 ++++ zabbix-6.0.25/src/libs/zbxmemory/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxmodules/Makefile.am +--- zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-27 12:18:10.910581103 +0800 ++++ zabbix-6.0.25/src/libs/zbxmodules/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxnix/Makefile.am +--- zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-27 12:18:10.981581895 +0800 ++++ zabbix-6.0.25/src/libs/zbxnix/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxprof/Makefile.am +--- zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-27 12:18:10.994582040 +0800 ++++ zabbix-6.0.25/src/libs/zbxprof/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am +--- zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-27 12:18:10.911581114 +0800 ++++ zabbix-6.0.25/src/libs/zbxprometheus/Makefile.am 2024-01-27 12:26:48.418352401 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxregexp/Makefile.am +--- zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-27 12:18:10.977581850 +0800 ++++ zabbix-6.0.25/src/libs/zbxregexp/Makefile.am 2024-01-27 12:26:48.419352412 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxrtc/Makefile.am +--- zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-27 12:18:10.916581170 +0800 ++++ zabbix-6.0.25/src/libs/zbxrtc/Makefile.am 2024-01-27 12:26:48.419352412 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxself/Makefile.am +--- zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-27 12:18:11.019582318 +0800 ++++ zabbix-6.0.25/src/libs/zbxself/Makefile.am 2024-01-27 12:26:48.419352412 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxserver/Makefile.am +--- zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-27 12:18:10.972581794 +0800 ++++ zabbix-6.0.25/src/libs/zbxserver/Makefile.am 2024-01-27 12:26:48.419352412 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxservice/Makefile.am +--- zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-27 12:18:10.990581995 +0800 ++++ zabbix-6.0.25/src/libs/zbxservice/Makefile.am 2024-01-27 12:26:48.419352412 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -414,9 +415,20 @@ 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/zbxsys/Makefile.am zabbix-6.0.25/src/libs/zbxsys/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-27 12:18:10.963581694 +0800 ++++ zabbix-6.0.25/src/libs/zbxsys/Makefile.am 2024-01-27 12:26:48.420352423 +0800 +@@ -1,5 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + noinst_LIBRARIES = libzbxsys.a + + libzbxsys_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-27 12:18:11.101583233 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/agent/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -425,20 +437,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 zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-27 12:18:11.122583467 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/aix/Makefile.am 2024-01-27 12:21:13.373615946 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-27 12:18:11.110583333 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/common/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -447,42 +459,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 zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-27 12:18:11.099583211 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/freebsd/Makefile.am 2024-01-27 12:21:50.135025913 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-27 12:18:11.116583400 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/hpux/Makefile.am 2024-01-27 12:22:10.033247819 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-27 12:18:11.033582474 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/linux/Makefile.am 2024-01-27 12:22:28.994459278 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-27 12:18:11.100583222 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -491,53 +503,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 zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-27 12:18:11.093583144 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/netbsd/Makefile.am 2024-01-27 12:22:45.253640603 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-27 12:18:11.078582976 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/openbsd/Makefile.am 2024-01-27 12:23:03.828847753 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-27 12:18:11.058582753 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/osf/Makefile.am 2024-01-27 12:23:21.966050020 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-27 12:18:11.043582586 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/osx/Makefile.am 2024-01-27 12:23:37.598224351 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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 zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-27 12:18:11.087583077 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/simple/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -546,42 +558,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 -@@ -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.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 +diff -up zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-27 12:18:11.084583043 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/solaris/Makefile.am 2024-01-27 12:23:54.055407887 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = 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/zbxsysinfo/unknown/Makefile.am zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am +--- zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-27 12:18:11.066582843 +0800 ++++ zabbix-6.0.25/src/libs/zbxsysinfo/unknown/Makefile.am 2024-01-27 12:24:13.363623213 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +AM_CPPFLAGS = -I$(top_srcdir)/include + - noinst_LIBRARIES = libzbxsys.a + noinst_LIBRARIES = libfunclistsysinfo.a libspecsysinfo.a libspechostnamesysinfo.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 + libfunclistsysinfo_a_SOURCES = \ +diff -up zabbix-6.0.25/src/libs/zbxtasks/Makefile.am zabbix-6.0.25/src/libs/zbxtasks/Makefile.am +--- zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-27 12:18:10.924581259 +0800 ++++ zabbix-6.0.25/src/libs/zbxtasks/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxtrends/Makefile.am +--- zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-27 12:18:11.017582296 +0800 ++++ zabbix-6.0.25/src/libs/zbxtrends/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxvault/Makefile.am +--- zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-27 12:18:11.148583757 +0800 ++++ zabbix-6.0.25/src/libs/zbxvault/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/libs/zbxxml/Makefile.am +--- zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-27 12:18:10.975581828 +0800 ++++ zabbix-6.0.25/src/libs/zbxxml/Makefile.am 2024-01-27 12:26:48.420352423 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am +--- zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-27 12:18:10.054571557 +0800 ++++ zabbix-6.0.25/src/zabbix_agent/logfiles/Makefile.am 2024-01-27 12:26:48.421352435 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -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 zabbix-6.0.25/src/zabbix_agent/Makefile.am +--- zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-27 12:18:10.050571512 +0800 ++++ zabbix-6.0.25/src/zabbix_agent/Makefile.am 2024-01-27 12:26:48.421352435 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -645,15 +646,16 @@ 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 @@ 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 +Only in zabbix-6.0.25/src/zabbix_agent: Makefile.am.orig +diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am zabbix-6.0.25/src/zabbix_get/Makefile.am +--- zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-27 12:18:10.901581002 +0800 ++++ zabbix-6.0.25/src/zabbix_get/Makefile.am 2024-01-27 12:26:48.421352435 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -662,10 +664,10 @@ 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 -@@ -9,22 +9,22 @@ EXTRA_DIST = \ +diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am zabbix-6.0.25/src/zabbix_java/Makefile.am +--- zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:18:09.889569717 +0800 ++++ zabbix-6.0.25/src/zabbix_java/Makefile.am 2024-01-27 12:26:48.421352435 +0800 +@@ -9,22 +9,22 @@ startup.sh ZJG = bin/zabbix-java-gateway-$(VERSION).jar @@ -694,9 +696,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 zabbix-6.0.25/src/zabbix_js/Makefile.am +--- zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-27 12:18:10.899580980 +0800 ++++ zabbix-6.0.25/src/zabbix_js/Makefile.am 2024-01-27 12:26:48.421352435 +0800 @@ -1,26 +1,28 @@ ## Process this file with automake to produce Makefile.in @@ -742,9 +744,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 zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-27 12:18:10.058571602 +0800 ++++ zabbix-6.0.25/src/zabbix_proxy/datasender/Makefile.am 2024-01-27 12:26:48.421352435 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -753,9 +755,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 zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-27 12:18:10.061571635 +0800 ++++ zabbix-6.0.25/src/zabbix_proxy/heart/Makefile.am 2024-01-27 12:26:48.421352435 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -764,9 +766,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 zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-27 12:18:10.064571668 +0800 ++++ zabbix-6.0.25/src/zabbix_proxy/housekeeper/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -775,9 +777,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 zabbix-6.0.25/src/zabbix_proxy/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-27 12:18:10.055571568 +0800 ++++ zabbix-6.0.25/src/zabbix_proxy/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -786,15 +788,15 @@ diff -up zabbix-6.0.13/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-6.0.13/sr SUBDIRS = \ heart \ housekeeper \ -@@ -112,4 +114,4 @@ install-data-hook: +@@ -112,4 +114,4 @@ $(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.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 zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-27 12:18:10.064571668 +0800 ++++ zabbix-6.0.25/src/zabbix_proxy/proxyconfig/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -803,9 +805,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 zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am +--- zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-27 12:18:10.058571602 +0800 ++++ zabbix-6.0.25/src/zabbix_proxy/taskmanager/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -814,9 +816,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 zabbix-6.0.25/src/zabbix_sender/Makefile.am +--- zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-27 12:18:10.067571702 +0800 ++++ zabbix-6.0.25/src/zabbix_sender/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -825,9 +827,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 zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-27 12:18:10.037571367 +0800 ++++ zabbix-6.0.25/src/zabbix_server/alerter/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -836,9 +838,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 zabbix-6.0.25/src/zabbix_server/availability/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-27 12:18:10.007571033 +0800 ++++ zabbix-6.0.25/src/zabbix_server/availability/Makefile.am 2024-01-27 12:26:48.422352446 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -847,9 +849,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 zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-27 12:18:09.986570799 +0800 ++++ zabbix-6.0.25/src/zabbix_server/dbconfig/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -858,9 +860,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 zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-27 12:18:09.911569962 +0800 ++++ zabbix-6.0.25/src/zabbix_server/dbsyncer/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -869,9 +871,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 zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-27 12:18:09.992570866 +0800 ++++ zabbix-6.0.25/src/zabbix_server/discoverer/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -880,9 +882,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 zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-27 12:18:09.943570319 +0800 ++++ zabbix-6.0.25/src/zabbix_server/escalator/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -891,9 +893,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 zabbix-6.0.25/src/zabbix_server/ha/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-27 12:18:10.040571401 +0800 ++++ zabbix-6.0.25/src/zabbix_server/ha/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -902,9 +904,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 zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-27 12:18:09.998570933 +0800 ++++ zabbix-6.0.25/src/zabbix_server/housekeeper/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -913,9 +915,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 zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-27 12:18:09.917570029 +0800 ++++ zabbix-6.0.25/src/zabbix_server/httppoller/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -924,9 +926,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 zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-27 12:18:09.952570420 +0800 ++++ zabbix-6.0.25/src/zabbix_server/ipmi/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -935,9 +937,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 zabbix-6.0.25/src/zabbix_server/lld/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-27 12:18:09.975570676 +0800 ++++ zabbix-6.0.25/src/zabbix_server/lld/Makefile.am 2024-01-27 12:26:48.423352457 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -946,9 +948,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 zabbix-6.0.25/src/zabbix_server/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-27 12:18:09.943570319 +0800 ++++ zabbix-6.0.25/src/zabbix_server/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -957,15 +959,15 @@ diff -up zabbix-6.0.13/src/zabbix_server/Makefile.am.out-of-tree zabbix-6.0.13/s SUBDIRS = \ alerter \ dbsyncer \ -@@ -151,4 +153,4 @@ install-data-hook: +@@ -151,4 +153,4 @@ $(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.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 zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-27 12:18:10.041571412 +0800 ++++ zabbix-6.0.25/src/zabbix_server/odbc/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -974,9 +976,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 zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-27 12:18:10.008571044 +0800 ++++ zabbix-6.0.25/src/zabbix_server/pinger/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -985,9 +987,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 zabbix-6.0.25/src/zabbix_server/poller/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-27 12:18:10.031571301 +0800 ++++ zabbix-6.0.25/src/zabbix_server/poller/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -996,9 +998,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 zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-27 12:18:10.003570988 +0800 ++++ zabbix-6.0.25/src/zabbix_server/preprocessor/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1007,9 +1009,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 zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-27 12:18:09.909569940 +0800 ++++ zabbix-6.0.25/src/zabbix_server/proxypoller/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1018,9 +1020,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 zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-27 12:18:10.006571022 +0800 ++++ zabbix-6.0.25/src/zabbix_server/reporter/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1029,9 +1031,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 zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-27 12:18:10.010571066 +0800 ++++ zabbix-6.0.25/src/zabbix_server/scripts/Makefile.am 2024-01-27 12:26:48.424352468 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1040,9 +1042,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 zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-27 12:18:09.963570542 +0800 ++++ zabbix-6.0.25/src/zabbix_server/selfmon/Makefile.am 2024-01-27 12:26:48.425352479 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1051,9 +1053,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 zabbix-6.0.25/src/zabbix_server/service/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-27 12:18:10.017571144 +0800 ++++ zabbix-6.0.25/src/zabbix_server/service/Makefile.am 2024-01-27 12:26:48.425352479 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1062,9 +1064,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 zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-27 12:18:09.986570799 +0800 ++++ zabbix-6.0.25/src/zabbix_server/snmptrapper/Makefile.am 2024-01-27 12:26:48.425352479 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1073,9 +1075,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 zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-27 12:18:09.959570498 +0800 ++++ zabbix-6.0.25/src/zabbix_server/taskmanager/Makefile.am 2024-01-27 12:26:48.425352479 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1084,9 +1086,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 zabbix-6.0.25/src/zabbix_server/timer/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-27 12:18:10.019571167 +0800 ++++ zabbix-6.0.25/src/zabbix_server/timer/Makefile.am 2024-01-27 12:26:48.425352479 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1095,9 +1097,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 zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-27 12:18:09.933570208 +0800 ++++ zabbix-6.0.25/src/zabbix_server/trapper/Makefile.am 2024-01-27 12:26:48.425352479 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -1106,9 +1108,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 zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am +--- zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-27 12:18:10.013571100 +0800 ++++ zabbix-6.0.25/src/zabbix_server/vmware/Makefile.am 2024-01-27 12:26:48.426352490 +0800 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in |