Received: by mail.netbsd.org (Postfix, from userid 605) id 7239284D2C; Tue, 3 Jan 2023 13:59:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A0A0184CDC for ; Tue, 3 Jan 2023 13:59:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id tbpavz1ZiIFM for ; Tue, 3 Jan 2023 13:59:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2BA5984CD9 for ; Tue, 3 Jan 2023 13:59:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 24C64FA90; Tue, 3 Jan 2023 13:59:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1672754356119380" MIME-Version: 1.0 Date: Tue, 3 Jan 2023 13:59:16 +0000 From: "Juraj Lutter" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: otis@netbsd.org X-Mailer: log_accum Message-Id: <20230103135916.24C64FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1672754356119380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: otis Date: Tue Jan 3 13:59:15 UTC 2023 Modified Files: pkgsrc/sysutils/zabbix50-agent: Makefile distinfo pkgsrc/sysutils/zabbix50-frontend: PLIST distinfo pkgsrc/sysutils/zabbix50-java: Makefile PLIST distinfo pkgsrc/sysutils/zabbix50-proxy: Makefile distinfo options.mk pkgsrc/sysutils/zabbix50-server: Makefile Makefile.common distinfo options.mk pkgsrc/sysutils/zabbix50-server/patches: patch-src_libs_zbxsysinfo_netbsd_net.c Added Files: pkgsrc/sysutils/zabbix50-server/patches: patch-configure patch-src_zabbix__agent_Makefile.in patch-src_zabbix__proxy_Makefile.am Removed Files: pkgsrc/sysutils/zabbix50-agent/patches: patch-configure patch-src_libs_zbxsysinfo_netbsd_net.c patch-src_zabbix__agent_Makefile.in pkgsrc/sysutils/zabbix50-java/patches: patch-configure pkgsrc/sysutils/zabbix50-proxy/patches: patch-m4_ax__lib__mysql.m4 patch-m4_libssh.m4 patch-src_libs_zbxsysinfo_netbsd_net.c patch-src_zabbix__proxy_Makefile.am Log Message: zabbix50: Update to 5.0.30 Changelog for 5.0.30: New features: - Added JSONPath optimizations Bug fixes: - Removed the ability to import a graph with an empty name and added graph name length validation up to 128 characters - Fixed the "i" icon alignment in the Info column in Problems section with compact view - Improved history syncer performance - Fixed vfs.fs.inode and vfs.fs.get to handle file systems with zero total inodes count - Fixed Zabbix JS (zabbix_js) crash when parsing short version of "timeout" option -t - Fixed script in OPSgenie media - Fixed spoofing X-Forwarded-For request header allows to access Frontend in maintenace mode For details see https://www.zabbix.com/rn/rn5.0.30 And while here, also: - Consolidate and deduplicate patches (move all of them into zabbix50-server/patches) - Allow only one of the database to be selected (mysql or pgsql) - Regenerate NetBSD-specific patch To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/zabbix50-agent/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/zabbix50-agent/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/zabbix50-agent/patches/patch-configure \ pkgsrc/sysutils/zabbix50-agent/patches/patch-src_libs_zbxsysinfo_netbsd_net.c \ pkgsrc/sysutils/zabbix50-agent/patches/patch-src_zabbix__agent_Makefile.in cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/zabbix50-frontend/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix50-frontend/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/zabbix50-java/Makefile \ pkgsrc/sysutils/zabbix50-java/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix50-java/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/zabbix50-java/patches/patch-configure cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/zabbix50-proxy/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix50-proxy/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix50-proxy/options.mk cvs rdiff -u -r1.1 -r0 \ pkgsrc/sysutils/zabbix50-proxy/patches/patch-m4_ax__lib__mysql.m4 \ pkgsrc/sysutils/zabbix50-proxy/patches/patch-m4_libssh.m4 \ pkgsrc/sysutils/zabbix50-proxy/patches/patch-src_libs_zbxsysinfo_netbsd_net.c \ pkgsrc/sysutils/zabbix50-proxy/patches/patch-src_zabbix__proxy_Makefile.am cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/zabbix50-server/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/zabbix50-server/Makefile.common cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix50-server/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/zabbix50-server/options.mk cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/zabbix50-server/patches/patch-configure \ pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__agent_Makefile.in \ pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__proxy_Makefile.am cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/zabbix50-server/patches/patch-src_libs_zbxsysinfo_netbsd_net.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1672754356119380 Content-Disposition: inline Content-Length: 28935 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/zabbix50-agent/Makefile diff -u pkgsrc/sysutils/zabbix50-agent/Makefile:1.13 pkgsrc/sysutils/zabbix50-agent/Makefile:1.14 --- pkgsrc/sysutils/zabbix50-agent/Makefile:1.13 Fri Dec 23 12:34:05 2022 +++ pkgsrc/sysutils/zabbix50-agent/Makefile Tue Jan 3 13:59:14 2023 @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.13 2022/12/23 12:34:05 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/01/03 13:59:14 otis Exp $ -PKGREVISION= 4 .include "../../sysutils/zabbix50-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-agent-/} COMMENT= Enterprise-class Monitoring Solution for Everyone +PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches + CONFLICTS+= zabbix-[0-9]* CONFLICTS+= zabbix-agent-[0-9]* Index: pkgsrc/sysutils/zabbix50-agent/distinfo diff -u pkgsrc/sysutils/zabbix50-agent/distinfo:1.8 pkgsrc/sysutils/zabbix50-agent/distinfo:1.9 --- pkgsrc/sysutils/zabbix50-agent/distinfo:1.8 Fri Dec 23 11:03:13 2022 +++ pkgsrc/sysutils/zabbix50-agent/distinfo Tue Jan 3 13:59:14 2023 @@ -1,8 +1,12 @@ -$NetBSD: distinfo,v 1.8 2022/12/23 11:03:13 wiz Exp $ +$NetBSD: distinfo,v 1.9 2023/01/03 13:59:14 otis Exp $ -BLAKE2s (zabbix-5.0.17.tar.gz) = 7b5d674d79c41a0c9d9f6a8431408deaea101c5fe32034c115b3cb0350b9d647 -SHA512 (zabbix-5.0.17.tar.gz) = f7a23b51c3d2fb5f80ec888dc9eaf592dd13de3a61b9d065e6d54e1bb406e18ffef1b8e9d3ef516b2034d94fb7330bd80c2cb7b7d22eed7e57021bc66e1ee159 -Size (zabbix-5.0.17.tar.gz) = 21326776 bytes +BLAKE2s (zabbix-5.0.30.tar.gz) = f4d7efd99353063d457be0887570fe03b27acdf5e24836035c92a9f054a5ed13 +SHA512 (zabbix-5.0.30.tar.gz) = 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e +Size (zabbix-5.0.30.tar.gz) = 21505195 bytes SHA1 (patch-configure) = cf647b9ee52a96882d31f8783ac19b66e3e65105 -SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 468f2112a3d65b0a73f371194ae15ce0df0ad71c +SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc +SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df +SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553 SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86 +SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5 +SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67 Index: pkgsrc/sysutils/zabbix50-frontend/PLIST diff -u pkgsrc/sysutils/zabbix50-frontend/PLIST:1.3 pkgsrc/sysutils/zabbix50-frontend/PLIST:1.4 --- pkgsrc/sysutils/zabbix50-frontend/PLIST:1.3 Sat Nov 13 20:41:09 2021 +++ pkgsrc/sysutils/zabbix50-frontend/PLIST Tue Jan 3 13:59:15 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2021/11/13 20:41:09 otis Exp $ +@comment $NetBSD: PLIST,v 1.4 2023/01/03 13:59:15 otis Exp $ share/examples/${PKGBASE}/httpd-zabbix.conf share/examples/${PKGBASE}/php-fpm-zabbix.conf share/zabbix/actionconf.php @@ -101,7 +101,9 @@ share/zabbix/app/controllers/CController share/zabbix/app/controllers/CControllerPopupTestTriggerExpr.php share/zabbix/app/controllers/CControllerPopupTriggerExpr.php share/zabbix/app/controllers/CControllerPopupTriggerWizard.php +share/zabbix/app/controllers/CControllerProblem.php share/zabbix/app/controllers/CControllerProblemView.php +share/zabbix/app/controllers/CControllerProblemViewRefresh.php share/zabbix/app/controllers/CControllerProfileUpdate.php share/zabbix/app/controllers/CControllerProxyCreate.php share/zabbix/app/controllers/CControllerProxyDelete.php @@ -199,6 +201,7 @@ share/zabbix/app/partials/massupdate.mac share/zabbix/app/partials/monitoring.dashboard.breadcrumbs.php share/zabbix/app/partials/monitoring.host.view.html.php share/zabbix/app/partials/monitoring.latest.view.html.php +share/zabbix/app/partials/monitoring.problem.view.html.php share/zabbix/app/partials/popup.operations.php share/zabbix/app/partials/trigoverview.table.left.php share/zabbix/app/partials/trigoverview.table.top.php @@ -293,6 +296,7 @@ share/zabbix/app/views/monitoring.latest share/zabbix/app/views/monitoring.latest.view.refresh.php share/zabbix/app/views/monitoring.map.view.php share/zabbix/app/views/monitoring.problem.view.php +share/zabbix/app/views/monitoring.problem.view.refresh.php share/zabbix/app/views/monitoring.web.view.php share/zabbix/app/views/monitoring.widget.actionlog.view.php share/zabbix/app/views/monitoring.widget.clock.view.php @@ -1061,6 +1065,7 @@ share/zabbix/jsrpc.php share/zabbix/local/.htaccess share/zabbix/local/README share/zabbix/locale/README +share/zabbix/locale/README.md share/zabbix/locale/add_new_language.sh share/zabbix/locale/bg/LC_MESSAGES/frontend.mo share/zabbix/locale/bg/LC_MESSAGES/frontend.po @@ -1068,10 +1073,13 @@ share/zabbix/locale/ca/LC_MESSAGES/front share/zabbix/locale/ca/LC_MESSAGES/frontend.po share/zabbix/locale/cs/LC_MESSAGES/frontend.mo share/zabbix/locale/cs/LC_MESSAGES/frontend.po +share/zabbix/locale/da/LC_MESSAGES/frontend.mo +share/zabbix/locale/da/LC_MESSAGES/frontend.po share/zabbix/locale/de/LC_MESSAGES/frontend.mo share/zabbix/locale/de/LC_MESSAGES/frontend.po share/zabbix/locale/el/LC_MESSAGES/frontend.mo share/zabbix/locale/el/LC_MESSAGES/frontend.po +share/zabbix/locale/en/LC_MESSAGES/frontend.pot share/zabbix/locale/en_US/LC_MESSAGES/frontend.mo share/zabbix/locale/en_US/LC_MESSAGES/frontend.po share/zabbix/locale/es/LC_MESSAGES/frontend.mo @@ -1101,8 +1109,8 @@ share/zabbix/locale/lt/LC_MESSAGES/front share/zabbix/locale/lv/LC_MESSAGES/frontend.mo share/zabbix/locale/lv/LC_MESSAGES/frontend.po share/zabbix/locale/make_mo.sh -share/zabbix/locale/nb/LC_MESSAGES/frontend.mo -share/zabbix/locale/nb/LC_MESSAGES/frontend.po +share/zabbix/locale/nb_NO/LC_MESSAGES/frontend.mo +share/zabbix/locale/nb_NO/LC_MESSAGES/frontend.po share/zabbix/locale/nl/LC_MESSAGES/frontend.mo share/zabbix/locale/nl/LC_MESSAGES/frontend.po share/zabbix/locale/pl/LC_MESSAGES/frontend.mo @@ -1117,8 +1125,8 @@ share/zabbix/locale/ru/LC_MESSAGES/front share/zabbix/locale/ru/LC_MESSAGES/frontend.po share/zabbix/locale/sk/LC_MESSAGES/frontend.mo share/zabbix/locale/sk/LC_MESSAGES/frontend.po -share/zabbix/locale/sv/LC_MESSAGES/frontend.mo -share/zabbix/locale/sv/LC_MESSAGES/frontend.po +share/zabbix/locale/sv_SE/LC_MESSAGES/frontend.mo +share/zabbix/locale/sv_SE/LC_MESSAGES/frontend.po share/zabbix/locale/tr/LC_MESSAGES/frontend.mo share/zabbix/locale/tr/LC_MESSAGES/frontend.po share/zabbix/locale/uk/LC_MESSAGES/frontend.mo Index: pkgsrc/sysutils/zabbix50-frontend/distinfo diff -u pkgsrc/sysutils/zabbix50-frontend/distinfo:1.6 pkgsrc/sysutils/zabbix50-frontend/distinfo:1.7 --- pkgsrc/sysutils/zabbix50-frontend/distinfo:1.6 Sat Nov 13 20:41:09 2021 +++ pkgsrc/sysutils/zabbix50-frontend/distinfo Tue Jan 3 13:59:15 2023 @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2021/11/13 20:41:09 otis Exp $ +$NetBSD: distinfo,v 1.7 2023/01/03 13:59:15 otis Exp $ -BLAKE2s (zabbix-5.0.17.tar.gz) = 7b5d674d79c41a0c9d9f6a8431408deaea101c5fe32034c115b3cb0350b9d647 -SHA512 (zabbix-5.0.17.tar.gz) = f7a23b51c3d2fb5f80ec888dc9eaf592dd13de3a61b9d065e6d54e1bb406e18ffef1b8e9d3ef516b2034d94fb7330bd80c2cb7b7d22eed7e57021bc66e1ee159 -Size (zabbix-5.0.17.tar.gz) = 21326776 bytes +BLAKE2s (zabbix-5.0.30.tar.gz) = f4d7efd99353063d457be0887570fe03b27acdf5e24836035c92a9f054a5ed13 +SHA512 (zabbix-5.0.30.tar.gz) = 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e +Size (zabbix-5.0.30.tar.gz) = 21505195 bytes Index: pkgsrc/sysutils/zabbix50-java/Makefile diff -u pkgsrc/sysutils/zabbix50-java/Makefile:1.3 pkgsrc/sysutils/zabbix50-java/Makefile:1.4 --- pkgsrc/sysutils/zabbix50-java/Makefile:1.3 Mon Jul 25 11:12:28 2022 +++ pkgsrc/sysutils/zabbix50-java/Makefile Tue Jan 3 13:59:15 2023 @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2022/07/25 11:12:28 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2023/01/03 13:59:15 otis Exp $ .include "../../sysutils/zabbix50-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-java-/} COMMENT= Enterprise-class Monitoring Solution for Everyone +PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-java CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -13,7 +15,7 @@ CONFIGURE_ENV+= JAVAC=${PKG_JAVA_HOME}/b CONFIGURE_ENV+= JAR=${PKG_JAVA_HOME}/bin/jar USE_JAVA= run -PKG_JVMS_ACCEPTED= openjdk8 +PKG_JVMS_ACCEPTED= openjdk8 openjdk11 SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure Index: pkgsrc/sysutils/zabbix50-java/PLIST diff -u pkgsrc/sysutils/zabbix50-java/PLIST:1.3 pkgsrc/sysutils/zabbix50-java/PLIST:1.4 --- pkgsrc/sysutils/zabbix50-java/PLIST:1.3 Sat Nov 13 20:41:09 2021 +++ pkgsrc/sysutils/zabbix50-java/PLIST Tue Jan 3 13:59:15 2023 @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.3 2021/11/13 20:41:09 otis Exp $ +@comment $NetBSD: PLIST,v 1.4 2023/01/03 13:59:15 otis Exp $ sbin/zabbix_java/bin/zabbix-java-gateway-${PKGVERSION}.jar sbin/zabbix_java/lib/android-json-4.3_r3.1.jar -sbin/zabbix_java/lib/logback-classic-1.2.3.jar +sbin/zabbix_java/lib/logback-classic-1.2.9.jar sbin/zabbix_java/lib/logback-console.xml -sbin/zabbix_java/lib/logback-core-1.2.3.jar +sbin/zabbix_java/lib/logback-core-1.2.9.jar sbin/zabbix_java/lib/logback.xml -sbin/zabbix_java/lib/slf4j-api-1.7.30.jar +sbin/zabbix_java/lib/slf4j-api-1.7.32.jar sbin/zabbix_java/settings.sh sbin/zabbix_java/shutdown.sh sbin/zabbix_java/startup.sh Index: pkgsrc/sysutils/zabbix50-java/distinfo diff -u pkgsrc/sysutils/zabbix50-java/distinfo:1.6 pkgsrc/sysutils/zabbix50-java/distinfo:1.7 --- pkgsrc/sysutils/zabbix50-java/distinfo:1.6 Sat Nov 13 20:41:09 2021 +++ pkgsrc/sysutils/zabbix50-java/distinfo Tue Jan 3 13:59:15 2023 @@ -1,6 +1,12 @@ -$NetBSD: distinfo,v 1.6 2021/11/13 20:41:09 otis Exp $ +$NetBSD: distinfo,v 1.7 2023/01/03 13:59:15 otis Exp $ -BLAKE2s (zabbix-5.0.17.tar.gz) = 7b5d674d79c41a0c9d9f6a8431408deaea101c5fe32034c115b3cb0350b9d647 -SHA512 (zabbix-5.0.17.tar.gz) = f7a23b51c3d2fb5f80ec888dc9eaf592dd13de3a61b9d065e6d54e1bb406e18ffef1b8e9d3ef516b2034d94fb7330bd80c2cb7b7d22eed7e57021bc66e1ee159 -Size (zabbix-5.0.17.tar.gz) = 21326776 bytes +BLAKE2s (zabbix-5.0.30.tar.gz) = f4d7efd99353063d457be0887570fe03b27acdf5e24836035c92a9f054a5ed13 +SHA512 (zabbix-5.0.30.tar.gz) = 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e +Size (zabbix-5.0.30.tar.gz) = 21505195 bytes SHA1 (patch-configure) = cf647b9ee52a96882d31f8783ac19b66e3e65105 +SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc +SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df +SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553 +SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86 +SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5 +SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67 Index: pkgsrc/sysutils/zabbix50-proxy/Makefile diff -u pkgsrc/sysutils/zabbix50-proxy/Makefile:1.13 pkgsrc/sysutils/zabbix50-proxy/Makefile:1.14 --- pkgsrc/sysutils/zabbix50-proxy/Makefile:1.13 Wed Nov 23 16:21:10 2022 +++ pkgsrc/sysutils/zabbix50-proxy/Makefile Tue Jan 3 13:59:15 2023 @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.13 2022/11/23 16:21:10 adam Exp $ +# $NetBSD: Makefile,v 1.14 2023/01/03 13:59:15 otis Exp $ -PKGREVISION= 4 .include "../../sysutils/zabbix50-server/Makefile.common" PKGNAME= ${DISTNAME:S/-/-proxy-${ZABBIX_DB_TYPE}-/} COMMENT= Enterprise-class Monitoring Solution for Everyone +PATCHDIR= ${.CURDIR}/../../sysutils/zabbix50-server/patches + CONFLICTS+= zabbix-[0-9]* CONFLICTS+= zabbix-proxy-[0-9]* @@ -53,11 +54,11 @@ CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 .include "../../mk/bsd.prefs.mk" pre-configure: - set -e; cd ${WRKSRC}; \ - aclocal -I m4 ; automake -ai --foreign; autoconf -I m4 + cd ${WRKSRC} && \ + aclocal -I m4 && automake -ai --foreign && autoconf -I m4 post-install: - cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \ + cd ${WRKSRC}/database/${ZABBIX_DB_TYPE} && \ ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/ ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile* ${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/data.sql Index: pkgsrc/sysutils/zabbix50-proxy/distinfo diff -u pkgsrc/sysutils/zabbix50-proxy/distinfo:1.6 pkgsrc/sysutils/zabbix50-proxy/distinfo:1.7 --- pkgsrc/sysutils/zabbix50-proxy/distinfo:1.6 Sat Nov 13 20:41:09 2021 +++ pkgsrc/sysutils/zabbix50-proxy/distinfo Tue Jan 3 13:59:15 2023 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.6 2021/11/13 20:41:09 otis Exp $ +$NetBSD: distinfo,v 1.7 2023/01/03 13:59:15 otis Exp $ -BLAKE2s (zabbix-5.0.17.tar.gz) = 7b5d674d79c41a0c9d9f6a8431408deaea101c5fe32034c115b3cb0350b9d647 -SHA512 (zabbix-5.0.17.tar.gz) = f7a23b51c3d2fb5f80ec888dc9eaf592dd13de3a61b9d065e6d54e1bb406e18ffef1b8e9d3ef516b2034d94fb7330bd80c2cb7b7d22eed7e57021bc66e1ee159 -Size (zabbix-5.0.17.tar.gz) = 21326776 bytes +BLAKE2s (zabbix-5.0.30.tar.gz) = f4d7efd99353063d457be0887570fe03b27acdf5e24836035c92a9f054a5ed13 +SHA512 (zabbix-5.0.30.tar.gz) = 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e +Size (zabbix-5.0.30.tar.gz) = 21505195 bytes SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df -SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 468f2112a3d65b0a73f371194ae15ce0df0ad71c +SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553 SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5 +SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67 Index: pkgsrc/sysutils/zabbix50-proxy/options.mk diff -u pkgsrc/sysutils/zabbix50-proxy/options.mk:1.1 pkgsrc/sysutils/zabbix50-proxy/options.mk:1.2 --- pkgsrc/sysutils/zabbix50-proxy/options.mk:1.1 Tue Nov 3 22:45:38 2020 +++ pkgsrc/sysutils/zabbix50-proxy/options.mk Tue Jan 3 13:59:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2020/11/03 22:45:38 otis Exp $ +# $NetBSD: options.mk,v 1.2 2023/01/03 13:59:15 otis Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix50-proxy PKG_SUPPORTED_OPTIONS+= inet6 ipmi libssh libssh2 snmp @@ -12,6 +12,10 @@ PKG_SUGGESTED_OPTIONS+= inet6 .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql) && !empty(PKG_OPTIONS:Msqlite3) +IGNORE= Only one of mysql, pgsql or sqlite3 databases can be selected at the same time. +.endif + PLIST_VARS+= pgsql PLIST_VARS+= sqldb Index: pkgsrc/sysutils/zabbix50-server/Makefile diff -u pkgsrc/sysutils/zabbix50-server/Makefile:1.15 pkgsrc/sysutils/zabbix50-server/Makefile:1.16 --- pkgsrc/sysutils/zabbix50-server/Makefile:1.15 Wed Nov 23 16:21:10 2022 +++ pkgsrc/sysutils/zabbix50-server/Makefile Tue Jan 3 13:59:15 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2022/11/23 16:21:10 adam Exp $ +# $NetBSD: Makefile,v 1.16 2023/01/03 13:59:15 otis Exp $ # used by sysutils/zabbix50-proxy/Makefile # used by sysutils/zabbix50-agent/Makefile # -PKGREVISION= 4 .include "Makefile.common" PKGNAME= ${DISTNAME:S/-/-server-${ZABBIX_DB_TYPE}-/} @@ -64,11 +63,11 @@ REPLACE_BASH+= misc/snmptrap/snmptrap. .include "../../mk/bsd.prefs.mk" pre-configure: - set -e; cd ${WRKSRC}; \ - aclocal -I m4 ; automake -ai --foreign; autoconf -I m4 + cd ${WRKSRC} && \ + aclocal -I m4 && automake -ai --foreign && autoconf -I m4 post-install: - cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \ + cd ${WRKSRC}/database/${ZABBIX_DB_TYPE} && \ ${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/ .for MISCDIR in ${MISCDIRS} cd ${WRKSRC}/misc/${MISCDIR}; \ Index: pkgsrc/sysutils/zabbix50-server/Makefile.common diff -u pkgsrc/sysutils/zabbix50-server/Makefile.common:1.5 pkgsrc/sysutils/zabbix50-server/Makefile.common:1.6 --- pkgsrc/sysutils/zabbix50-server/Makefile.common:1.5 Fri Dec 23 12:34:05 2022 +++ pkgsrc/sysutils/zabbix50-server/Makefile.common Tue Jan 3 13:59:15 2023 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.5 2022/12/23 12:34:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.6 2023/01/03 13:59:15 otis Exp $ # used by sysutils/zabbix50-agent/Makefile # used by sysutils/zabbix50-proxy/Makefile # used by sysutils/zabbix50-server/Makefile # used by sysutils/zabbix50-frontend/Makefile # used by sysutils/zabbix50-java/Makefile -DISTNAME= zabbix-5.0.17 +DISTNAME= zabbix-5.0.30 CATEGORIES= sysutils MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PKGVERSION_NOREV:R}/ @@ -13,6 +13,8 @@ MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.zabbix.com/ LICENSE= gnu-gpl-v2 +.include "../../mk/bsd.prefs.mk" + # Zabbix user, common to all components ZABBIX_GROUP?= zabbix ZABBIX_USER?= zabbix Index: pkgsrc/sysutils/zabbix50-server/distinfo diff -u pkgsrc/sysutils/zabbix50-server/distinfo:1.6 pkgsrc/sysutils/zabbix50-server/distinfo:1.7 --- pkgsrc/sysutils/zabbix50-server/distinfo:1.6 Sat Nov 13 20:41:10 2021 +++ pkgsrc/sysutils/zabbix50-server/distinfo Tue Jan 3 13:59:15 2023 @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.6 2021/11/13 20:41:10 otis Exp $ +$NetBSD: distinfo,v 1.7 2023/01/03 13:59:15 otis Exp $ -BLAKE2s (zabbix-5.0.17.tar.gz) = 7b5d674d79c41a0c9d9f6a8431408deaea101c5fe32034c115b3cb0350b9d647 -SHA512 (zabbix-5.0.17.tar.gz) = f7a23b51c3d2fb5f80ec888dc9eaf592dd13de3a61b9d065e6d54e1bb406e18ffef1b8e9d3ef516b2034d94fb7330bd80c2cb7b7d22eed7e57021bc66e1ee159 -Size (zabbix-5.0.17.tar.gz) = 21326776 bytes +BLAKE2s (zabbix-5.0.30.tar.gz) = f4d7efd99353063d457be0887570fe03b27acdf5e24836035c92a9f054a5ed13 +SHA512 (zabbix-5.0.30.tar.gz) = 2f744fc1ba42ea0602cc90c91342f531c55cb1f76eda47c6e928e74dc595f7bd885f69abb52c6eb1b20e65bd6c3c46c299d6cfee2c3442db137561060386a31e +Size (zabbix-5.0.30.tar.gz) = 21505195 bytes +SHA1 (patch-configure) = cf647b9ee52a96882d31f8783ac19b66e3e65105 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df -SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = 468f2112a3d65b0a73f371194ae15ce0df0ad71c +SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553 +SHA1 (patch-src_zabbix__agent_Makefile.in) = efbd804ecee4b99db36db5f4fd61583b2ef96a86 +SHA1 (patch-src_zabbix__proxy_Makefile.am) = 9d2c3d5ca06e676154653b70f0931ed2ea281cf5 SHA1 (patch-src_zabbix__server_Makefile.am) = d139b4fedf8f443fbe9966256e98374d5e5cdb67 Index: pkgsrc/sysutils/zabbix50-server/options.mk diff -u pkgsrc/sysutils/zabbix50-server/options.mk:1.1 pkgsrc/sysutils/zabbix50-server/options.mk:1.2 --- pkgsrc/sysutils/zabbix50-server/options.mk:1.1 Tue Nov 3 22:44:43 2020 +++ pkgsrc/sysutils/zabbix50-server/options.mk Tue Jan 3 13:59:15 2023 @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2020/11/03 22:44:43 otis Exp $ +# $NetBSD: options.mk,v 1.2 2023/01/03 13:59:15 otis Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.zabbix50-server PKG_SUPPORTED_OPTIONS+= inet6 ipmi libssh libssh2 snmp -PKG_OPTIONS_OPTIONAL_GROUPS= database +PKG_OPTIONS_REQUIRED_GROUPS= database PKG_OPTIONS_GROUP.database= mysql pgsql PKG_SUGGESTED_OPTIONS+= ipmi libssh2 pgsql snmp @@ -12,6 +12,10 @@ PKG_SUGGESTED_OPTIONS+= inet6 .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql) +IGNORE= Only one of mysql or pgsql databases can be selected at the same time. +.endif + PLIST_VARS+= pgsql .if !empty(PKG_OPTIONS:Minet6) Index: pkgsrc/sysutils/zabbix50-server/patches/patch-src_libs_zbxsysinfo_netbsd_net.c diff -u pkgsrc/sysutils/zabbix50-server/patches/patch-src_libs_zbxsysinfo_netbsd_net.c:1.1 pkgsrc/sysutils/zabbix50-server/patches/patch-src_libs_zbxsysinfo_netbsd_net.c:1.2 --- pkgsrc/sysutils/zabbix50-server/patches/patch-src_libs_zbxsysinfo_netbsd_net.c:1.1 Tue Nov 3 22:44:43 2020 +++ pkgsrc/sysutils/zabbix50-server/patches/patch-src_libs_zbxsysinfo_netbsd_net.c Tue Jan 3 13:59:15 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-src_libs_zbxsysinfo_netbsd_net.c,v 1.1 2020/11/03 22:44:43 otis Exp $ +$NetBSD: patch-src_libs_zbxsysinfo_netbsd_net.c,v 1.2 2023/01/03 13:59:15 otis Exp $ Rework interface statistics code from using kvm to using sysctl interface. ---- src/libs/zbxsysinfo/netbsd/net.c.orig 2020-08-24 09:42:55.000000000 +0000 +--- src/libs/zbxsysinfo/netbsd/net.c.orig 2023-01-02 20:56:14.314793522 +0000 +++ src/libs/zbxsysinfo/netbsd/net.c @@ -22,6 +22,9 @@ #include "zbxjson.h" @@ -14,7 +14,7 @@ Rework interface statistics code from us static struct nlist kernel_symbols[] = { {"_ifnet", N_UNDF, 0, 0, 0}, -@@ -31,43 +34,91 @@ static struct nlist kernel_symbols[] = +@@ -31,42 +34,91 @@ static struct nlist kernel_symbols[] = #define IFNET_ID 0 @@ -33,7 +33,6 @@ Rework interface statistics code from us + } +} + -+ static int get_ifdata(const char *if_name, zbx_uint64_t *ibytes, zbx_uint64_t *ipackets, zbx_uint64_t *ierrors, zbx_uint64_t *idropped, zbx_uint64_t *obytes, zbx_uint64_t *opackets, zbx_uint64_t *oerrors, @@ -43,25 +42,22 @@ Rework interface statistics code from us - struct ifnet_head head; - struct ifnet *ifp; - struct ifnet v; -- -- kvm_t *kp; -- int len = 0; -- int ret = SYSINFO_RET_FAIL; + struct if_msghdr *ifm; -+ int mib[6] = { CTL_NET, AF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; ++ int mib[6] = { CTL_NET, AF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; + char *buf = NULL; + char *lim, *next; + struct rt_msghdr *rtm; + struct if_data *ifd = NULL; + struct sockaddr *sa, *rti_info[RTAX_MAX]; + struct sockaddr_dl *sdl; -+ + +- kvm_t *kp; + size_t len = 0; + size_t olen = 0; -+ int ret = SYSINFO_RET_FAIL; -+ -+ static char name[IFNAMSIZ]; + int ret = SYSINFO_RET_FAIL; ++ static char name[IFNAMSIZ]; ++ if (NULL == if_name || '\0' == *if_name) { *error = zbx_strdup(NULL, "Network interface name cannot be empty."); @@ -69,69 +65,69 @@ Rework interface statistics code from us + ret = FAIL; + goto out; } - +- - if (NULL == (kp = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL))) /* requires root privileges */ - { - *error = zbx_strdup(NULL, "Cannot obtain a descriptor to access kernel virtual memory."); - return FAIL; -- } -- ++ ++ if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) { ++ *error = zbx_strdup(NULL, "Failed to read network interfaces data"); ++ ret = FAIL; ++ goto out; + } + - if (N_UNDF == kernel_symbols[IFNET_ID].n_type) - if (0 != kvm_nlist(kp, &kernel_symbols[0])) - kernel_symbols[IFNET_ID].n_type = N_UNDF; - - if (N_UNDF != kernel_symbols[IFNET_ID].n_type) - { -- len = sizeof(struct ifnet_head); +- int len = sizeof(struct ifnet_head); - - if (kvm_read(kp, kernel_symbols[IFNET_ID].n_value, &head, len) >= len) - { - len = sizeof(struct ifnet); -+ if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) { -+ *error = zbx_strdup(NULL, "Failed to read network interfaces data"); -+ ret = FAIL; -+ goto out; -+ } -+ -+ if (len > olen) { -+ free(buf); -+ if ((buf = zbx_malloc(NULL, len)) == NULL) { -+ *error = zbx_strdup(NULL, "Failed to allocate buffer for network interfaces data"); -+ ret = FAIL; -+ goto out; -+ } -+ olen = len; -+ } -+ if (sysctl(mib, 6, buf, &len, NULL, 0) == -1) { -+ *error = zbx_strdup(NULL, "Failed to allocate buffer for network interfaces data"); -+ ret = FAIL; -+ goto out; -+ } -+ -+ lim = buf + len; -+ for (next = buf; next < lim; next += rtm->rtm_msglen) { -+ rtm = (struct rt_msghdr *)next; -+ if ((rtm->rtm_version == RTM_VERSION) && -+ (rtm->rtm_type == RTM_IFINFO)) { -+ ifm = (struct if_msghdr *)next; -+ ifd = &ifm->ifm_data; -+ -+ sa = (struct sockaddr *)(ifm + 1); -+ get_rtaddrs(ifm->ifm_addrs, sa, rti_info); -+ -+ sdl = (struct sockaddr_dl *)rti_info[RTAX_IFP]; -+ if (sdl == NULL || sdl->sdl_family != AF_LINK) { -+ continue; -+ } -+ bzero(name, sizeof(name)); -+ if (sdl->sdl_nlen >= IFNAMSIZ) -+ memcpy(name, sdl->sdl_data, IFNAMSIZ - 1); -+ else if (sdl->sdl_nlen > 0) -+ memcpy(name, sdl->sdl_data, sdl->sdl_nlen); ++ if (len > olen) { ++ free(buf); ++ if ((buf = zbx_malloc(NULL, len)) == NULL) { ++ *error = zbx_strdup(NULL, "Failed to allocate buffer for network interfaces data"); ++ ret = FAIL; ++ goto out; ++ } ++ olen = len; ++ } ++ if (sysctl(mib, 6, buf, &len, NULL, 0) == -1) { ++ *error = zbx_strdup(NULL, "Failed to read network interfaces data"); ++ ret = FAIL; ++ goto out; ++ } ++ ++ lim = buf + len; ++ ++ for (next = buf; next < lim; next += rtm->rtm_msglen) { ++ rtm = (struct rt_msghdr *)next; ++ if ((rtm->rtm_version == RTM_VERSION) && ++ (rtm->rtm_type == RTM_IFINFO)) { ++ ifm = (struct if_msghdr *)next; ++ ifd = &ifm->ifm_data; ++ ++ sa = (struct sockaddr *)(ifm + 1); ++ get_rtaddrs(ifm->ifm_addrs, sa, rti_info); ++ ++ sdl = (struct sockaddr_dl *)rti_info[RTAX_IFP]; ++ if (sdl == NULL || sdl->sdl_family != AF_LINK) { ++ continue; ++ } ++ bzero(name, sizeof(name)); ++ if (sdl->sdl_nlen >= IFNAMSIZ) ++ memcpy(name, sdl->sdl_data, IFNAMSIZ - 1); ++ else if (sdl->sdl_nlen > 0) ++ memcpy(name, sdl->sdl_data, sdl->sdl_nlen); /* if_ibytes; total number of octets received */ /* if_ipackets; packets received on interface */ -@@ -101,42 +152,38 @@ static int get_ifdata(const char *if_nam +@@ -100,42 +152,38 @@ static int get_ifdata(const char *if_nam if (icollisions) *icollisions = 0; Added files: Index: pkgsrc/sysutils/zabbix50-server/patches/patch-configure diff -u /dev/null pkgsrc/sysutils/zabbix50-server/patches/patch-configure:1.1 --- /dev/null Tue Jan 3 13:59:16 2023 +++ pkgsrc/sysutils/zabbix50-server/patches/patch-configure Tue Jan 3 13:59:15 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2023/01/03 13:59:15 otis Exp $ + +Fix bash-ism. + +--- configure.orig 2020-07-13 07:56:36.000000000 +0000 ++++ configure +@@ -8494,7 +8494,7 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +- if test "$found_mysql_tls" == "yes"; then ++ if test "$found_mysql_tls" = "yes"; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5 + $as_echo_n "checking for TLS ciphersuites in MySQL library... " >&6; } Index: pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__agent_Makefile.in diff -u /dev/null pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__agent_Makefile.in:1.1 --- /dev/null Tue Jan 3 13:59:16 2023 +++ pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__agent_Makefile.in Tue Jan 3 13:59:15 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_zabbix__agent_Makefile.in,v 1.1 2023/01/03 13:59:15 otis Exp $ + +Install config file to component's example directory. + +--- src/zabbix_agent/Makefile.in.orig 2020-08-24 09:43:03.000000000 +0000 ++++ src/zabbix_agent/Makefile.in +@@ -1113,7 +1113,7 @@ uninstall-am: uninstall-sbinPROGRAMS + 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)" ++ $(INSTALL_DATA) "../../conf/zabbix_agentd.conf" "$(DESTDIR)/${PREFIX}/share/examples/%%PKGBASE%%" + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Index: pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__proxy_Makefile.am diff -u /dev/null pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__proxy_Makefile.am:1.1 --- /dev/null Tue Jan 3 13:59:16 2023 +++ pkgsrc/sysutils/zabbix50-server/patches/patch-src_zabbix__proxy_Makefile.am Tue Jan 3 13:59:15 2023 @@ -0,0 +1,12 @@ +$NetBSD: patch-src_zabbix__proxy_Makefile.am,v 1.1 2023/01/03 13:59:15 otis Exp $ + +Install config file to component's example directory. + +--- src/zabbix_proxy/Makefile.am.orig 2020-08-24 09:42:55.000000000 +0000 ++++ src/zabbix_proxy/Makefile.am +@@ -97,4 +97,4 @@ install-data-hook: + $(MKDIR_P) "$(DESTDIR)$(PROXY_CONFIG_FILE).d" + $(MKDIR_P) "$(DESTDIR)$(EXTERNAL_SCRIPTS_PATH)" + $(MKDIR_P) "$(DESTDIR)$(LOAD_MODULE_PATH)" +- test -f "$(DESTDIR)$(PROXY_CONFIG_FILE)" || cp "../../conf/zabbix_proxy.conf" "$(DESTDIR)$(PROXY_CONFIG_FILE)" ++ $(INSTALL_DATA) "../../conf/zabbix_proxy.conf" "$(DESTDIR)/${PREFIX}/share/examples/%%PKGBASE%%" --_----------=_1672754356119380--