From owner-svn-ports-all@freebsd.org Wed Jun 3 22:50:20 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A12622F5986; Wed, 3 Jun 2020 22:50:20 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49ckdS47lvz3gPk; Wed, 3 Jun 2020 22:50:20 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84C2115821; Wed, 3 Jun 2020 22:50:20 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053MoK0E052311; Wed, 3 Jun 2020 22:50:20 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053MoIvp052297; Wed, 3 Jun 2020 22:50:18 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <202006032250.053MoIvp052297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Wed, 3 Jun 2020 22:50:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537856 - in head/net-mgmt: . zabbix5-agent zabbix5-frontend zabbix5-java zabbix5-proxy zabbix5-server zabbix5-server/files X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in head/net-mgmt: . zabbix5-agent zabbix5-frontend zabbix5-java zabbix5-proxy zabbix5-server zabbix5-server/files X-SVN-Commit-Revision: 537856 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2020 22:50:20 -0000 Author: dbaio Date: Wed Jun 3 22:50:18 2020 New Revision: 537856 URL: https://svnweb.freebsd.org/changeset/ports/537856 Log: New ports: net-mgmt/zabbix5-[agent|frontend|java|proxy|server] net-mgmt/zabbix4 -> net-mgmt/zabbix5 What's new in Zabbix 5.0: https://www.zabbix.com/documentation/current/manual/introduction/whatsnew500 PR: 246447 Submitted by: Juraj Lutter Submitted by: pg@pakhom.spb.ru Reported by: vvd@unislabs.com Added: head/net-mgmt/zabbix5-agent/ - copied from r537855, head/net-mgmt/zabbix4-agent/ head/net-mgmt/zabbix5-frontend/ - copied from r537855, head/net-mgmt/zabbix4-frontend/ head/net-mgmt/zabbix5-java/ - copied from r537855, head/net-mgmt/zabbix4-java/ head/net-mgmt/zabbix5-proxy/ - copied from r537855, head/net-mgmt/zabbix4-proxy/ head/net-mgmt/zabbix5-server/ - copied from r537855, head/net-mgmt/zabbix4-server/ Modified: head/net-mgmt/Makefile head/net-mgmt/zabbix5-agent/Makefile head/net-mgmt/zabbix5-frontend/Makefile head/net-mgmt/zabbix5-java/Makefile head/net-mgmt/zabbix5-proxy/Makefile head/net-mgmt/zabbix5-server/Makefile head/net-mgmt/zabbix5-server/distinfo head/net-mgmt/zabbix5-server/files/pkg-message.in head/net-mgmt/zabbix5-server/pkg-plist head/net-mgmt/zabbix5-server/pkg-plist.frontend Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/Makefile Wed Jun 3 22:50:18 2020 (r537856) @@ -401,5 +401,10 @@ SUBDIR += zabbix44-java SUBDIR += zabbix44-proxy SUBDIR += zabbix44-server + SUBDIR += zabbix5-agent + SUBDIR += zabbix5-frontend + SUBDIR += zabbix5-java + SUBDIR += zabbix5-proxy + SUBDIR += zabbix5-server .include Modified: head/net-mgmt/zabbix5-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix4-agent/Makefile Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-agent/Makefile Wed Jun 3 22:50:18 2020 (r537856) @@ -1,11 +1,11 @@ # Created by: Pakhom Golynga # $FreeBSD$ -PORTNAME= zabbix4 +PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent -MASTERDIR= ${.CURDIR}/../zabbix4-server +MASTERDIR= ${.CURDIR}/../zabbix5-server PLIST= ${PKGDIR}/pkg-plist.agent OPTIONS_DEFINE= CURL IPV6 Modified: head/net-mgmt/zabbix5-frontend/Makefile ============================================================================== --- head/net-mgmt/zabbix4-frontend/Makefile Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-frontend/Makefile Wed Jun 3 22:50:18 2020 (r537856) @@ -1,11 +1,11 @@ # Created by: Pakhom Golynga # $FreeBSD$ -PORTNAME= zabbix4 +PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -frontend -MASTERDIR= ${.CURDIR}/../zabbix4-server +MASTERDIR= ${.CURDIR}/../zabbix5-server NO_BUILD= yes NO_ARCH= yes @@ -28,7 +28,7 @@ ORACLE_CONFIGURE_WITH= oracle do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} - (cd ${WRKSRC}/frontends/php && \ + (cd ${WRKSRC}/ui && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix5-java/Makefile ============================================================================== --- head/net-mgmt/zabbix4-java/Makefile Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-java/Makefile Wed Jun 3 22:50:18 2020 (r537856) @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTNAME= zabbix4 +PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java -MASTERDIR= ${.CURDIR}/../zabbix4-server +MASTERDIR= ${.CURDIR}/../zabbix5-server PLIST= ${PKGDIR}/pkg-plist.java OPTIONS_DEFINE= IPV6 Modified: head/net-mgmt/zabbix5-proxy/Makefile ============================================================================== --- head/net-mgmt/zabbix4-proxy/Makefile Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-proxy/Makefile Wed Jun 3 22:50:18 2020 (r537856) @@ -1,11 +1,11 @@ # Created by: Pakhom Golynga # $FreeBSD$ -PORTNAME= zabbix4 +PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -proxy -MASTERDIR= ${.CURDIR}/../zabbix4-server +MASTERDIR= ${.CURDIR}/../zabbix5-server OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE Modified: head/net-mgmt/zabbix5-server/Makefile ============================================================================== --- head/net-mgmt/zabbix4-server/Makefile Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-server/Makefile Wed Jun 3 22:50:18 2020 (r537856) @@ -1,9 +1,8 @@ # Created by: Pakhom Golynga # $FreeBSD$ -PORTNAME= zabbix4 -PORTVERSION= 4.0.20 -PORTREVISION?= 0 +PORTNAME= zabbix5 +PORTVERSION= 5.0.1 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ PKGNAMESUFFIX?= -server @@ -17,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-35-9]${PKGNAMESUFFIX} +CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-46-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} @@ -39,10 +38,12 @@ GROUPS= zabbix PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" +PLIST_FILES+= bin/zabbix_proxy_js .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" +PLIST_FILES+= bin/zabbix_js .else PLIST_SUB+= SERVER="@comment " .endif @@ -66,14 +67,13 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC +OPTIONS_DEFINE= IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks -JABBER_DESC= Support for Jabber media type LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks @@ -101,9 +101,6 @@ LDAP_USE= OPENLDAP=yes IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi -JABBER_CONFIGURE_WITH= jabber -JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel - FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 @@ -195,7 +192,7 @@ post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database @${RM} ${WRKSRC}/database/*/Makefile* (cd ${WRKSRC}/database/ && \ - ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ + ${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \ @@ -205,6 +202,11 @@ post-install: .if ${ZABBIX_BUILD} == "agent" ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample +.endif + +.if ${ZABBIX_BUILD} == "proxy" + ${MV} ${STAGEDIR}${LOCALBASE}/bin/zabbix_js \ + ${STAGEDIR}${LOCALBASE}/bin/zabbix_proxy_js .endif .else # frontend Modified: head/net-mgmt/zabbix5-server/distinfo ============================================================================== --- head/net-mgmt/zabbix4-server/distinfo Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-server/distinfo Wed Jun 3 22:50:18 2020 (r537856) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589899035 -SHA256 (zabbix-4.0.20.tar.gz) = 7c401f2cbe0b76882b1a65f7de82422ac39e544039f6cf6ab5b1b85c23e9d840 -SIZE (zabbix-4.0.20.tar.gz) = 17215217 +TIMESTAMP = 1590584638 +SHA256 (zabbix-5.0.1.tar.gz) = 20a19e5cf2354ffcbbe24521b04becfc9875e57289c00da71999de60c4a853b6 +SIZE (zabbix-5.0.1.tar.gz) = 18623104 Modified: head/net-mgmt/zabbix5-server/files/pkg-message.in ============================================================================== --- head/net-mgmt/zabbix4-server/files/pkg-message.in Wed Jun 3 21:54:29 2020 (r537855) +++ head/net-mgmt/zabbix5-server/files/pkg-message.in Wed Jun 3 22:50:18 2020 (r537856) @@ -7,18 +7,18 @@ required. It is not needed to run Zabbix agent. % cd %%DATADIR%%/%%ZABBIX_BUILD%%/database And follow the instructions: -https://www.zabbix.com/documentation/4.0/manual/appendix/install/db_scripts +https://www.zabbix.com/documentation/5.0/manual/appendix/install/db_scripts -Upgrade notes for 4.0.0: -https://www.zabbix.com/documentation/4.0/manual/installation/upgrade_notes_400 +Upgrade notes for 5.0.0: +https://www.zabbix.com/documentation/5.0/manual/installation/upgrade_notes_500 Upgrade procedure: -https://www.zabbix.com/documentation/4.0/manual/installation/upgrade/sources +https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources Please see https://www.zabbix.com/ for detailed information about Zabbix. Official Zabbix documentation: -https://www.zabbix.com/documentation/4.0/start +https://www.zabbix.com/documentation/5.0/start For Zabbix frontend "Welcome" screen. Enter the user name Admin with password zabbix to log in as a Zabbix superuser. @@ -32,29 +32,13 @@ i.e. 3 years of Full Support (general, critical and se additional years of Limited Support (critical and security issues only). Zabbix LTS version release will result in change of the first version number. -Stable release: Zabbix 4.0 -Release date: 1 October, 2018 -End of Full Support: 31 October, 2021 -End of Limited Support: 31 October, 2023 +Stable release: Zabbix 5.0 +Release date: 12 May, 2020 +End of Full Support: 31 May, 2023 +End of Limited Support: 31 May, 2025 Zabbix Life Cycle & Release Policy: https://www.zabbix.com/life_cycle_and_release_policy -EOM -} -{ - type: upgrade - maximum_version: "4.0.12" - minimum_version: "4.0.10" - message: <