From owner-dev-commits-ports-main@freebsd.org Sun Sep 19 21:14:50 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 5C01B671B96; Sun, 19 Sep 2021 21:14:50 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HCL6y1rt0z3skp; Sun, 19 Sep 2021 21:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B5562405C; Sun, 19 Sep 2021 21:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18JLEnua068183; Sun, 19 Sep 2021 21:14:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18JLEnxw068182; Sun, 19 Sep 2021 21:14:49 GMT (envelope-from git) Date: Sun, 19 Sep 2021 21:14:49 GMT Message-Id: <202109192114.18JLEnxw068182@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: eeb45e075e42 - main - net-mgmt/zabbix5-server: Update to 5.0.15 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eeb45e075e420a95a42f6022113cd58ee6b833fa Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Sep 2021 21:14:50 -0000 The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=eeb45e075e420a95a42f6022113cd58ee6b833fa commit eeb45e075e420a95a42f6022113cd58ee6b833fa Author: Juraj Lutter AuthorDate: 2021-09-05 15:11:28 +0000 Commit: Juraj Lutter CommitDate: 2021-09-19 21:14:01 +0000 net-mgmt/zabbix5-server: Update to 5.0.15 Summary: - Update to 5.0.15 - Reformat a bit according to portclippy and portfmt - Rework pidfile and logfile handling (now under /var/{run,log}/zabbix) - Provide sample config for agentd - Changelog: https://www.zabbix.com/rn/rn5.0.15 PR: 258076 Reviewed by: pg@pakhom.spb.ru (maintainer) Differential Revision: https://reviews.freebsd.org/D31845 --- net-mgmt/zabbix5-frontend/Makefile | 21 ++++++++++----------- net-mgmt/zabbix5-java/Makefile | 7 ++++--- net-mgmt/zabbix5-proxy/Makefile | 2 +- net-mgmt/zabbix5-server/Makefile | 8 +++++++- net-mgmt/zabbix5-server/distinfo | 6 +++--- net-mgmt/zabbix5-server/files/pkg-message.in | 3 +++ net-mgmt/zabbix5-server/files/zabbix_agentd.in | 15 +++++++++------ net-mgmt/zabbix5-server/files/zabbix_proxy.in | 15 +++++++++------ net-mgmt/zabbix5-server/files/zabbix_server.in | 15 +++++++++------ net-mgmt/zabbix5-server/pkg-plist | 2 +- net-mgmt/zabbix5-server/pkg-plist.agent | 2 +- net-mgmt/zabbix5-server/pkg-plist.frontend | 6 ++++-- 12 files changed, 61 insertions(+), 41 deletions(-) diff --git a/net-mgmt/zabbix5-frontend/Makefile b/net-mgmt/zabbix5-frontend/Makefile index ee166658e4ef..41188ad76b45 100644 --- a/net-mgmt/zabbix5-frontend/Makefile +++ b/net-mgmt/zabbix5-frontend/Makefile @@ -6,24 +6,23 @@ PKGNAMESUFFIX= -frontend MASTERDIR= ${.CURDIR}/../zabbix5-server -NO_BUILD= yes -NO_ARCH= yes +USES+= php:web +USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap \ + mbstring pcre session simplexml snmp sockets xml xmlreader \ + xmlwriter + PATCHDIR= +NO_ARCH= yes +NO_BUILD= yes PLIST= ${PKGDIR}/pkg-plist.frontend -USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap mbstring \ - pcre session simplexml snmp sockets xml xmlreader xmlwriter -USES+= php:web - -OPTIONS_DEFINE= MYSQLI PGSQL ORACLE +OPTIONS_DEFINE= MYSQLI ORACLE PGSQL OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQLI_USE= PHP=mysqli - -PGSQL_USE= PHP=pgsql - +MYSQLI_USE= PHP=mysqli ORACLE_CONFIGURE_WITH= oracle +PGSQL_USE= PHP=pgsql do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/net-mgmt/zabbix5-java/Makefile b/net-mgmt/zabbix5-java/Makefile index 9ae9fa3573e4..d3f09bd459c6 100644 --- a/net-mgmt/zabbix5-java/Makefile +++ b/net-mgmt/zabbix5-java/Makefile @@ -3,10 +3,11 @@ CATEGORIES= net-mgmt PKGNAMESUFFIX= -java MASTERDIR= ${.CURDIR}/../zabbix5-server -PLIST= ${PKGDIR}/pkg-plist.java - -OPTIONS_DEFINE= IPV6 USE_JAVA= yes +PLIST= ${PKGDIR}/pkg-plist.java + +OPTIONS_DEFINE= IPV6 + .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix5-proxy/Makefile b/net-mgmt/zabbix5-proxy/Makefile index 55280075f558..71ad3c8682f1 100644 --- a/net-mgmt/zabbix5-proxy/Makefile +++ b/net-mgmt/zabbix5-proxy/Makefile @@ -6,6 +6,6 @@ PKGNAMESUFFIX= -proxy MASTERDIR= ${.CURDIR}/../zabbix5-server -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE +OPTIONS_SINGLE_DB= MYSQL ORACLE PGSQL SQLITE .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile index f7cad872caa3..e7a610a53858 100644 --- a/net-mgmt/zabbix5-server/Makefile +++ b/net-mgmt/zabbix5-server/Makefile @@ -1,7 +1,7 @@ # Created by: Pakhom Golynga PORTNAME= zabbix5 -DISTVERSION= 5.0.14 +DISTVERSION= 5.0.15 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ @@ -148,18 +148,24 @@ post-patch: @${REINPLACE_CMD} -e 's#/tmp/zabbix_server.pid#/var/run/zabbix/zabbix_server.pid#g' \ ${WRKSRC}/conf/zabbix_server.conf \ ${WRKSRC}/src/zabbix_server/server.c + @${REINPLACE_CMD} -e 's#/tmp/zabbix_server.log#/var/log/zabbix/zabbix_server.log#g' \ + ${WRKSRC}/conf/zabbix_server.conf .endif .if ${ZABBIX_BUILD} == "proxy" @${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.pid#/var/run/zabbix/zabbix_proxy.pid#g' \ ${WRKSRC}/conf/zabbix_proxy.conf \ ${WRKSRC}/src/zabbix_proxy/proxy.c + @${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.log#/var/log/zabbix/zabbix_proxy.log#g' \ + ${WRKSRC}/conf/zabbix_proxy.conf .endif .if ${ZABBIX_BUILD} == "agent" @${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.pid#/var/run/zabbix/zabbix_agentd.pid#g' \ ${WRKSRC}/conf/zabbix_agentd.conf \ ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c + @${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.log#/var/log/zabbix/zabbix_agentd.log#g' \ + ${WRKSRC}/conf/zabbix_agentd.conf .endif .if ${ZABBIX_BUILD} == "java" diff --git a/net-mgmt/zabbix5-server/distinfo b/net-mgmt/zabbix5-server/distinfo index 3c1a4733d5be..bc6466de2be6 100644 --- a/net-mgmt/zabbix5-server/distinfo +++ b/net-mgmt/zabbix5-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626699270 -SHA256 (zabbix-5.0.14.tar.gz) = 156c6ac9cc3307c24427dcf42f421a0dd6af37ff612f3e2cfff54e0cf7b0f507 -SIZE (zabbix-5.0.14.tar.gz) = 21159722 +TIMESTAMP = 1630853536 +SHA256 (zabbix-5.0.15.tar.gz) = 9c179ea139c62497a27928af8242255fc32be7eae8deac2a4e7cc8f67be43de1 +SIZE (zabbix-5.0.15.tar.gz) = 21297290 diff --git a/net-mgmt/zabbix5-server/files/pkg-message.in b/net-mgmt/zabbix5-server/files/pkg-message.in index 4aa7ff2936bd..e6b7ab4c8be2 100644 --- a/net-mgmt/zabbix5-server/files/pkg-message.in +++ b/net-mgmt/zabbix5-server/files/pkg-message.in @@ -1,6 +1,9 @@ [ { type: install message: <