From 7f66e09b6aaec1aa3d2030507944a4af4b7fe391 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 19 Jan 2023 17:44:53 -0700 Subject: [PATCH] Update to 5.0.30 --- .gitignore | 1 + sources | 2 +- zabbix-out-of-tree.patch | 586 ++++++++++++++++++++------------------- zabbix.spec | 5 +- 4 files changed, 302 insertions(+), 292 deletions(-) diff --git a/.gitignore b/.gitignore index 195cc30..d606a35 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ zabbix-1.8.2.tar.gz /zabbix-5.0.18.tar.gz /zabbix-5.0.19.tar.gz /zabbix-5.0.21.tar.gz +/zabbix-5.0.30.tar.gz diff --git a/sources b/sources index 7da9498..fee2472 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zabbix-5.0.21.tar.gz) = 1c448fa5c2d8323c30793a923597c64e4aede3c3f0185bb0462e52677e955e8d75954d336baebe4226691cc186f2840402c8b2b1fe318c227c45541030b3bac3 +SHA512 (zabbix-5.0.30.tar.gz) = 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch index 051a55a..c6c020d 100644 --- a/zabbix-out-of-tree.patch +++ b/zabbix-out-of-tree.patch @@ -1,6 +1,36 @@ -diff -up zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxalgo/Makefile.am ---- zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxalgo/Makefile.am 2021-11-30 18:52:58.203303610 -0700 +diff -up zabbix-5.0.30/src/go/Makefile.am.out-of-tree zabbix-5.0.30/src/go/Makefile.am +--- zabbix-5.0.30/src/go/Makefile.am.out-of-tree 2023-01-19 17:41:35.805763431 -0700 ++++ zabbix-5.0.30/src/go/Makefile.am 2023-01-19 17:43:31.872629913 -0700 +@@ -20,20 +20,20 @@ GOLDFLAGS += -X main.confDefault=${AGENT + all: build + + build: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin ./... ++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin $(srcdir)/... + + clean: +- go clean ./... ++ go clean $(srcdir)/... + rm -f bin/zabbix_agent2 bin/mock_server + + install: + CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ + go install -ldflags="${GOLDFLAGS}" zabbix.com/cmd/zabbix_agent2 +- test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" ++ test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" + + check: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... ++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... + style: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... ++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) $(srcdir)/... + format: +- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go fmt ./... ++ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go fmt $(srcdir)/... +diff -up zabbix-5.0.30/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxalgo/Makefile.am +--- zabbix-5.0.30/src/libs/zbxalgo/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxalgo/Makefile.am 2023-01-19 17:41:35.768763215 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -9,9 +39,9 @@ diff -up zabbix-5.0.18/src/libs/zbxalgo/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxalgo.a if SERVER -diff -up zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcommon/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcommon/Makefile.am 2021-11-30 18:52:58.203303610 -0700 +diff -up zabbix-5.0.30/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxcommon/Makefile.am +--- zabbix-5.0.30/src/libs/zbxcommon/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxcommon/Makefile.am 2023-01-19 17:41:35.769763221 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -20,9 +50,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcommon/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxcommon.a libzbxcommon_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxcommshigh/Makefile.am +--- zabbix-5.0.30/src/libs/zbxcommshigh/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxcommshigh/Makefile.am 2023-01-19 17:41:35.769763221 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -31,9 +61,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcommshigh/Makefile.am.out-of-tree zabbix-5.0. noinst_LIBRARIES = libzbxcommshigh.a libzbxcommshigh_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcomms/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxcomms/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxcomms/Makefile.am +--- zabbix-5.0.30/src/libs/zbxcomms/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxcomms/Makefile.am 2023-01-19 17:41:35.770763227 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -42,9 +72,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcomms/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxcomms.a libzbxcomms_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcompress/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcompress/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxcompress/Makefile.am +--- zabbix-5.0.30/src/libs/zbxcompress/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxcompress/Makefile.am 2023-01-19 17:41:35.770763227 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -53,9 +83,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcompress/Makefile.am.out-of-tree zabbix-5.0.1 noinst_LIBRARIES = libzbxcompress.a libzbxcompress_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxconf/Makefile.am ---- zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxconf/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxconf/Makefile.am +--- zabbix-5.0.30/src/libs/zbxconf/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxconf/Makefile.am 2023-01-19 17:41:35.770763227 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -64,9 +94,9 @@ diff -up zabbix-5.0.18/src/libs/zbxconf/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxconf.a libzbxconf_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am ---- zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxcrypto/Makefile.am +--- zabbix-5.0.30/src/libs/zbxcrypto/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxcrypto/Makefile.am 2023-01-19 17:41:35.771763233 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -75,9 +105,9 @@ diff -up zabbix-5.0.18/src/libs/zbxcrypto/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxcrypto.a libzbxcrypto_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxdbcache/Makefile.am +--- zabbix-5.0.30/src/libs/zbxdbcache/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxdbcache/Makefile.am 2023-01-19 17:41:35.771763233 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -86,9 +116,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdbcache/Makefile.am.out-of-tree zabbix-5.0.18 noinst_LIBRARIES = libzbxdbcache.a libzbxdbcache_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxdbhigh/Makefile.am +--- zabbix-5.0.30/src/libs/zbxdbhigh/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxdbhigh/Makefile.am 2023-01-19 17:41:35.772763239 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -97,9 +127,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdbhigh/Makefile.am.out-of-tree zabbix-5.0.18/ if DBSCHEMA dbschema.c: $(top_srcdir)/create/src/schema.tmpl $(top_srcdir)/create/bin/gen_schema.pl c > dbschema.c -diff -up zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdb/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdb/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxdb/Makefile.am +--- zabbix-5.0.30/src/libs/zbxdb/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxdb/Makefile.am 2023-01-19 17:41:35.772763239 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -108,9 +138,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdb/Makefile.am.out-of-tree zabbix-5.0.18/src/ noinst_LIBRARIES = libzbxdb.a libzbxdb_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxdbupgrade/Makefile.am +--- zabbix-5.0.30/src/libs/zbxdbupgrade/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxdbupgrade/Makefile.am 2023-01-19 17:41:35.773763244 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -119,9 +149,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdbupgrade/Makefile.am.out-of-tree zabbix-5.0. noinst_LIBRARIES = libzbxdbupgrade.a libzbxdbupgrade_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxdiag/Makefile.am ---- zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxdiag/Makefile.am 2021-11-30 18:52:58.204303618 -0700 +diff -up zabbix-5.0.30/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxdiag/Makefile.am +--- zabbix-5.0.30/src/libs/zbxdiag/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxdiag/Makefile.am 2023-01-19 17:41:35.773763244 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -130,9 +160,9 @@ diff -up zabbix-5.0.18/src/libs/zbxdiag/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxdiag_server.a libzbxdiag_proxy.a libzbxdiag_server_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxembed/Makefile.am ---- zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxembed/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxembed/Makefile.am +--- zabbix-5.0.30/src/libs/zbxembed/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxembed/Makefile.am 2023-01-19 17:41:35.774763250 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -141,9 +171,9 @@ diff -up zabbix-5.0.18/src/libs/zbxembed/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxembed.a libzbxembed_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxexec/Makefile.am ---- zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxexec/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxexec/Makefile.am +--- zabbix-5.0.30/src/libs/zbxexec/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxexec/Makefile.am 2023-01-19 17:41:35.774763250 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -152,9 +182,9 @@ diff -up zabbix-5.0.18/src/libs/zbxexec/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxexec.a libzbxexec_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxhistory/Makefile.am ---- zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxhistory/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxhistory/Makefile.am +--- zabbix-5.0.30/src/libs/zbxhistory/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxhistory/Makefile.am 2023-01-19 17:41:35.775763256 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -163,9 +193,9 @@ diff -up zabbix-5.0.18/src/libs/zbxhistory/Makefile.am.out-of-tree zabbix-5.0.18 noinst_LIBRARIES = libzbxhistory.a libzbxhistory_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxhttp/Makefile.am ---- zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxhttp/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxhttp/Makefile.am +--- zabbix-5.0.30/src/libs/zbxhttp/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxhttp/Makefile.am 2023-01-19 17:41:35.775763256 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -174,9 +204,9 @@ diff -up zabbix-5.0.18/src/libs/zbxhttp/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxhttp.a libzbxhttp_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am ---- zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxicmpping/Makefile.am +--- zabbix-5.0.30/src/libs/zbxicmpping/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxicmpping/Makefile.am 2023-01-19 17:41:35.775763256 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -185,9 +215,9 @@ diff -up zabbix-5.0.18/src/libs/zbxicmpping/Makefile.am.out-of-tree zabbix-5.0.1 noinst_LIBRARIES = libzbxicmpping.a libzbxicmpping_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am ---- zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxipcservice/Makefile.am +--- zabbix-5.0.30/src/libs/zbxipcservice/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxipcservice/Makefile.am 2023-01-19 17:41:35.776763262 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -196,9 +226,9 @@ diff -up zabbix-5.0.18/src/libs/zbxipcservice/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libzbxipcservice.a libzbxipcservice_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxjson/Makefile.am ---- zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxjson/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxjson/Makefile.am +--- zabbix-5.0.30/src/libs/zbxjson/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxjson/Makefile.am 2023-01-19 17:41:35.776763262 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -207,9 +237,9 @@ diff -up zabbix-5.0.18/src/libs/zbxjson/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxjson.a libzbxjson_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxlog/Makefile.am ---- zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxlog/Makefile.am 2021-11-30 18:52:58.205303627 -0700 +diff -up zabbix-5.0.30/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxlog/Makefile.am +--- zabbix-5.0.30/src/libs/zbxlog/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxlog/Makefile.am 2023-01-19 17:41:35.777763268 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -218,9 +248,9 @@ diff -up zabbix-5.0.18/src/libs/zbxlog/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxlog.a libzbxlog_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmedia/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxmedia/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxmedia/Makefile.am +--- zabbix-5.0.30/src/libs/zbxmedia/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxmedia/Makefile.am 2023-01-19 17:41:35.777763268 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -229,9 +259,9 @@ diff -up zabbix-5.0.18/src/libs/zbxmedia/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxmedia.a libzbxmedia_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmemory/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxmemory/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxmemory/Makefile.am +--- zabbix-5.0.30/src/libs/zbxmemory/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxmemory/Makefile.am 2023-01-19 17:41:35.779763279 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -240,9 +270,9 @@ diff -up zabbix-5.0.18/src/libs/zbxmemory/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxmemory.a libzbxmemory_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxmodules/Makefile.am ---- zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxmodules/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxmodules/Makefile.am +--- zabbix-5.0.30/src/libs/zbxmodules/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxmodules/Makefile.am 2023-01-19 17:41:35.779763279 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -251,9 +281,9 @@ diff -up zabbix-5.0.18/src/libs/zbxmodules/Makefile.am.out-of-tree zabbix-5.0.18 noinst_LIBRARIES = libzbxmodules.a libzbxmodules_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxnix/Makefile.am ---- zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxnix/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxnix/Makefile.am +--- zabbix-5.0.30/src/libs/zbxnix/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxnix/Makefile.am 2023-01-19 17:41:35.780763285 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -262,9 +292,9 @@ diff -up zabbix-5.0.18/src/libs/zbxnix/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxnix.a libzbxnix_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am ---- zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxprometheus/Makefile.am +--- zabbix-5.0.30/src/libs/zbxprometheus/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxprometheus/Makefile.am 2023-01-19 17:41:35.780763285 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -273,9 +303,9 @@ diff -up zabbix-5.0.18/src/libs/zbxprometheus/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libzbxprometheus.a libzbxprometheus_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxregexp/Makefile.am ---- zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxregexp/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxregexp/Makefile.am +--- zabbix-5.0.30/src/libs/zbxregexp/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxregexp/Makefile.am 2023-01-19 17:41:35.781763291 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -284,9 +314,9 @@ diff -up zabbix-5.0.18/src/libs/zbxregexp/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxregexp.a libzbxregexp_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxself/Makefile.am ---- zabbix-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxself/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxself/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxself/Makefile.am +--- zabbix-5.0.30/src/libs/zbxself/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxself/Makefile.am 2023-01-19 17:41:35.781763291 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -295,9 +325,9 @@ diff -up zabbix-5.0.18/src/libs/zbxself/Makefile.am.out-of-tree zabbix-5.0.18/sr noinst_LIBRARIES = libzbxself.a libzbxself_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxserver/Makefile.am ---- zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxserver/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxserver/Makefile.am +--- zabbix-5.0.30/src/libs/zbxserver/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxserver/Makefile.am 2023-01-19 17:41:35.781763291 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -306,9 +336,9 @@ diff -up zabbix-5.0.18/src/libs/zbxserver/Makefile.am.out-of-tree zabbix-5.0.18/ noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a libzbxserver_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/agent/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/agent/Makefile.am 2023-01-19 17:41:35.782763297 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -317,9 +347,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/agent/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libagentsysinfo.a libagentsysinfo_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am 2021-11-30 18:52:58.206303636 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/aix/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/aix/Makefile.am 2023-01-19 17:41:35.782763297 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -328,9 +358,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/aix/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/common/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/common/Makefile.am 2023-01-19 17:41:35.783763303 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -339,9 +369,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/common/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a libcommonsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent/ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/freebsd/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/freebsd/Makefile.am 2023-01-19 17:41:35.783763303 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -350,9 +380,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/freebsd/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/hpux/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/hpux/Makefile.am 2023-01-19 17:41:35.784763309 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -361,9 +391,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/hpux/Makefile.am.out-of-tree zabbix-5 noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/linux/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/linux/Makefile.am 2023-01-19 17:41:35.784763309 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -372,9 +402,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/linux/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/Makefile.am 2023-01-19 17:41:35.785763314 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -383,9 +413,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/Makefile.am.out-of-tree zabbix-5.0.18 DIST_SUBDIRS = \ agent \ common \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/netbsd/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/netbsd/Makefile.am 2023-01-19 17:41:35.785763314 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -394,9 +424,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/netbsd/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/openbsd/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/openbsd/Makefile.am 2023-01-19 17:41:35.786763320 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -405,9 +435,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/openbsd/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am 2021-11-30 18:52:58.207303645 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/osf/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/osf/Makefile.am 2023-01-19 17:41:35.786763320 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -416,9 +446,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osf/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/osx/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/osx/Makefile.am 2023-01-19 17:41:35.787763326 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -427,9 +457,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/osx/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/simple/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/simple/Makefile.am 2023-01-19 17:41:35.787763326 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -438,9 +468,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/simple/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libsimplesysinfo.a libsimplesysinfo_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/solaris/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/solaris/Makefile.am 2023-01-19 17:41:35.788763332 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -449,9 +479,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/solaris/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsysinfo/unknown/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsysinfo/unknown/Makefile.am 2023-01-19 17:41:35.788763332 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -460,9 +490,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsysinfo/unknown/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libspecsysinfo.a libspechostnamesysinfo.a libspecsysinfo_a_CFLAGS = -I$(top_srcdir)/src/zabbix_agent -diff -up zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxsys/Makefile.am ---- zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxsys/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxsys/Makefile.am +--- zabbix-5.0.30/src/libs/zbxsys/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxsys/Makefile.am 2023-01-19 17:41:35.788763332 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -471,9 +501,9 @@ diff -up zabbix-5.0.18/src/libs/zbxsys/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxsys.a libzbxsys_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxtasks/Makefile.am ---- zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree 2021-09-06 07:44:59.000000000 -0600 -+++ zabbix-5.0.18/src/libs/zbxtasks/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxtasks/Makefile.am +--- zabbix-5.0.30/src/libs/zbxtasks/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxtasks/Makefile.am 2023-01-19 17:41:35.789763338 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -482,9 +512,9 @@ diff -up zabbix-5.0.18/src/libs/zbxtasks/Makefile.am.out-of-tree zabbix-5.0.18/s noinst_LIBRARIES = libzbxtasks.a libzbxtasks_a_SOURCES = \ -diff -up zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-5.0.18/src/libs/zbxxml/Makefile.am ---- zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/libs/zbxxml/Makefile.am 2021-11-30 19:00:54.721475933 -0700 +diff -up zabbix-5.0.30/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-5.0.30/src/libs/zbxxml/Makefile.am +--- zabbix-5.0.30/src/libs/zbxxml/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/libs/zbxxml/Makefile.am 2023-01-19 17:41:35.789763338 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -493,9 +523,9 @@ diff -up zabbix-5.0.18/src/libs/zbxxml/Makefile.am.out-of-tree zabbix-5.0.18/src noinst_LIBRARIES = libzbxxml.a libzbxxml_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am ---- zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_agent/logfiles/Makefile.am +--- zabbix-5.0.30/src/zabbix_agent/logfiles/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_agent/logfiles/Makefile.am 2023-01-19 17:41:35.790763343 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -504,9 +534,9 @@ diff -up zabbix-5.0.18/src/zabbix_agent/logfiles/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxlogfiles.a libzbxlogfiles_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_agent/Makefile.am ---- zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_agent/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/zabbix_agent/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_agent/Makefile.am +--- zabbix-5.0.30/src/zabbix_agent/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_agent/Makefile.am 2023-01-19 17:41:35.790763343 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -521,9 +551,9 @@ diff -up zabbix-5.0.18/src/zabbix_agent/Makefile.am.out-of-tree zabbix-5.0.18/sr $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" - test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "../../conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" + test -f "$(DESTDIR)$(AGENT_CONFIG_FILE)" || cp "$(top_srcdir)/conf/zabbix_agentd.conf" "$(DESTDIR)$(AGENT_CONFIG_FILE)" -diff -up zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_get/Makefile.am ---- zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_get/Makefile.am 2021-11-30 18:52:58.208303654 -0700 +diff -up zabbix-5.0.30/src/zabbix_get/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_get/Makefile.am +--- zabbix-5.0.30/src/zabbix_get/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_get/Makefile.am 2023-01-19 17:41:35.791763349 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -532,9 +562,41 @@ diff -up zabbix-5.0.18/src/zabbix_get/Makefile.am.out-of-tree zabbix-5.0.18/src/ bin_PROGRAMS = zabbix_get zabbix_get_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_js/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_js/Makefile.am ---- zabbix-5.0.18/src/zabbix_js/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_js/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_java/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_java/Makefile.am +--- zabbix-5.0.30/src/zabbix_java/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_java/Makefile.am 2023-01-19 17:41:35.805763431 -0700 +@@ -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-5.0.30/src/zabbix_js/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_js/Makefile.am +--- zabbix-5.0.30/src/zabbix_js/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_js/Makefile.am 2023-01-19 17:41:35.791763349 -0700 @@ -1,24 +1,26 @@ ## Process this file with automake to produce Makefile.in @@ -576,9 +638,9 @@ diff -up zabbix-5.0.18/src/zabbix_js/Makefile.am.out-of-tree zabbix-5.0.18/src/z zabbix_js_LDADD += @ZBXJS_LIBS@ -diff -up zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_proxy/datasender/Makefile.am +--- zabbix-5.0.30/src/zabbix_proxy/datasender/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_proxy/datasender/Makefile.am 2023-01-19 17:41:35.792763355 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -587,9 +649,9 @@ diff -up zabbix-5.0.18/src/zabbix_proxy/datasender/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxdatasender.a libzbxdatasender_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_proxy/heart/Makefile.am +--- zabbix-5.0.30/src/zabbix_proxy/heart/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_proxy/heart/Makefile.am 2023-01-19 17:41:35.792763355 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -598,9 +660,9 @@ diff -up zabbix-5.0.18/src/zabbix_proxy/heart/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libzbxheart.a libzbxheart_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_proxy/housekeeper/Makefile.am +--- zabbix-5.0.30/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_proxy/housekeeper/Makefile.am 2023-01-19 17:41:35.793763361 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -609,9 +671,9 @@ diff -up zabbix-5.0.18/src/zabbix_proxy/housekeeper/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_proxy/Makefile.am +--- zabbix-5.0.30/src/zabbix_proxy/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_proxy/Makefile.am 2023-01-19 17:41:35.793763361 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -626,9 +688,9 @@ diff -up zabbix-5.0.18/src/zabbix_proxy/Makefile.am.out-of-tree zabbix-5.0.18/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-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_proxy/proxyconfig/Makefile.am +--- zabbix-5.0.30/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_proxy/proxyconfig/Makefile.am 2023-01-19 17:41:35.793763361 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -637,9 +699,9 @@ diff -up zabbix-5.0.18/src/zabbix_proxy/proxyconfig/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxproxyconfig.a libzbxproxyconfig_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am ---- zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_proxy/taskmanager/Makefile.am +--- zabbix-5.0.30/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_proxy/taskmanager/Makefile.am 2023-01-19 17:41:35.794763367 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -648,9 +710,9 @@ diff -up zabbix-5.0.18/src/zabbix_proxy/taskmanager/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_sender/Makefile.am ---- zabbix-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_sender/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_sender/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_sender/Makefile.am +--- zabbix-5.0.30/src/zabbix_sender/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_sender/Makefile.am 2023-01-19 17:41:35.794763367 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -659,9 +721,9 @@ diff -up zabbix-5.0.18/src/zabbix_sender/Makefile.am.out-of-tree zabbix-5.0.18/s bin_PROGRAMS = zabbix_sender zabbix_sender_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/alerter/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/alerter/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/alerter/Makefile.am 2023-01-19 17:41:35.795763373 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -670,9 +732,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/alerter/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxalerter.a libzbxalerter_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am 2021-11-30 18:52:58.209303663 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/dbconfig/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/dbconfig/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/dbconfig/Makefile.am 2023-01-19 17:41:35.795763373 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -681,9 +743,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/dbconfig/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxdbconfig.a libzbxdbconfig_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/dbsyncer/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/dbsyncer/Makefile.am 2023-01-19 17:41:35.796763378 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -692,9 +754,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/dbsyncer/Makefile.am.out-of-tree zabbix noinst_LIBRARIES = libzbxdbsyncer.a libzbxdbsyncer_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/discoverer/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/discoverer/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/discoverer/Makefile.am 2023-01-19 17:41:35.796763378 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -703,9 +765,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/discoverer/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxdiscoverer.a libzbxdiscoverer_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/escalator/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/escalator/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/escalator/Makefile.am 2023-01-19 17:41:35.796763378 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -714,9 +776,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/escalator/Makefile.am.out-of-tree zabbi noinst_LIBRARIES = libzbxescalator.a libzbxescalator_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/housekeeper/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/housekeeper/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/housekeeper/Makefile.am 2023-01-19 17:41:35.797763384 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -725,9 +787,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/housekeeper/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxhousekeeper.a libzbxhousekeeper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/httppoller/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/httppoller/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/httppoller/Makefile.am 2023-01-19 17:41:35.797763384 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -736,9 +798,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/httppoller/Makefile.am.out-of-tree zabb noinst_LIBRARIES = libzbxhttppoller.a libzbxhttppoller_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/ipmi/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/ipmi/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/ipmi/Makefile.am 2023-01-19 17:41:35.798763390 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -747,9 +809,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/ipmi/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libipmi.a libipmi_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/lld/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/lld/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/lld/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/lld/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/lld/Makefile.am 2023-01-19 17:41:35.798763390 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -758,9 +820,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/lld/Makefile.am.out-of-tree zabbix-5.0. noinst_LIBRARIES = libzbxlld.a libzbxlld_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/Makefile.am 2023-01-19 17:41:35.799763396 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -775,9 +837,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/Makefile.am.out-of-tree zabbix-5.0.18/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-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/odbc/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/odbc/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/odbc/Makefile.am 2023-01-19 17:41:35.799763396 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -786,9 +848,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/odbc/Makefile.am.out-of-tree zabbix-5.0 noinst_LIBRARIES = libzbxodbc.a libzbxodbc_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am 2021-11-30 18:52:58.210303672 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/pinger/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/pinger/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/pinger/Makefile.am 2023-01-19 17:41:35.800763402 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -797,9 +859,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/pinger/Makefile.am.out-of-tree zabbix-5 noinst_LIBRARIES = libzbxpinger.a libzbxpinger_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/poller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/poller/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/poller/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/poller/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/poller/Makefile.am 2023-01-19 17:41:35.800763402 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -808,9 +870,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/poller/Makefile.am.out-of-tree zabbix-5 noinst_LIBRARIES = libzbxpoller.a libzbxpoller_server.a libzbxpoller_proxy.a libzbxpoller_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/preprocessor/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/preprocessor/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/preprocessor/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/preprocessor/Makefile.am 2023-01-19 17:41:35.801763407 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -819,9 +881,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/preprocessor/Makefile.am.out-of-tree za noinst_LIBRARIES = libpreprocessor.a libpreprocessor_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/proxypoller/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/proxypoller/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/proxypoller/Makefile.am 2023-01-19 17:41:35.801763407 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -830,9 +892,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/proxypoller/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxproxypoller.a libzbxproxypoller_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/scripts/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/scripts/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/scripts/Makefile.am 2023-01-19 17:41:35.802763413 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -841,9 +903,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/scripts/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxscripts.a libzbxscripts_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/selfmon/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/selfmon/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/selfmon/Makefile.am 2023-01-19 17:41:35.802763413 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -852,9 +914,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/selfmon/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxselfmon.a libzbxselfmon_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/snmptrapper/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/snmptrapper/Makefile.am 2023-01-19 17:41:35.803763419 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -863,9 +925,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/snmptrapper/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxsnmptrapper.a libzbxsnmptrapper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/taskmanager/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/taskmanager/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/taskmanager/Makefile.am 2023-01-19 17:41:35.803763419 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -874,9 +936,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/taskmanager/Makefile.am.out-of-tree zab noinst_LIBRARIES = libzbxtaskmanager.a libzbxtaskmanager_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/timer/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/timer/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/timer/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/timer/Makefile.am.out-of-tree 2022-11-21 02:18:41.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/timer/Makefile.am 2023-01-19 17:41:35.803763419 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -885,9 +947,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/timer/Makefile.am.out-of-tree zabbix-5. noinst_LIBRARIES = libzbxtimer.a libzbxtimer_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/trapper/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/trapper/Makefile.am.out-of-tree 2022-11-28 01:50:28.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/trapper/Makefile.am 2023-01-19 17:41:35.804763425 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -896,9 +958,9 @@ diff -up zabbix-5.0.18/src/zabbix_server/trapper/Makefile.am.out-of-tree zabbix- noinst_LIBRARIES = libzbxtrapper.a libzbxtrapper_a_SOURCES = \ -diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am ---- zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree 2021-11-29 01:55:01.000000000 -0700 -+++ zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am 2021-11-30 18:52:58.211303681 -0700 +diff -up zabbix-5.0.30/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5.0.30/src/zabbix_server/vmware/Makefile.am +--- zabbix-5.0.30/src/zabbix_server/vmware/Makefile.am.out-of-tree 2022-11-25 02:47:04.000000000 -0700 ++++ zabbix-5.0.30/src/zabbix_server/vmware/Makefile.am 2023-01-19 17:41:35.804763425 -0700 @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in @@ -907,59 +969,3 @@ diff -up zabbix-5.0.18/src/zabbix_server/vmware/Makefile.am.out-of-tree zabbix-5 noinst_LIBRARIES = libzbxvmware.a libzbxvmware_a_SOURCES = \ ---- zabbix-5.0.19/src/zabbix_java/Makefile.am~ 2021-12-23 02:48:34.000000000 -0600 -+++ zabbix-5.0.19/src/zabbix_java/Makefile.am 2022-01-14 11:13:42.354979184 -0600 -@@ -9,22 +9,22 @@ - 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: ---- zabbix-5.0.21/src/go/Makefile.am~ 2022-02-28 03:12:28.000000000 -0600 -+++ zabbix-5.0.21/src/go/Makefile.am 2022-03-11 11:38:56.831860649 -0600 -@@ -20,18 +20,18 @@ - all: build - - build: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go build -ldflags="${GOLDFLAGS}" -o bin $(srcdir)/... - - clean: -- go clean ./... -+ go clean $(srcdir)/... - rm -f bin/zabbix_agent2 bin/mock_server - - install: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \ - go install -ldflags="${GOLDFLAGS}" zabbix.com/cmd/zabbix_agent2 -- test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" -+ test -f "$(DESTDIR)@AGENT2_CONFIG_FILE@" || cp "$(top_srcdir)conf/zabbix_agent2.conf" "$(DESTDIR)@AGENT2_CONFIG_FILE@" - - check: -- CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./... -+ CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test $(srcdir)/... - style: - CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" golangci-lint run --new-from-rev=$(NEW_FROM_REV) ./... diff --git a/zabbix.spec b/zabbix.spec index 7f5afae..3f027d7 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -16,7 +16,7 @@ Name: zabbix Epoch: 1 -Version: 5.0.21 +Version: 5.0.30 Release: 1%{?dist} Summary: Open-source monitoring solution for your IT infrastructure @@ -801,6 +801,9 @@ fi %files web-pgsql %changelog +* Fri Jan 20 2023 Orion Poplawski - 1:5.0.30-1 +- Update to 5.0.30 + * Fri Mar 11 2022 Gwyn Ciesla - 1:5.0.21-1 - 5.0.21