From nobody Sun Nov 27 21:31:41 2022 X-Original-To: dev-commits-ports-main@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 4NL1y61Lw0z4hrq0; Sun, 27 Nov 2022 21:31:42 +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 4NL1y60kyDz3NBs; Sun, 27 Nov 2022 21:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669584702; 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=U1RLzjaW5dAjdQOHB/4v8iBpWssL9KT3SEuDKLKkcuk=; b=HvebjbuHQeeQpN2hw3EQJKMX+lfvBFQ5hRYbwszdHgnu2+xhV4gppS2tO49c/VMnaAztNS nFRbAQdku+Q/fpMLMMLAy2FtYn9wq8YNNzJC4bWkmtjOu3WMGULxzo29aRbQpwyU6GA/1V Lw3Esdhs9CiMElTEJCr+IfypPRj8AHKn3dc08LVqN99yos84fdUlptL9lNwLd1heYXYpXZ Mw5xKhIejpJA3BqhcJ8wvjm4+W0JQZN/ILzsJ3e22mgLx/6T2qgFP+JSTCNcvUL4uvI5ZN n8mX+KSFERFdX7s/4Wy/94nsKrreEY1f770RBw4dVwRlMPwzp7UDpS+vRETPUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669584702; 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=U1RLzjaW5dAjdQOHB/4v8iBpWssL9KT3SEuDKLKkcuk=; b=CU47SLuOnNndZbC6S+qce68YhI8xpCANtqBPY6Ie+mNFkdkqxyl+dVH3jw/HWMphaIidYI 4ZqrxonN9OHlp5ph5O6cU/PB7ACDoyiY0r/uzhaC8HZI0fvPPK+jcMgYag5hcgcQER2KfM iVl/ErnD6ohgqCV1AOgkiJPHB8oOjChKI5x29EatoX8iOYazBzR7Znys0DA+II1endZcp/ sCwJF57YKodpOURVSf6Jx3Wy31m76v/66HerDVE3kTEHjy/k7cUSRKhuck9kFCd/pQarki FfEg8g1TxzIXr1dmZwklMbwMWyQ1zuenN/qFqeefijWQkkKqBk3hrqsuaT148g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669584702; a=rsa-sha256; cv=none; b=pr1sEyPSrkSrxssp6Ay+WyxU3P55c+8kOtlVhiAM/e9sERel3R2OW+g361USrzwjjhujsV qGztmFUUayjWGUeglTVqWigSUts3FilmZu3u5HO1G5GX96sPtEkvdLF2aMCVBnubmIv6PP u9GGaZpLVgx6YbmAgJJxaXi35Lf1DPutwSPac+TqHfGfYCdjgbkkxb2owGy8wPJGJ3rBnQ Vy7KdymmtkD2c63FN0yMlrqdFozejCeqGyS66kxrkYL/42kDrOLO28Xpv3JSNoZOtfRDBP f95l8Yme3icvb6UOrLqxBnPMusx2gs8zXqRlRj47Gr+U1gl8IOp78QMOIbSr7g== 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 4NL1y56xRsz1CYb; Sun, 27 Nov 2022 21:31:41 +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 2ARLVfOr093642; Sun, 27 Nov 2022 21:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ARLVfEI093641; Sun, 27 Nov 2022 21:31:41 GMT (envelope-from git) Date: Sun, 27 Nov 2022 21:31:41 GMT Message-Id: <202211272131.2ARLVfEI093641@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: 13d643f5d197 - main - net-mgmt/zabbix6-server: Add PCRE2 support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 13d643f5d19762157ecd93e4c82712d73679db8d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=13d643f5d19762157ecd93e4c82712d73679db8d commit 13d643f5d19762157ecd93e4c82712d73679db8d Author: Juraj Lutter AuthorDate: 2022-11-27 21:16:11 +0000 Commit: Juraj Lutter CommitDate: 2022-11-27 21:31:17 +0000 net-mgmt/zabbix6-server: Add PCRE2 support - Add pcre2 support, making it the default (bumping PORTREVISION) - Small Makefile tweaks (no functional changes intended) Suggested by: Michael Osipov PR: 267957 --- net-mgmt/zabbix6-server/Makefile | 89 +++++++++++++++++++++------------------ net-mgmt/zabbix6-server/pkg-plist | 2 + 2 files changed, 49 insertions(+), 42 deletions(-) diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index 9389c39b359a..4f81530ddac7 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= zabbix6 DISTVERSION= 6.0.10 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server @@ -12,50 +13,47 @@ WWW= https://www.zabbix.com/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpcre.so:devel/pcre - -CONFLICTS_INSTALL= zabbix5[0-9]${PKGNAMESUFFIX} \ - zabbix[0-57-9]${PKGNAMESUFFIX} \ - ${PORTNAME}[0-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= ${PORTNAME}[0-9]${PKGNAMESUFFIX} \ + zabbix5[0-9]${PKGNAMESUFFIX} \ + zabbix[0-57-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache -LIB_DEPENDS+= libevent.so:devel/libevent -USE_RC_SUBR= zabbix_${ZABBIX_BUILD} +CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache \ + --with-libevent=${LOCALBASE} +LIB_DEPENDS+= libevent.so:devel/libevent +USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else -USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d +USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif -USES= pkgconfig iconv +USES= iconv pkgconfig USERS= zabbix GROUPS= zabbix -.if ${ZABBIX_BUILD} != "proxy" -PLIST_SUB= PROXY="@comment " -.else +.if ${ZABBIX_BUILD} == "proxy" PLIST_SUB= PROXY="" -PLIST_FILES+= bin/zabbix_proxy_js +.else +PLIST_SUB= PROXY="@comment " .endif - .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" -PLIST_FILES+= bin/zabbix_js .else PLIST_SUB+= SERVER="@comment " .endif -PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} DISTVERSION=${DISTVERSION} +PLIST_SUB+= DISTVERSION=${DISTVERSION} \ + ZABBIX_BUILD=${ZABBIX_BUILD} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} -MAKE_ARGS+= ARCH=freebsd -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ +MAKE_ARGS+= ARCH=freebsd +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --datadir=${ETCDIR} \ + --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ - --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" @@ -69,24 +67,26 @@ SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp -OPTIONS_DEFINE= IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC - -OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL +OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SSH UNIXODBC +OPTIONS_DEFAULT= CURL FPING MYSQL OPENSSL PCRE2 UNIXODBC OPTIONS_SUB= yes - -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 -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 MYSQLDV PGSQL ORACLE -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS +OPTIONS_SINGLE= DB PCRE SSL +OPTIONS_SINGLE_DB?= MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL +OPTIONS_SINGLE_PCRE= PCRE1 PCRE2 + +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 +PCRE_DESC= PCRE library to use +PCRE1_DESC= Use PCRE v1 library +PCRE2_DESC= Use PCRE v2 library +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) MYSQL_CONFIGURE_ON= --with-mysql MYSQL_USES+= compiler:c11 mysql:80 @@ -102,6 +102,11 @@ MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MDB6_USES+= compiler:c11 mysql:106m MDB6_DESC= Mariadb 10.6 database support +PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE1_CONFIGURE_WITH= libpcre +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +PCRE2_CONFIGURE_WITH= libpcre2 + PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql @@ -121,11 +126,11 @@ FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 -UNIXODBC_CONFIGURE_WITH=unixodbc -UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +UNIXODBC_CONFIGURE_WITH= unixodbc +UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .elif ${ZABBIX_BUILD} == "agent" -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" CURL_DESC= Support for web monitoring diff --git a/net-mgmt/zabbix6-server/pkg-plist b/net-mgmt/zabbix6-server/pkg-plist index 06d85e235292..855b20d2e697 100644 --- a/net-mgmt/zabbix6-server/pkg-plist +++ b/net-mgmt/zabbix6-server/pkg-plist @@ -28,7 +28,9 @@ %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/images.sql %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql @sample %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample +%%PROXY%%bin/zabbix_proxy_js %%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d +%%SERVER%%bin/zabbix_js %%SERVER%%@dir %%ETCDIR%%/zabbix_server.conf.d %%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts man/man8/zabbix_%%ZABBIX_BUILD%%.8.gz