Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2F07F84F4F for ; Sun, 6 Aug 2023 17:46:49 +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 QaS-JF1v-S-r for ; Sun, 6 Aug 2023 17:46:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E0AA784D13 for ; Sun, 6 Aug 2023 17:46:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DA2DDFBDB; Sun, 6 Aug 2023 17:46:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1691344007130150" MIME-Version: 1.0 Date: Sun, 6 Aug 2023 17:46:47 +0000 From: "Juraj Lutter" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: otis@netbsd.org X-Mailer: log_accum Message-Id: <20230806174647.DA2DDFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1691344007130150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: otis Date: Sun Aug 6 17:46:47 UTC 2023 Modified Files: pkgsrc/sysutils/zabbix60-agent: Makefile pkgsrc/sysutils/zabbix60-proxy: Makefile pkgsrc/sysutils/zabbix60-server: Makefile Makefile.common distinfo pkgsrc/sysutils/zabbix60-server/patches: patch-configure Log Message: sysutils/zabbix60: Update to 6.0.20 * New Features and Improvements: - Added PostgreSQL by ODBC template - Added nodata trigger to remote Zabbix proxy and server health templates - Added integration with OpenStack Nova - Disabled spell checking for nondescriptive textareas - Added Cisco SD-WAN templates - Excluded edgeupdate service from services discovery in Windows by Zabbix agent templates - Added AWS ECS templates * Bug Fixes: - Fixed displaying the correct threshold color in "Top hosts" widget when value exceeds maximum - Fixed item test form sending incorrectly resolved macros to server if item uses SNMP interface - Fixed use of uninitialised value when verifying subject and issuer with TLS - Fixed runtime errors in the inheritance of the trigger and trigger prototype dependencies - Fixed SLI calculation for days with daylight-saving-time transitions - Fixed PHP runtime errors in API trigger.get method when using "expandComment" option - Fixed default condition for log item macro resolution - Updated setup section in README for PHP-FPM templates to include configuration example for Apache - Fixed reading of non-UTF-8 encoded files in Zabbix agent 2 - Fixed the issue with housekeeper failing to delete some of the events that required deletion - Fixed console error in "Map navigation tree" widget; disabled add button on a 10th depth level - Fixed undefined index errors in configuration.importcompare - Fixed generation of double page headers when general warning appears - Fixed Zabbix agent 2 systemd plugin failing with newer dbus - Fixed free bytes calculation for temporary tablespace in Oracle Zabbix agent 2 plugin - Fixed not being able to save an event correlation when custom formula was selected but only one condition remained - Updated pod crash loop trigger expressions in Kubernetes nodes and cluster state templates - Fixed suffix interpretation in threshold values for "Top hosts" widget - Fixed Zabbix access to the first page for user with specific page access - Fixed import popup showing circle animation even if PHP code failed - Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page Full release notes: https://www.zabbix.com/rn/rn6.0.20 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix60-agent/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix60-proxy/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix60-server/Makefile \ pkgsrc/sysutils/zabbix60-server/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/zabbix60-server/Makefile.common cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/zabbix60-server/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1691344007130150 Content-Disposition: inline Content-Length: 9944 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/zabbix60-agent/Makefile diff -u pkgsrc/sysutils/zabbix60-agent/Makefile:1.6 pkgsrc/sysutils/zabbix60-agent/Makefile:1.7 --- pkgsrc/sysutils/zabbix60-agent/Makefile:1.6 Wed May 24 08:51:50 2023 +++ pkgsrc/sysutils/zabbix60-agent/Makefile Sun Aug 6 17:46:47 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/05/24 08:51:50 otis Exp $ +# $NetBSD: Makefile,v 1.7 2023/08/06 17:46:47 otis Exp $ .include "../../sysutils/zabbix60-server/Makefile.common" @@ -49,6 +49,8 @@ SUBST_SED.fix-popcount+= -e 's,popcount, PLIST_SUBST+= PKGBASE=${PKGBASE} +CFLAGS.SunOS+= -D__EXTENSIONS__ + .include "../../mk/bsd.prefs.mk" .include "options.mk" Index: pkgsrc/sysutils/zabbix60-proxy/Makefile diff -u pkgsrc/sysutils/zabbix60-proxy/Makefile:1.6 pkgsrc/sysutils/zabbix60-proxy/Makefile:1.7 --- pkgsrc/sysutils/zabbix60-proxy/Makefile:1.6 Wed May 24 08:51:50 2023 +++ pkgsrc/sysutils/zabbix60-proxy/Makefile Sun Aug 6 17:46:47 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/05/24 08:51:50 otis Exp $ +# $NetBSD: Makefile,v 1.7 2023/08/06 17:46:47 otis Exp $ .include "../../sysutils/zabbix60-server/Makefile.common" @@ -56,7 +56,7 @@ SUBST_SED.fix-popcount+= -e 's,popcount, PLIST_SUBST+= PKGBASE=${PKGBASE} -CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 +CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 -D__EXTENSIONS__ .include "../../mk/bsd.prefs.mk" Index: pkgsrc/sysutils/zabbix60-server/Makefile diff -u pkgsrc/sysutils/zabbix60-server/Makefile:1.6 pkgsrc/sysutils/zabbix60-server/Makefile:1.7 --- pkgsrc/sysutils/zabbix60-server/Makefile:1.6 Wed May 24 08:51:51 2023 +++ pkgsrc/sysutils/zabbix60-server/Makefile Sun Aug 6 17:46:47 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/05/24 08:51:51 otis Exp $ +# $NetBSD: Makefile,v 1.7 2023/08/06 17:46:47 otis Exp $ # used by sysutils/zabbix60-proxy/Makefile # used by sysutils/zabbix60-agent/Makefile # @@ -62,7 +62,7 @@ SUBST_SED.fix-popcount+= -e 's,popcount, PLIST_SUBST+= PKGBASE=${PKGBASE} -CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 +CFLAGS.SunOS+= -DDUK_USE_BYTEORDER=1 -D__EXTENSIONS__ REPLACE_BASH+= misc/snmptrap/snmptrap.sh \ misc/images/png_to_xml.sh Index: pkgsrc/sysutils/zabbix60-server/distinfo diff -u pkgsrc/sysutils/zabbix60-server/distinfo:1.6 pkgsrc/sysutils/zabbix60-server/distinfo:1.7 --- pkgsrc/sysutils/zabbix60-server/distinfo:1.6 Sat Jul 8 22:04:59 2023 +++ pkgsrc/sysutils/zabbix60-server/distinfo Sun Aug 6 17:46:47 2023 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2023/07/08 22:04:59 otis Exp $ +$NetBSD: distinfo,v 1.7 2023/08/06 17:46:47 otis Exp $ -BLAKE2s (zabbix-6.0.19.tar.gz) = c45df6353f36e9b3a597923fc38078c8bacf1190a2ccd0b308623e74e7492002 -SHA512 (zabbix-6.0.19.tar.gz) = 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e -Size (zabbix-6.0.19.tar.gz) = 41953882 bytes -SHA1 (patch-configure) = a372473051082b7f30846a6efa062ce42e325c30 +BLAKE2s (zabbix-6.0.20.tar.gz) = a4898a69f24824b6768c6da934ef928ed9ed731afb3b2fc32b8056b5ef9f91bf +SHA512 (zabbix-6.0.20.tar.gz) = 8f4fa955eb20ba4c4539bb3b6744c942e89db61dc50c998e61c4cf065cf07fddddfacce3992b8402851dc2f55e41fbff40e814d86b8c4ed9802931b8fe4a172b +Size (zabbix-6.0.20.tar.gz) = 42016423 bytes +SHA1 (patch-configure) = 6f2c5729f1bca2740a9c63cb880d90ab668abbb6 SHA1 (patch-m4_ax__lib__mysql.m4) = 9786c6bff3d22334263921c201bf241a207a46bc SHA1 (patch-m4_libssh.m4) = 8b4ac3964caf94bb0e4939d265dcefc08a07a0df SHA1 (patch-src_libs_zbxsysinfo_netbsd_net.c) = bc928301fc099d907b83127e2670abf1d6c33553 Index: pkgsrc/sysutils/zabbix60-server/Makefile.common diff -u pkgsrc/sysutils/zabbix60-server/Makefile.common:1.7 pkgsrc/sysutils/zabbix60-server/Makefile.common:1.8 --- pkgsrc/sysutils/zabbix60-server/Makefile.common:1.7 Wed Aug 2 16:17:18 2023 +++ pkgsrc/sysutils/zabbix60-server/Makefile.common Sun Aug 6 17:46:47 2023 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.7 2023/08/02 16:17:18 nia Exp $ +# $NetBSD: Makefile.common,v 1.8 2023/08/06 17:46:47 otis Exp $ # used by sysutils/zabbix60-agent/Makefile # used by sysutils/zabbix60-proxy/Makefile # used by sysutils/zabbix60-server/Makefile # used by sysutils/zabbix60-frontend/Makefile # used by sysutils/zabbix60-java/Makefile -DISTNAME= zabbix-6.0.19 +DISTNAME= zabbix-6.0.20 CATEGORIES= sysutils MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PKGVERSION_NOREV:R}/ @@ -32,5 +32,3 @@ FILES_SUBST+= ZABBIX_GROUP=${ZABBIX_GR OWN_DIRS_PERMS+= ${ZABBIX_HOMEDIR} ${ZABBIX_USER} ${ZABBIX_GROUP} 0755 -# workaround for https://github.com/curl/curl/issues/10148 -CPPFLAGS+= -DCURL_DISABLE_TYPECHECK Index: pkgsrc/sysutils/zabbix60-server/patches/patch-configure diff -u pkgsrc/sysutils/zabbix60-server/patches/patch-configure:1.1 pkgsrc/sysutils/zabbix60-server/patches/patch-configure:1.2 --- pkgsrc/sysutils/zabbix60-server/patches/patch-configure:1.1 Sun Feb 12 18:37:33 2023 +++ pkgsrc/sysutils/zabbix60-server/patches/patch-configure Sun Aug 6 17:46:47 2023 @@ -1,60 +1,60 @@ -$NetBSD: patch-configure,v 1.1 2023/02/12 18:37:33 otis Exp $ +$NetBSD: patch-configure,v 1.2 2023/08/06 17:46:47 otis Exp $ Fix bash-ism. ---- configure.orig 2023-02-01 07:19:56.888741047 +0000 +--- configure.orig 2023-07-31 11:56:12.067144813 +0000 +++ configure -@@ -8740,7 +8740,7 @@ fi - rm -f core conftest.err conftest.$ac_objext \ +@@ -9568,7 +9568,7 @@ fi + rm -f core conftest.err conftest.$ac_objext conftest.beam \ 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; } -@@ -15025,7 +15025,7 @@ $as_echo "$as_me: WARNING: proceeding wi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TLS ciphersuites in MySQL library" >&5 + printf %s "checking for TLS ciphersuites in MySQL library... " >&6; } +@@ -16049,7 +16049,7 @@ printf "%s\n" "$as_me: WARNING: proceedi if test "x$enable_static" = "xyes"; then LIBPCRE_LIBS=" $LIBPCRE_LIBS -lpthread" elif test "x$enable_static_libs" = "xyes"; then - if test "x$static_linking_support" == "xno"; then + if test "x$static_linking_support" = "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 - $as_echo "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 + printf "%s\n" "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} -@@ -15434,7 +15434,7 @@ $as_echo "$as_me: WARNING: proceeding wi +@@ -16472,7 +16472,7 @@ printf "%s\n" "$as_me: WARNING: proceedi if test "x$enable_static" = "xyes"; then LIBPCRE2_LIBS=" $LIBPCRE2_LIBS -lpthread" elif test "x$enable_static_libs" = "xyes"; then - if test "x$static_linking_support" == "xno"; then + if test "x$static_linking_support" = "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 - $as_echo "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 + printf "%s\n" "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} -@@ -15851,7 +15851,7 @@ $as_echo "$as_me: WARNING: proceeding wi +@@ -16903,7 +16903,7 @@ printf "%s\n" "$as_me: WARNING: proceedi if test "x$enable_static" = "xyes"; then LIBPCRE_LIBS=" $LIBPCRE_LIBS -lpthread" elif test "x$enable_static_libs" = "xyes"; then - if test "x$static_linking_support" == "xno"; then + if test "x$static_linking_support" = "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 - $as_echo "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 + printf "%s\n" "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} -@@ -16265,7 +16265,7 @@ $as_echo "$as_me: WARNING: proceeding wi +@@ -17331,7 +17331,7 @@ printf "%s\n" "$as_me: WARNING: proceedi if test "x$enable_static" = "xyes"; then LIBPCRE_LIBS=" $LIBPCRE_LIBS -lpthread" elif test "x$enable_static_libs" = "xyes"; then - if test "x$static_linking_support" == "xno"; then + if test "x$static_linking_support" = "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 - $as_echo "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 + printf "%s\n" "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} -@@ -16692,7 +16692,7 @@ $as_echo "$as_me: WARNING: proceeding wi +@@ -17772,7 +17772,7 @@ printf "%s\n" "$as_me: WARNING: proceedi if test "x$enable_static" = "xyes"; then LIBPCRE2_LIBS=" $LIBPCRE2_LIBS -lpthread" elif test "x$enable_static_libs" = "xyes"; then - if test "x$static_linking_support" == "xno"; then + if test "x$static_linking_support" = "xno"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 - $as_echo "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compiler has no direct suppor for static linkage" >&5 + printf "%s\n" "$as_me: WARNING: compiler has no direct suppor for static linkage" >&2;} --_----------=_1691344007130150--