From nobody Mon May 09 22:12:25 2022 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 08C0E1AD790D; Mon, 9 May 2022 22:12:26 +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 4KxwQK6Plnz3sB0; Mon, 9 May 2022 22:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652134345; 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=EGi/x0rbx/2nmjiTCpDcCCN0m85lub+6crzBMlu70/Q=; b=YYidywAug0I+jBlAtMkuopOISn6OV/7uH5dMAfqfy6skmrx3J8H00yalPUj+6rrbDbH3wF NlQKDB1EJq1kv84APgDF49xOLED3Qmbzbh+SPZENNYM7OzQsvPnFM7B2oiB998OxBhkeNS xteHOIy0sc8Zi/i4eK8I0EEProcbjkF63BjyXN4jcrix2BXr771WqC21MbbR+lgs7gMEG4 +P72kigNvbWLi3sq8JRBVQgGP1j2Luiqe4ZtHOqe6VGgGMThOABB48U3LWxOTbLK0HQOzf /G991/Xw3HAc067xScqNBvJgBWG6l7sQAnEESmZ1mrFzBbCQUaELGb1kEw9wmg== 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 B687019252; Mon, 9 May 2022 22:12:25 +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 249MCPVg022362; Mon, 9 May 2022 22:12:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249MCPx4022361; Mon, 9 May 2022 22:12:25 GMT (envelope-from git) Date: Mon, 9 May 2022 22:12:25 GMT Message-Id: <202205092212.249MCPx4022361@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 8ae553cadb16 - main - net-mgmt/zabbix6-server: A don't override DEFAULT_VERSIONS= option 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ae553cadb16129ea48c2de8e912254804e39224 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652134346; 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=EGi/x0rbx/2nmjiTCpDcCCN0m85lub+6crzBMlu70/Q=; b=xrxKjqKjI3zNLfJbeoxloPjY4SS0cFjIGXbm5z44wrjYx6bYJ+78yYAQoKXGMn6pE8tN4X wwtAvCCCXssn8YDSL8Yn+S4qvIWizZ3Qc/5g7X8czuAYMW31neJA6xkbnR65nje5kjMxlY eB4eGsN5mwa22BtamPcxK+xq6aXbMp2rk6qxpaJ+65w6EVPsc+ONyyFpBemIG9Yf76RrI/ m4UF5ExCsJvwXTUkTsu/UY4kj2QK0oK4wOu6qW3VGZ4kgyle5sp7L/0s5ErMOh+yWyb034 DKa8wfFG+HD5VTZh1YfZunk1smrcKU1sO+FT+n7WfOwL1bUttzba4UhxjK4K5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652134346; a=rsa-sha256; cv=none; b=JeJbI8hB4LRBCZfLbH9H3/vqrQ9O2hHODpip0S6Ws6kcXD3Em2XK6C+BIKIM1x1M8cPrf0 GG1PPxPglEibtXIEBN4sJzpURfJb0V4lDmvkn4txzpKbnW1FLWvd2b84raIq+ZAbRnqDVC 3/jOEmmQlpmdpr4SumVvu68JcJffnyfC+aekOlwwpBzVJGi200waCf2p7FhvLY34Rv2kJx Fb1oBEaURqTdCQPyqG5EQh3nWWwypfHZE062FZnQgspX6cd7xROuNa4Ej6fH+RDJLYJ1W1 g+ipW79vpE1cOTQlDCEPI4ENMrqFZ0yvXBfRL/TgOxmaJymu+xnGs/OO0ob5hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ae553cadb16129ea48c2de8e912254804e39224 commit 8ae553cadb16129ea48c2de8e912254804e39224 Author: Cy Schubert AuthorDate: 2022-05-09 22:01:59 +0000 Commit: Cy Schubert CommitDate: 2022-05-09 22:12:18 +0000 net-mgmt/zabbix6-server: A don't override DEFAULT_VERSIONS= option Some DIY poudriere users prefer to specify $DEFAULT_VERSIONS in their make.conf. Such users should be aware that Zabbix 6 supports only mysql 8.0 and mariadb 10.5 and 10.6. (Though some have made it to work with mysql 5.7 when they ignore the warning message.) Provide these users with an option to remove the default allowing them to "responsibly" specify the version in their poudriere make.conf. Reported by: otis, egresh@egresh.sk Tested by: egresh@egresh.sk --- net-mgmt/zabbix6-server/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index bc1e5df2b6b3..866fca404884 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -78,14 +78,18 @@ SSH_DESC= Support for SSH-based checks UNIXODBC_DESC= Support for database checks via ODBC LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) MYSQL_DESC= MySQL 8.0 database support +MYSQLDV_DESC= MYSQL DEFAULT_VERSIONS= (poudriere) OPTIONS_SINGLE= DB SSL -OPTIONS_SINGLE_DB?= MDB5 MDB6 MYSQL PGSQL ORACLE +OPTIONS_SINGLE_DB?= MDB5 MDB6 MYSQL MYSQLDV PGSQL ORACLE OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_ON= --with-mysql MYSQL_USES+= compiler:c11 mysql:80 +MYSQLDV_CONFIGURE_ON= --with-mysql +MYSQLDV_USES+= compiler:c11 mysql + MDB5_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MDB5_USES+= compiler:c11 mysql:105m MDB5_DESC= Mariadb 10.5 database support