From nobody Wed Mar 08 12:15:31 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWrql6rQsz3wKWM; Wed, 8 Mar 2023 12:15:31 +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 4PWrql5BRTz4JYd; Wed, 8 Mar 2023 12:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678277731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guk/Rg8Lq+70cE6xW9sDzuGWxPtUMimivuCfQK3KNgA=; b=O9RHtdj0n6h8i/sAKTS3bfLARe3JQVw9xofamvSPOJTZ7dKQsqSOQIqLxQyx6g3CnC/tMc ostQSo3AxlCR70QUgbPXo+j5covACtHMA8qyksSAzivP7ZqJnh4LsGG4li2KSsUe9yODfj YQ+nu6EXkBSSxQZ8ZtwgqKjoNn058INzoTzfl7EN3+dej/0P+Jiwc9VkbpQ7uwzEMh5PEa bJuhydosg7bQw6gvz4decFyT3qLBoQZz9v2HNNYEflO+UjwPntXsgJ+TAjqnixQwjYFT0Q W3teawd9umKFqnMko+W8+NA/i9kWv+gcHvBRvnEAdnMnUIuTOEdmKCruIN5wXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678277731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guk/Rg8Lq+70cE6xW9sDzuGWxPtUMimivuCfQK3KNgA=; b=yG6fp1KwBwbkeV7b4fzOBkG7MqElo0EIe1c/iEVgBhjw3YnRJBndc0T2ebuzd5cgkO2ftr 99JflpgYxpLyR3M5q8IKXFVyyHGrXoMU5ZUaXZr0WLtLe5FnfH8HZOigo3MSza6AIR88b+ hUNsh4h6bCoQDy0Z4bPRMD1Lrz0a/y+j7Z1YqxUscvLd6wd3aIVfZnrnouMkdmzxe3ibI1 XjwKLJWr2fB4+bXj7BDcX8yInJNRywK26VH3qAMp8W8Q3He+gy18Jw4HF4coyDOUolPwlK YoKL3DFwMa3mrzA8ZdWMuFTUe9lPa8Eam7Ce/TSRCmIfURaZ6fl7KAuiIEQXug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678277731; a=rsa-sha256; cv=none; b=C7gccPgpgJZfvy+0osWLGCJZqpg2y0RgMzWWXC1ZvJx1jEq4iBrOE4FYbGRIRWITRF/pLB FjaUMwtbgpT3CLPsoK2HVWdejm+RSemge53axzHXoXk2hFmnJ04rAba3uh2B3QqC3Lmdtr OdhC+hZOw5T3UzT3nfYXZwqAMl51/+LE6YedBXylN+5gXX7NlUq2YIF8qEvtUWKrt+V8EA T/KsdwOvnwWcqbSnve43J/j0daU0ypsW2NFViHStkHFOEGN5rhASGFQbnjPk29x2t0dPbH lsMOXnnr1rj5FCO+pLs2F0NyOYnWhx2LHCoqk7Mxl667WMeLwwe0ixA6xg3EDA== 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 4PWrql3yrnzQWW; Wed, 8 Mar 2023 12:15:31 +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 328CFVDv035034; Wed, 8 Mar 2023 12:15:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328CFVQp035033; Wed, 8 Mar 2023 12:15:31 GMT (envelope-from git) Date: Wed, 8 Mar 2023 12:15:31 GMT Message-Id: <202303081215.328CFVQp035033@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: 7c39d5d75ec0 - main - net-mgmt/zabbix6-server: Enable SSH by default List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 7c39d5d75ec07afb0e428dd8da79437f0f3facbe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c39d5d75ec07afb0e428dd8da79437f0f3facbe commit 7c39d5d75ec07afb0e428dd8da79437f0f3facbe Author: Juraj Lutter AuthorDate: 2023-03-08 11:14:58 +0000 Commit: Juraj Lutter CommitDate: 2023-03-08 12:14:34 +0000 net-mgmt/zabbix6-server: Enable SSH by default Enable SSH-based checks by default as it's usable for many scenarion. Also make SNMP checks optional, retaining default ON and clean up the required PHP extension a bit as per Zabbix manual. PR: 269992 PR: 270012 PR: 270013 --- net-mgmt/zabbix6-agent/Makefile | 1 + net-mgmt/zabbix6-frontend/Makefile | 4 ++-- net-mgmt/zabbix6-proxy/Makefile | 1 + net-mgmt/zabbix6-server/Makefile | 13 +++++++------ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/net-mgmt/zabbix6-agent/Makefile b/net-mgmt/zabbix6-agent/Makefile index 29e381e6d1c5..23ee30095502 100644 --- a/net-mgmt/zabbix6-agent/Makefile +++ b/net-mgmt/zabbix6-agent/Makefile @@ -1,4 +1,5 @@ PORTNAME= zabbix6 +PORTREVISION= 0 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent diff --git a/net-mgmt/zabbix6-frontend/Makefile b/net-mgmt/zabbix6-frontend/Makefile index 97906a51a635..f3d9d92d7fc2 100644 --- a/net-mgmt/zabbix6-frontend/Makefile +++ b/net-mgmt/zabbix6-frontend/Makefile @@ -1,10 +1,10 @@ PORTNAME= zabbix6 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -frontend${PHP_PKGNAMESUFFIX} USES+= php:web,flavors -USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap \ - mbstring openssl pcre session simplexml snmp sockets xml \ +USE_PHP= bcmath ctype gd gettext mbstring session sockets xml \ xmlreader xmlwriter IGNORE_WITH_PHP= 82 diff --git a/net-mgmt/zabbix6-proxy/Makefile b/net-mgmt/zabbix6-proxy/Makefile index 29098f9d9dad..3a3846276d86 100644 --- a/net-mgmt/zabbix6-proxy/Makefile +++ b/net-mgmt/zabbix6-proxy/Makefile @@ -1,4 +1,5 @@ PORTNAME= zabbix6 +PORTREVISION= 1 CATEGORIES= net-mgmt PKGNAMESUFFIX= -proxy diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index 9d29a3804ee0..98211c0aec61 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= zabbix6 DISTVERSION= 6.0.13 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server @@ -71,16 +72,12 @@ PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE2_CONFIGURE_WITH= libpcre2 .if ${ZABBIX_BUILD} != "agent" -LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp - CPPFLAGS+= -I${LOCALBASE}/include SUB_FILES= pkg-message -CONFIGURE_ARGS+= --with-net-snmp - -OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 LIBXML2 MYSQL OPENSSL UNIXODBC -OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SSH UNIXODBC +OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 LIBXML2 MYSQL OPENSSL SNMP SSH UNIXODBC +OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SNMP SSH UNIXODBC OPTIONS_SINGLE+= DB SSL OPTIONS_SINGLE_DB= MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL .if ${ZABBIX_BUILD} == "proxy" @@ -93,6 +90,7 @@ FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection +SNMP_DESC= Support for SNMP checks SSH_DESC= Support for SSH-based checks UNIXODBC_DESC= Support for database checks via ODBC LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) @@ -126,6 +124,9 @@ ORACLE_CONFIGURE_WITH= oracle PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql +SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +SNMP_CONFIGURE_WITH= net-snmp + SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES+= sqlite:3