Date: Fri, 22 May 2020 11:18:53 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r536197 - in branches/2020Q2/net-mgmt: zabbix3-server zabbix4-server zabbix44-server Message-ID: <202005221118.04MBIra6002929@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Fri May 22 11:18:52 2020 New Revision: 536197 URL: https://svnweb.freebsd.org/changeset/ports/536197 Log: MFH: r531628 r531630 r531632 r535076 r535874 r535993 r535995 net-mgmt/zabbix44-*: update 4.4.5 -> 4.4.7 PR: 245588 Submitted by: pg@pakhom.spb.ru (maintainer) Relnotes: https://www.zabbix.com/rn/rn4.4.7 net-mgmt/zabbix4-server: update 4.0.17 -> 4.0.19 PR: 245589 Submitted by: pg@pakhom.spb.ru (maintainer) Relnotes: https://www.zabbix.com/rn/rn4.0.19 net-mgmt/zabbix3-server: upgrade 3.0.29 -> 3.0.30 PR: 245591 Submitted by: pg@pakhom.spb.ru (maintainer) Relnotes: https://www.zabbix.com/rn/rn3.0.30 net-mgmt/zabbix*-server: Fix build with LIBXML2 option PR: 245613 Submitted by: Juraj Lutter <juraj@lutter.sk> Reported by: Christian Ullrich <chris@chrullrich.net> Approved by: maintainer timeout (pg@pakhom.spb.ru, > 3 weeks) net-mgmt/zabbix44-*: Update to 4.4.8 Changelog: https://www.zabbix.com/rn/rn4.4.8 PR: 245995 Approved by: Pakhom Golynga <pg@pakhom.spb.ru> (maintainer) net-mgmt/zabbix3-*: Update to 3.0.31 Changelog: https://www.zabbix.com/rn/rn3.0.31 PR: 246582 Approved by: Pakhom Golynga <pg@pakhom.spb.ru> (maintainer) X-MFH-with: 531632, 535076 Security: 4d11d37e-9a8d-11ea-b9b8-641c67a117d8 net-mgmt/zabbix4-*: Update to 4.0.20 Changelog: https://www.zabbix.com/rn/rn4.0.20 PR: 246583 Approved by: Pakhom Golynga <pg@pakhom.spb.ru> (maintainer) Approved by: ports-secteam (joneum) Modified: branches/2020Q2/net-mgmt/zabbix3-server/Makefile branches/2020Q2/net-mgmt/zabbix3-server/distinfo branches/2020Q2/net-mgmt/zabbix4-server/Makefile branches/2020Q2/net-mgmt/zabbix4-server/distinfo branches/2020Q2/net-mgmt/zabbix44-server/Makefile branches/2020Q2/net-mgmt/zabbix44-server/distinfo branches/2020Q2/net-mgmt/zabbix44-server/pkg-plist.frontend Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/net-mgmt/zabbix3-server/Makefile ============================================================================== --- branches/2020Q2/net-mgmt/zabbix3-server/Makefile Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix3-server/Makefile Fri May 22 11:18:52 2020 (r536197) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= zabbix3 -PORTVERSION= 3.0.29 +PORTVERSION= 3.0.31 PORTREVISION?= 0 CATEGORIES= net-mgmt -MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} @@ -21,6 +21,7 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" +CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d @@ -125,7 +126,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo -LIBXML2_CONFIGURE_WITH= libxml2 +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl @@ -186,6 +187,9 @@ post-patch: ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + + +pre-configure: + @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: Modified: branches/2020Q2/net-mgmt/zabbix3-server/distinfo ============================================================================== --- branches/2020Q2/net-mgmt/zabbix3-server/distinfo Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix3-server/distinfo Fri May 22 11:18:52 2020 (r536197) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577110184 -SHA256 (zabbix-3.0.29.tar.gz) = 7ec6bb7a85b15d94988f7a654aa2d745f01695795a450054904d4e0b91e101b5 -SIZE (zabbix-3.0.29.tar.gz) = 14707901 +TIMESTAMP = 1589909719 +SHA256 (zabbix-3.0.31.tar.gz) = d5ea113722b8eeadbb08d840384a87e04f69b088e826b670c3948857affd5228 +SIZE (zabbix-3.0.31.tar.gz) = 14698394 Modified: branches/2020Q2/net-mgmt/zabbix4-server/Makefile ============================================================================== --- branches/2020Q2/net-mgmt/zabbix4-server/Makefile Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix4-server/Makefile Fri May 22 11:18:52 2020 (r536197) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= zabbix4 -PORTVERSION= 4.0.17 +PORTVERSION= 4.0.20 PORTREVISION?= 0 CATEGORIES= net-mgmt -MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} @@ -23,7 +23,7 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} +CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache LIB_DEPENDS+= libevent.so:devel/libevent USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else @@ -125,7 +125,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo -LIBXML2_CONFIGURE_WITH= libxml2 +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl @@ -180,6 +180,9 @@ post-patch: .endif @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + + +pre-configure: + @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: .if ${ZABBIX_BUILD} == "java" Modified: branches/2020Q2/net-mgmt/zabbix4-server/distinfo ============================================================================== --- branches/2020Q2/net-mgmt/zabbix4-server/distinfo Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix4-server/distinfo Fri May 22 11:18:52 2020 (r536197) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580389085 -SHA256 (zabbix-4.0.17.tar.gz) = 41f0999d1e60046cc68cacd2bb88df77ad03356894a015ea94300feeb94ac940 -SIZE (zabbix-4.0.17.tar.gz) = 17191889 +TIMESTAMP = 1589899035 +SHA256 (zabbix-4.0.20.tar.gz) = 7c401f2cbe0b76882b1a65f7de82422ac39e544039f6cf6ab5b1b85c23e9d840 +SIZE (zabbix-4.0.20.tar.gz) = 17215217 Modified: branches/2020Q2/net-mgmt/zabbix44-server/Makefile ============================================================================== --- branches/2020Q2/net-mgmt/zabbix44-server/Makefile Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix44-server/Makefile Fri May 22 11:18:52 2020 (r536197) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= zabbix44 -PORTVERSION= 4.4.5 +PORTVERSION= 4.4.8 PORTREVISION?= 0 CATEGORIES= net-mgmt -MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} @@ -25,7 +25,7 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} +CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache LIB_DEPENDS+= libevent.so:devel/libevent USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else @@ -123,7 +123,7 @@ IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo -LIBXML2_CONFIGURE_WITH= libxml2 +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl @@ -178,6 +178,9 @@ post-patch: .endif @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + + +pre-configure: + @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: .if ${ZABBIX_BUILD} == "java" Modified: branches/2020Q2/net-mgmt/zabbix44-server/distinfo ============================================================================== --- branches/2020Q2/net-mgmt/zabbix44-server/distinfo Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix44-server/distinfo Fri May 22 11:18:52 2020 (r536197) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580389138 -SHA256 (zabbix-4.4.5.tar.gz) = 94a897825b062e17b34767c0864305cee6a87476dda8bee88dcf845b24bed0ea -SIZE (zabbix-4.4.5.tar.gz) = 19284769 +TIMESTAMP = 1589898638 +SHA256 (zabbix-4.4.8.tar.gz) = c0562245c75fc86c2c22d9a8e521c147dea832056b869d27488ea6130a253651 +SIZE (zabbix-4.4.8.tar.gz) = 19457802 Modified: branches/2020Q2/net-mgmt/zabbix44-server/pkg-plist.frontend ============================================================================== --- branches/2020Q2/net-mgmt/zabbix44-server/pkg-plist.frontend Fri May 22 11:17:00 2020 (r536196) +++ branches/2020Q2/net-mgmt/zabbix44-server/pkg-plist.frontend Fri May 22 11:18:52 2020 (r536197) @@ -478,6 +478,7 @@ %%WWWDIR%%/include/classes/import/converters/CConverter.php %%WWWDIR%%/include/classes/import/converters/CDefaultImportConverter.php %%WWWDIR%%/include/classes/import/converters/CImportConverterFactory.php +%%WWWDIR%%/include/classes/import/converters/CTransformImportConverter.php %%WWWDIR%%/include/classes/import/importers/CAbstractScreenImporter.php %%WWWDIR%%/include/classes/import/importers/CHostImporter.php %%WWWDIR%%/include/classes/import/importers/CImporter.php
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005221118.04MBIra6002929>