From nobody Wed Feb 16 10:27:47 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 861CD194AFFF; Wed, 16 Feb 2022 10:27:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JzDgC5jLXz4pDw; Wed, 16 Feb 2022 10:27:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id K41jnLWJwyr5HKHXLnSnQi; Wed, 16 Feb 2022 10:27:51 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id KHXInUi3Y2SCrKHXKnBZpz; Wed, 16 Feb 2022 10:27:51 +0000 X-Authority-Analysis: v=2.4 cv=JLwoDuGb c=1 sm=1 tr=0 ts=620cd1a7 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=oGFeUVbbRNcA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=BKekG--sAAAA:8 a=lPWy4XukQb33zgD-zDgA:9 a=JOWeiY5itpwPQvuQ8dm/GawRuwE=:19 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 a=A3xYVEQieVNr1zmu2N-y:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0ECDF825; Wed, 16 Feb 2022 02:27:48 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 59DA4305; Wed, 16 Feb 2022 02:27:47 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Muhammad Moinur Rahman cc: Cy Schubert , "ports-committers@freebsd.org" , "dev-commits-ports-all@freebsd.org" , "dev-commits-ports-main@freebsd.org" Subject: Re: git: daa62df12ab2 - main - net-mgmt/zabbix6-*: Add new family of zabbix6-* ports In-reply-to: <41C69142-6996-440A-B6C2-A9FC4F8A7083@freebsd.org> References: <202202160922.21G9MSC5066802@gitrepo.freebsd.org> <41C69142-6996-440A-B6C2-A9FC4F8A7083@freebsd.org> Comments: In-reply-to Muhammad Moinur Rahman message dated "Wed, 16 Feb 2022 10:55:51 +0100." 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=us-ascii Date: Wed, 16 Feb 2022 02:27:47 -0800 Message-Id: <20220216102747.59DA4305@slippy.cwsent.com> X-CMAE-Envelope: MS4xfFhQQF9vrwErpC7JyqR985FiaAjVTjs7dZl30jwrWABXmS20G4jMY0sPvjXdB4LrtMWa0orM+EQaGuzmcg9Q2laTpyEP68Wf1di3CIYQ3BuBpc+BPqsG oqgfXDVcgB6A3HROrXBlCLu/R4dMUsvsetc3kyPehf8X2ONK3orVaJfHFr9MHLmKMDuwtkLJXp70RcxcX58LX65/qJdmTS2fGZUW9FxmiBJRnCs/PO/d9oBX 0qArJlFHW1VaXtTay+uL9uHbvAxrnPPCB3thStjONAa0lWVWRtWrc8heIk0V8HZUu3wWyH/X1qnzfOY5xCL81RCJoVKguY6FPvhOYRhPZCSupMUNHdUsOvHw avG114SO X-Rspamd-Queue-Id: 4JzDgC5jLXz4pDw X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 3.97.99.33) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-1.80 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[4]; RCVD_IN_DNSWL_MED(-0.20)[3.97.99.33:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; RCVD_TLS_LAST(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[70.66.148.124:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all,dev-commits-ports-main]; R_SPF_NA(0.00)[no SPF record] X-ThisMailContainsUnwantedMimeParts: N Thanks. It's been pushed. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. In message <41C69142-6996-440A-B6C2-A9FC4F8A7083@freebsd.org>, Muhammad Moinur Rahman writes: > > > --Apple-Mail=_BB5A96D5-4906-42CD-AD9F-B1F1CC20F729 > Content-Transfer-Encoding: quoted-printable > Content-Type: text/plain; > charset=utf-8 > > Hi, > > As mentioned at = > https://www.zabbix.com/documentation/6.0/en/manual/installation/requiremen= > ts#frontend > > zabbix-frontend doesn=E2=80=99t support php8*. So please mark it = > IGNORE_WITH_PHP=3D80 81 > > And as mentioned in = > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D261604 > > We are about to expire php74 sometimes in the end of this year after the = > security support ends on 28th November 2021. So please add the following = > to zabbix-frontend: > > DEPRECATED=3D Requires php 7.4 which is set to expire on 2022-11-29 > EXPIRATION_DATE=3D2022-11-28 > > My plan is to keeping the zabbix-[agent|java] of the LTS releases in the = > tree. And fingers crossed for 6.2 Release which is supposed to support = > php 8.x branch. > > Kind Regards, > Moin (bofh) > > > On 16 Feb 2022, at 10:22, Cy Schubert wrote: > >=20 > > The branch main has been updated by cy: > >=20 > > URL: = > https://cgit.FreeBSD.org/ports/commit/?id=3Ddaa62df12ab218d5669424a6745397= > 4bbab9eb0c > >=20 > > commit daa62df12ab218d5669424a67453974bbab9eb0c > > Author: Cy Schubert > > AuthorDate: 2022-02-16 08:58:15 +0000 > > Commit: Cy Schubert > > CommitDate: 2022-02-16 09:18:02 +0000 > >=20 > > net-mgmt/zabbix6-*: Add new family of zabbix6-* ports > >=20 > > Zabbix 6.0 LTS was released on Feb 8, 2022. > >=20 > > End of full support: Feb 28, 2025 > > End of Limited support: Feb 28, 2027 > > Announced: = > https://www.zabbix.com/life_cycle_and_release_policy > > --- > > net-mgmt/Makefile | 5 + > > net-mgmt/zabbix6-agent/Makefile | 11 + > > net-mgmt/zabbix6-frontend/Makefile | 30 + > > net-mgmt/zabbix6-java/Makefile | 13 + > > net-mgmt/zabbix6-proxy/Makefile | 9 + > > net-mgmt/zabbix6-server/Makefile | 218 +++ > > net-mgmt/zabbix6-server/distinfo | 3 + > > .../files/patch-src_libs_zbxembed_duktape.h | 11 + > > net-mgmt/zabbix6-server/files/pkg-message.in | 48 + > > net-mgmt/zabbix6-server/files/zabbix_agentd.in | 67 + > > net-mgmt/zabbix6-server/files/zabbix_java.in | 47 + > > net-mgmt/zabbix6-server/files/zabbix_proxy.in | 68 + > > net-mgmt/zabbix6-server/files/zabbix_server.in | 69 + > > net-mgmt/zabbix6-server/pkg-descr | 10 + > > net-mgmt/zabbix6-server/pkg-plist | 27 + > > net-mgmt/zabbix6-server/pkg-plist.agent | 9 + > > net-mgmt/zabbix6-server/pkg-plist.frontend | 1471 = > ++++++++++++++++++++ > > net-mgmt/zabbix6-server/pkg-plist.java | 11 + > > 18 files changed, 2127 insertions(+) > >=20 > > diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile > > index 3dbaa1497d5a..d37e9d4f5213 100644 > > --- a/net-mgmt/Makefile > > +++ b/net-mgmt/Makefile > > @@ -411,5 +411,10 @@ > > SUBDIR +=3D zabbix54-java > > SUBDIR +=3D zabbix54-proxy > > SUBDIR +=3D zabbix54-server > > + SUBDIR +=3D zabbix6-agent > > + SUBDIR +=3D zabbix6-frontend > > + SUBDIR +=3D zabbix6-java > > + SUBDIR +=3D zabbix6-proxy > > + SUBDIR +=3D zabbix6-server > >=20 > > .include > > diff --git a/net-mgmt/zabbix6-agent/Makefile = > b/net-mgmt/zabbix6-agent/Makefile > > new file mode 100644 > > index 000000000000..29e381e6d1c5 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-agent/Makefile > > @@ -0,0 +1,11 @@ > > +PORTNAME=3D zabbix6 > > +CATEGORIES=3D net-mgmt > > +PKGNAMESUFFIX=3D -agent > > + > > +MASTERDIR=3D ${.CURDIR}/../${PORTNAME}-server > > +PLIST=3D ${PKGDIR}/pkg-plist.agent > > + > > +OPTIONS_DEFINE=3D CURL IPV6 MODBUS > > +OPTIONS_DEFAULT=3D CURL OPENSSL > > + > > +.include "${MASTERDIR}/Makefile" > > diff --git a/net-mgmt/zabbix6-frontend/Makefile = > b/net-mgmt/zabbix6-frontend/Makefile > > new file mode 100644 > > index 000000000000..00953f71d81e > > --- /dev/null > > +++ b/net-mgmt/zabbix6-frontend/Makefile > > @@ -0,0 +1,30 @@ > > +PORTNAME=3D zabbix6 > > +CATEGORIES=3D net-mgmt > > +PKGNAMESUFFIX=3D -frontend${PHP_PKGNAMESUFFIX} > > + > > +USES+=3D php:web,flavors > > +USE_PHP=3D bcmath ctype dom fileinfo filter gd gettext hash json = > ldap \ > > + mbstring openssl pcre session simplexml snmp sockets xml = > \ > > + xmlreader xmlwriter > > + > > +MASTERDIR=3D ${.CURDIR}/../${PORTNAME}-server > > +PATCHDIR=3D > > +NO_ARCH=3D yes > > +NO_BUILD=3D yes > > + > > +PLIST=3D ${PKGDIR}/pkg-plist.frontend > > + > > +OPTIONS_DEFINE=3D MYSQLI ORACLE PGSQL > > +OPTIONS_DEFAULT=3D MYSQLI > > +MYSQLI_DESC=3D MySQLI backend > > + > > +MYSQLI_USE=3D PHP=3Dmysqli > > +ORACLE_CONFIGURE_WITH=3D oracle > > +PGSQL_USE=3D PHP=3Dpgsql > > + > > +do-install: > > + @${MKDIR} ${STAGEDIR}${WWWDIR} > > + (cd ${WRKSRC}/ui && \ > > + ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) > > + > > +.include "${MASTERDIR}/Makefile" > > diff --git a/net-mgmt/zabbix6-java/Makefile = > b/net-mgmt/zabbix6-java/Makefile > > new file mode 100644 > > index 000000000000..6ef4de4d2289 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-java/Makefile > > @@ -0,0 +1,13 @@ > > +PORTNAME=3D zabbix6 > > +PORTREVISION=3D 0 > > +CATEGORIES=3D net-mgmt > > +PKGNAMESUFFIX=3D -java > > + > > +MASTERDIR=3D ${.CURDIR}/../${PORTNAME}-server > > +PLIST=3D ${PKGDIR}/pkg-plist.java > > + > > +OPTIONS_DEFINE=3D IPV6 > > + > > +USE_JAVA=3D yes > > + > > +.include "${MASTERDIR}/Makefile" > > diff --git a/net-mgmt/zabbix6-proxy/Makefile = > b/net-mgmt/zabbix6-proxy/Makefile > > new file mode 100644 > > index 000000000000..1e43b7949df2 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-proxy/Makefile > > @@ -0,0 +1,9 @@ > > +PORTNAME=3D zabbix6 > > +CATEGORIES=3D net-mgmt > > +PKGNAMESUFFIX=3D -proxy > > + > > +MASTERDIR=3D ${.CURDIR}/../${PORTNAME}-server > > + > > +OPTIONS_SINGLE_DB=3D MYSQL PGSQL SQLITE ORACLE > > + > > +.include "${MASTERDIR}/Makefile" > > diff --git a/net-mgmt/zabbix6-server/Makefile = > b/net-mgmt/zabbix6-server/Makefile > > new file mode 100644 > > index 000000000000..6ff535c4a92e > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/Makefile > > @@ -0,0 +1,218 @@ > > +PORTNAME=3D zabbix6 > > +DISTVERSION=3D 6.0.0 > > +CATEGORIES=3D net-mgmt > > +MASTER_SITES=3D = > https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ > > +PKGNAMESUFFIX?=3D -server > > +DISTNAME=3D zabbix-${DISTVERSION} > > + > > +MAINTAINER=3D cy@FreeBSD.org > > +COMMENT=3D Enterprise-class open source distributed monitoring = > (${PKGNAMESUFFIX:S/^-//}) > > + > > +LICENSE=3D GPLv2+ > > +LICENSE_FILE=3D ${WRKSRC}/COPYING > > + > > +LIB_DEPENDS=3D libpcre.so:devel/pcre > > + > > +CONFLICTS_INSTALL zabbix5[0-9]${PKGNAMESUFFIX} \ > > + zabbix[0-57-9]${PKGNAMESUFFIX} > > + > > +ZABBIX_BUILD=3D ${PKGNAMESUFFIX:S/^-//:S/-$//} > > + > > +.if ${ZABBIX_BUILD} !=3D "frontend" # frontend only needs the = > version/distribution settings > > +.if ${ZABBIX_BUILD} !=3D "agent" > > +CONFIGURE_ARGS+=3D --with-libevent=3D${LOCALBASE} = > --cache-file=3D${WRKSRC}/config.cache > > +LIB_DEPENDS+=3D libevent.so:devel/libevent > > +USE_RC_SUBR=3D zabbix_${ZABBIX_BUILD} > > +.else > > +USE_RC_SUBR=3D zabbix_${ZABBIX_BUILD}d > > +.endif > > + > > +USES=3D pkgconfig iconv > > + > > +USERS=3D zabbix > > +GROUPS=3D zabbix > > + > > +.if ${ZABBIX_BUILD} !=3D "proxy" > > +PLIST_SUB=3D PROXY=3D"@comment " > > +.else > > +PLIST_SUB=3D PROXY=3D"" > > +PLIST_FILES+=3D bin/zabbix_proxy_js > > +.endif > > + > > +.if ${ZABBIX_BUILD} =3D=3D "server" > > +PLIST_SUB+=3D SERVER=3D"" > > +PLIST_FILES+=3D bin/zabbix_js > > +.else > > +PLIST_SUB+=3D SERVER=3D"@comment " > > +.endif > > + > > +PLIST_SUB+=3D ZABBIX_BUILD=3D${ZABBIX_BUILD} = > DISTVERSION=3D${DISTVERSION} > > +SUB_LIST=3D ZABBIX_BUILD=3D${ZABBIX_BUILD} > > + > > +MAKE_ARGS+=3D ARCH=3Dfreebsd > > +GNU_CONFIGURE=3D yes > > +CONFIGURE_ARGS+=3D --enable-${ZABBIX_BUILD} \ > > + --sysconfdir=3D${ETCDIR} \ > > + --datadir=3D${ETCDIR} \ > > + --with-iconv=3D${ICONV_PREFIX} > > + > > +.if ${ZABBIX_BUILD} !=3D "agent" && ${ZABBIX_BUILD} !=3D "java" > > +LIB_DEPENDS+=3D libnetsnmp.so:net-mgmt/net-snmp > > + > > +CPPFLAGS+=3D -I${LOCALBASE}/include > > + > > +SUB_FILES=3D pkg-message > > + > > +CONFIGURE_ARGS+=3D --with-net-snmp > > + > > +OPTIONS_DEFINE=3D IPV6 FPING CURL LDAP IPMI SSH NMAP = > LIBXML2 UNIXODBC > > + > > +OPTIONS_DEFAULT=3D FPING CURL UNIXODBC MYSQL OPENSSL > > +OPTIONS_SUB=3D yes > > + > > +FPING_DESC=3D Build/install fping for ping checks > > +IPMI_DESC=3D Support for IPMI checks > > +LDAP_DESC=3D Support for LDAP server checks > > +NMAP_DESC=3D Build/install nmap for o/s detection > > +SSH_DESC=3D Support for SSH-based checks > > +UNIXODBC_DESC=3D Support for database checks via ODBC > > +LIBXML2_DESC=3D Support for libxml2 (required by = > monitoring VMware) > > + > > +OPTIONS_SINGLE=3D DB SSL > > +OPTIONS_SINGLE_DB?=3D MYSQL PGSQL ORACLE > > +OPTIONS_SINGLE_SSL=3D OPENSSL GNUTLS > > + > > +MYSQL_CONFIGURE_WITH=3D mysql > > +MYSQL_USES+=3D compiler:c11 mysql > > + > > +PGSQL_CONFIGURE_WITH=3D postgresql > > +PGSQL_USES+=3D pgsql > > + > > +SQLITE_CONFIGURE_WITH=3D sqlite3 > > +SQLITE_USES+=3D sqlite:3 > > + > > +ORACLE_CONFIGURE_WITH=3D oracle > > + > > +LDAP_CONFIGURE_WITH=3D ldap > > +LDAP_USE=3D OPENLDAP=3Dyes > > + > > +IPMI_CONFIGURE_WITH=3D openipmi > > +IPMI_LIB_DEPENDS=3D libOpenIPMI.so:sysutils/openipmi > > + > > +FPING_RUN_DEPENDS=3D fping:net/fping > > + > > +SSH_CONFIGURE_WITH=3D ssh2 > > +SSH_LIB_DEPENDS=3D libssh2.so:security/libssh2 > > + > > +UNIXODBC_CONFIGURE_WITH=3Dunixodbc > > +UNIXODBC_LIB_DEPENDS=3D libodbc.so:databases/unixODBC > > +.elif ${ZABBIX_BUILD} =3D=3D "agent" > > +OPTIONS_SINGLE=3D SSL > > +OPTIONS_SINGLE_SSL=3D OPENSSL GNUTLS > > +.endif # if ${ZABBIX_BUILD} !=3D "agent" && ${ZABBIX_BUILD} !=3D = > "java" > > + > > +CURL_DESC=3D Support for web monitoring > > +CURL_CONFIGURE_WITH=3D libcurl > > +CURL_LIB_DEPENDS=3D libcurl.so:ftp/curl > > + > > +IPV6_CONFIGURE_ENABLE=3D ipv6 > > + > > +NMAP_RUN_DEPENDS=3D nmap:security/nmap \ > > + sudo:security/sudo > > + > > +LIBXML2_CONFIGURE_WITH=3D libxml2=3D${LOCALBASE} > > +LIBXML2_LIB_DEPENDS=3D libxml2.so:textproc/libxml2 > > + > > +MODBUS_DESC=3D Support for Modbus checks > > +MODBUS_CONFIGURE_WITH=3D libmodbus > > +MODBUS_LIB_DEPENDS=3D libmodbus.so:comms/libmodbus > > + > > +OPENSSL_CONFIGURE_WITH=3D openssl > > +OPENSSL_USES=3D ssl > > +OPENSSL_VARS=3D BROKEN_SSL=3D"libressl libressl-devel" \ > > + BROKEN_SSL_REASON=3D"PSK is not provided by = > LibreSSL" > > + > > +GNUTLS_CONFIGURE_WITH=3D gnutls > > +GNUTLS_LIB_DEPENDS=3D libgnutls.so:security/gnutls > > + > > +.include > > + > > +post-patch: > > + @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ > > + | ${XARGS} ${REINPLACE_CMD} -e 's#/usr/local/etc#${ETCDIR}#g' > > + > > + @${REINPLACE_CMD} -e = > 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ > > + ${WRKSRC}/conf/zabbix_*.conf \ > > + ${WRKSRC}/src/zabbix_proxy/proxy.c \ > > + ${WRKSRC}/src/zabbix_server/server.c > > + > > +.if ${ZABBIX_BUILD} =3D=3D "server" > > + @${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 > > +.endif > > + > > +.if ${ZABBIX_BUILD} =3D=3D "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 > > +.endif > > + > > +.if ${ZABBIX_BUILD} =3D=3D "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 > > +.endif > > + > > +.if ${ZABBIX_BUILD} =3D=3D "java" > > + @${REINPLACE_CMD} -e = > 's#/tmp/zabbix_java.pid#/var/run/zabbix/zabbix_java.pid#g' \ > > + ${WRKSRC}/src/zabbix_java/settings.sh > > +.endif > > + > > +.if ${ZABBIX_BUILD} !=3D "agent" > > +. for d in mysql oracle postgresql sqlite3 > > + @${REINPLACE_CMD} \ > > + -e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \ > > + -e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \ > > + ${WRKSRC}/database/${d}/data.sql > > +. endfor > > +.endif > > + @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' = > \) \ > > + -exec ${RM} {} + > > + > > +pre-configure: > > + @echo "ac_cv_env_PKG_CONFIG_set=3D${LOCALBASE}/bin/pkgconf" > = > ${WRKSRC}/config.cache > > + > > +post-install: > > +.if ${ZABBIX_BUILD} =3D=3D "java" > > + ${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \ > > + ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample > > + @${MKDIR} ${STAGEDIR}/var/run/zabbix > > +.endif > > + > > +.if ${ZABBIX_BUILD} !=3D "agent" && ${ZABBIX_BUILD} !=3D "java" > > + ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database > > + @${RM} ${WRKSRC}/database/*/Makefile* > > + (cd ${WRKSRC}/database/ && \ > > + ${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \ > > + ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) > > + > > + ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \ > > + ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample > > +.endif > > + > > +.if ${ZABBIX_BUILD} =3D=3D "agent" > > + ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ > > + ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample > > +.endif > > + > > +.if ${ZABBIX_BUILD} =3D=3D "proxy" > > + ${MV} ${STAGEDIR}${LOCALBASE}/bin/zabbix_js \ > > + ${STAGEDIR}${LOCALBASE}/bin/zabbix_proxy_js > > +.endif > > + > > +.else # frontend > > +.include > > +.endif > > + > > +.include > > diff --git a/net-mgmt/zabbix6-server/distinfo = > b/net-mgmt/zabbix6-server/distinfo > > new file mode 100644 > > index 000000000000..c34434ed35da > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/distinfo > > @@ -0,0 +1,3 @@ > > +TIMESTAMP =3D 1644957974 > > +SHA256 (zabbix-6.0.0.tar.gz) =3D = > 5ef08abf233e5ed731f145c0857d61a5297cb76e4dbd4bca91a3714a062b8b36 > > +SIZE (zabbix-6.0.0.tar.gz) =3D 32913629 > > diff --git = > a/net-mgmt/zabbix6-server/files/patch-src_libs_zbxembed_duktape.h = > b/net-mgmt/zabbix6-server/files/patch-src_libs_zbxembed_duktape.h > > new file mode 100644 > > index 000000000000..ff6595a49bb5 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/files/patch-src_libs_zbxembed_duktape.h > > @@ -0,0 +1,11 @@ > > +--- src/libs/zbxembed/duktape.h.orig 2022-02-14 01:54:29.000000000 = > -0800 > > ++++ src/libs/zbxembed/duktape.h 2022-02-15 13:48:15.058093000 = > -0800 > > +@@ -160,7 +160,7 @@ > > + #if !defined(DUKTAPE_H_INCLUDED) > > + #define DUKTAPE_H_INCLUDED > > + > > +-#define DUK_SINGLE_FILE > > ++#undef DUK_SINGLE_FILE > > + > > + /* > > + * BEGIN PUBLIC API > > diff --git a/net-mgmt/zabbix6-server/files/pkg-message.in = > b/net-mgmt/zabbix6-server/files/pkg-message.in > > new file mode 100644 > > index 000000000000..8ce528447ee0 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/files/pkg-message.in > > @@ -0,0 +1,48 @@ > > +[ > > +{ type: install > > + message: < > +Log files are now under /var/log/zabbix directory instead of /tmp as = > it was > > +previously. > > + > > +For Zabbix server and proxy daemons, as well as Zabbix frontend, a = > database is > > +required. It is not needed to run Zabbix agent. > > + > > +% cd %%DATADIR%%/%%ZABBIX_BUILD%%/database > > + > > +And follow the instructions: > > = > +https://www.zabbix.com/documentation/5.4/manual/appendix/install/db_scrip= > ts > > + > > +Upgrade notes for 5.4.0: > > = > +https://www.zabbix.com/documentation/5.4/manual/installation/upgrade_note= > s_520 > > + > > +Upgrade procedure: > > = > +https://www.zabbix.com/documentation/5.4/manual/installation/upgrade/sour= > ces > > + > > +Please see https://www.zabbix.com/ for detailed information about = > Zabbix. > > + > > +Official Zabbix documentation: > > +https://www.zabbix.com/documentation/5.4/start > > + > > +For Zabbix frontend "Welcome" screen. Enter the user name Admin with = > password > > +zabbix to log in as a Zabbix superuser. > > + > > +For use NMAP please edit sudoers. > > + > > +This is a Zabbix Standard release! > > + > > +Standard Zabbix releases are supported for Zabbix customers during = > six (6) > > +months of Full Support (general, critical and security issues) until = > the next > > +Zabbix stable release, plus one (1) additional month of Limited = > Support > > +(critical and security issues only). Zabbix Standard version release = > will result > > +in change of the second version number. > > + > > +Stable release: Zabbix 5.4 > > +Release date: May 17, 2021 > > +End of Full Support: Nov 30, 2021 > > +End of Limited Support: Dec 31, 2021 > > + > > +Zabbix Life Cycle & Release Policy: > > +https://www.zabbix.com/life_cycle_and_release_policy > > +EOM > > +} > > +] > > diff --git a/net-mgmt/zabbix6-server/files/zabbix_agentd.in = > b/net-mgmt/zabbix6-server/files/zabbix_agentd.in > > new file mode 100644 > > index 000000000000..5fa104126dbe > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/files/zabbix_agentd.in > > @@ -0,0 +1,67 @@ > > +#!/bin/sh > > + > > +# PROVIDE: zabbix_agentd > > +# REQUIRE: DAEMON > > +# KEYWORD: shutdown > > +# > > +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to > > +# enable zabbix_agentd: > > +# > > +# zabbix_agentd_enable (bool): Set to NO by default. Set it to YES = > to > > +# enable zabbix_agentd. > > +# zabbix_agentd_config (string): Set to the standard config file path = > by > > +# default. > > +# zabbix_agentd_pidfile (string): Location of the zabbix_agent pid = > file > > +# Default is = > /var/run/zabbix/zabbix_agentd.pid > > +# zabbix_agentd_paths (string): Set to standard path by default. Set = > a search > > +# if you have custom userparams that need binaries elsewhere. > > +# > > + > > +. /etc/rc.subr > > + > > +name=3D"zabbix_agentd" > > +rcvar=3Dzabbix_agentd_enable > > + > > +load_rc_config $name > > + > > +: ${zabbix_agentd_enable:=3DNO} > > +: ${zabbix_agentd_config:=3D%%ETCDIR%%/${name}.conf} > > +: ${zabbix_agentd_pidfile:=3D/var/run/zabbix/zabbix_agentd.pid} > > +: ${zabbix_agentd_paths:=3D$PATH} > > + > > +command=3D"%%PREFIX%%/sbin/${name}" > > +required_files=3D"${zabbix_agentd_config}" > > + > > +start_cmd=3Dzabbix_agentd_cmd > > +start_precmd=3Dzabbix_agentd_precmd > > +status_precmd=3Dzabbix_agentd_precmd > > +stop_precmd=3Dzabbix_agentd_precmd > > + > > +zabbix_agentd_precmd() > > +{ > > + pidfile=3D${zabbix_agentd_pidfile} > > + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then > > + pidfile=3D"$_pidfile_from_conf" > > + fi > > + logfile=3D/var/log/zabbix/zabbix_agentd.log > > + if get_pidfile_from_conf LogFile ${zabbix_agentd_config}; then > > + logfile=3D"$_pidfile_from_conf" > > + fi > > + local rundir=3D${pidfile%/*} > > + local logdir=3D${logfile%/*} > > + [ -d $rundir ] || install -d -m 0755 -o zabbix -g zabbix $rundir > > + [ -d $logdir ] || install -d -m 0755 -o zabbix -g zabbix $logdir > > + > > + # This shouldn't be necessary with pidfile, but empirically it = > was the > > + # only way to reap the parent PID instead of all PIDs from > > + # check_process, which may leak SysV IPC objects and prevent = > restart > > + # and/or race condition on restart. > > + rc_pid=3D$(check_pidfile ${pidfile} ${command}) > > +} > > + > > +zabbix_agentd_cmd() > > +{ > > + PATH=3D$zabbix_agentd_paths $command -c $zabbix_agentd_config > > +} > > + > > +run_rc_command "$1" > > diff --git a/net-mgmt/zabbix6-server/files/zabbix_java.in = > b/net-mgmt/zabbix6-server/files/zabbix_java.in > > new file mode 100644 > > index 000000000000..ef0f1318c76c > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/files/zabbix_java.in > > @@ -0,0 +1,47 @@ > > +#!/bin/sh > > + > > +# PROVIDE: zabbix_java > > +# REQUIRE: NETWORKING SERVERS > > +# BEFORE: DAEMON > > +# KEYWORD: shutdown > > +# > > +# Options to configure zabbix_java via /etc/rc.conf: > > +# > > +# zabbix_java_enable (bool): > > +# Enable service on boot. > > +# Default: NO > > +# > > + > > +. /etc/rc.subr > > + > > +name=3D"zabbix_java" > > +rcvar=3Dzabbix_java_enable > > + > > +load_rc_config $name > > + > > +: ${zabbix_java_enable:=3DNO} > > + > > +start_cmd=3D"/usr/bin/su -m zabbix -c = > %%PREFIX%%/sbin/zabbix_java/startup.sh" > > +stop_cmd=3D"/usr/bin/su -m zabbix -c = > %%PREFIX%%/sbin/zabbix_java/shutdown.sh" > > +status_cmd=3D"zabbix_java_status" > > + > > +extra_commands=3D"status" > > + > > +zabbix_java_status() { > > + if get_pidfile_from_conf PID_FILE = > %%PREFIX%%/sbin/zabbix_java/settings.sh; then > > + PID_FILE=3D"$_pidfile_from_conf" > > + fi > > + > > + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then > > + PID=3D`cat "$PID_FILE"` > > + if ps -p "$PID" > /dev/null 2>&1; then > > + echo "${name} is running as pid ${PID}" > > + else > > + echo "${name} is not running" > > + fi > > + else > > + echo "${name} is not running" > > + fi > > +} > > + > > +run_rc_command "$1" > > diff --git a/net-mgmt/zabbix6-server/files/zabbix_proxy.in = > b/net-mgmt/zabbix6-server/files/zabbix_proxy.in > > new file mode 100644 > > index 000000000000..274c75c29251 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/files/zabbix_proxy.in > > @@ -0,0 +1,68 @@ > > +#!/bin/sh > > + > > +# PROVIDE: zabbix_proxy > > +# REQUIRE: DAEMON > > +%%PGSQL%%# REQUIRE: postgresql > > +%%MYSQL%%# REQUIRE: mysql > > +# KEYWORD: shutdown > > +# > > +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to > > +# enable zabbix_proxy: > > +# > > +# zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to > > +# enable zabbix_proxy. > > +# zabbix_proxy_config (string): Set to the standard config file path = > by > > +# default. > > +# zabbix_proxy_pidfile (string): Location of the zabbix_proxy pid = > file > > +# Default is = > /var/run/zabbix/zabbix_proxy.pid > > +# zabbix_proxy_paths (string): Set to standard path by default. Set = > a search > > +# if you have custom userparams that need binaries elsewhere. > > +# > > + > > +. /etc/rc.subr > > + > > +name=3D"zabbix_proxy" > > +rcvar=3Dzabbix_proxy_enable > > + > > +load_rc_config $name > > + > > +: ${zabbix_proxy_enable:=3DNO} > > +: ${zabbix_proxy_config:=3D%%ETCDIR%%/${name}.conf} > > +: ${zabbix_proxy_pidfile:=3D/var/run/zabbix/zabbix_proxy.pid} > > + > > +command=3D"%%PREFIX%%/sbin/${name}" > > +required_files=3D"${zabbix_proxy_config}" > > + > > +start_cmd=3Dzabbix_proxy_cmd > > +start_precmd=3Dzabbix_proxy_precmd > > +status_precmd=3Dzabbix_proxy_precmd > > +stop_precmd=3Dzabbix_proxy_precmd > > + > > +zabbix_proxy_precmd() > > +{ > > + pidfile=3D${zabbix_proxy_pidfile} > > + if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then > > + pidfile=3D"$_pidfile_from_conf" > > + fi > > + logfile=3D/var/log/zabbix/zabbix_proxy.log > > + if get_pidfile_from_conf LogFile ${zabbix_proxy_config}; then > > + logfile=3D"$_pidfile_from_conf" > > + fi > > + local rundir=3D${pidfile%/*} > > + local logdir=3D${logfile%/*} > > + [ -d $rundir ] || install -d -m 0755 -o zabbix -g zabbix $rundir > > + [ -d $logdir ] || install -d -m 0755 -o zabbix -g zabbix $logdir > > + > > + # This shouldn't be necessary with pidfile, but empirically it = > was the > > + # only way to reap the parent PID instead of all PIDs from > > + # check_process, which may leak SysV IPC objects and prevent = > restart > > + # and/or race condition on restart. > > + rc_pid=3D$(check_pidfile ${pidfile} ${command}) > > +} > > + > > +zabbix_proxy_cmd() > > +{ > > + PATH=3D$zabbix_proxy_paths $command -c $zabbix_proxy_config > > +} > > + > > +run_rc_command "$1" > > diff --git a/net-mgmt/zabbix6-server/files/zabbix_server.in = > b/net-mgmt/zabbix6-server/files/zabbix_server.in > > new file mode 100644 > > index 000000000000..68e9f052734e > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/files/zabbix_server.in > > @@ -0,0 +1,69 @@ > > +#!/bin/sh > > + > > +# PROVIDE: zabbix_server > > +# REQUIRE: DAEMON > > +%%PGSQL%%# REQUIRE: postgresql > > +%%MYSQL%%# REQUIRE: mysql > > +# KEYWORD: shutdown > > +# > > +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to > > +# enable zabbix_server: > > +# > > +# zabbix_server_enable (bool): Set to NO by default. Set it to YES = > to > > +# enable zabbix_server. > > +# zabbix_server_config (string): Set to the standard config file path = > by > > +# default. > > +# zabbix_server_pidfile (string): Location of the zabbix_server = > pid file > > +# Default is = > /var/run/zabbix/zabbix_server.pid > > +# zabbix_server_paths (string): Set to standard path by default. Set = > a search > > +# if you have custom userparams that need binaries elsewhere. > > +# > > + > > +. /etc/rc.subr > > + > > +name=3D"zabbix_server" > > +rcvar=3Dzabbix_server_enable > > + > > +load_rc_config $name > > + > > +: ${zabbix_server_enable:=3DNO} > > +: ${zabbix_server_config:=3D%%ETCDIR%%/${name}.conf} > > +: ${zabbix_server_pidfile:=3D/var/run/zabbix/zabbix_server.pid} > > +: ${zabbix_server_paths:=3D$PATH} > > + > > +command=3D"%%PREFIX%%/sbin/${name}" > > +required_files=3D"${zabbix_server_config}" > > + > > +start_cmd=3Dzabbix_server_cmd > > +start_precmd=3Dzabbix_server_precmd > > +status_precmd=3Dzabbix_server_precmd > > +stop_precmd=3Dzabbix_server_precmd > > + > > +zabbix_server_precmd() > > +{ > > + pidfile=3D${zabbix_server_pidfile} > > + if get_pidfile_from_conf PidFile ${zabbix_server_config}; then > > + pidfile=3D"$_pidfile_from_conf" > > + fi > > + logfile=3D/var/log/zabbix/zabbix_server.log > > + if get_pidfile_from_conf LogFile ${zabbix_server_config}; then > > + logfile=3D"$_pidfile_from_conf" > > + fi > > + local rundir=3D${pidfile%/*} > > + local logdir=3D${logfile%/*} > > + [ -d $rundir ] || install -d -m 0755 -o zabbix -g zabbix $rundir > > + [ -d $logdir ] || install -d -m 0755 -o zabbix -g zabbix $logdir > > + > > + # This shouldn't be necessary with pidfile, but empirically it = > was the > > + # only way to reap the parent PID instead of all PIDs from > > + # check_process, which may leak SysV IPC objects and prevent = > restart > > + # and/or race condition on restart. > > + rc_pid=3D$(check_pidfile ${pidfile} ${command}) > > +} > > + > > +zabbix_server_cmd() > > +{ > > + PATH=3D$zabbix_server_paths $command -c $zabbix_server_config > > +} > > + > > +run_rc_command "$1" > > diff --git a/net-mgmt/zabbix6-server/pkg-descr = > b/net-mgmt/zabbix6-server/pkg-descr > > new file mode 100644 > > index 000000000000..28b4da564fbf > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/pkg-descr > > @@ -0,0 +1,10 @@ > > +Zabbix is an enterprise-class open source distributed monitoring = > solution. > > + > > +Zabbix is software that monitors numerous parameters of a network and = > the > > +health and integrity of servers. Zabbix uses a flexible notification > > +mechanism that allows users to configure e-mail based alerts for = > virtually > > +any event. This allows a fast reaction to server problems. Zabbix = > offers > > +excellent reporting and data visualisation features based on the = > stored > > +data. This makes Zabbix ideal for capacity planning. > > + > > +WWW: https://www.zabbix.com/ > > diff --git a/net-mgmt/zabbix6-server/pkg-plist = > b/net-mgmt/zabbix6-server/pkg-plist > > new file mode 100644 > > index 000000000000..3396fbb42ec4 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/pkg-plist > > @@ -0,0 +1,27 @@ > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/data.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/double.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/history_pk_prepare.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/images.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/data.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/double.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/history_pk_prepare.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/images.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/schema.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/data.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/double.sql > > = > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/history_pk_prepare.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/images.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/schema.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/data.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/images.sql > > +%%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql > > +@sample %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample > > +%%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d > > +%%SERVER%%@dir %%ETCDIR%%/zabbix_server.conf.d > > +%%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts > > +man/man8/zabbix_%%ZABBIX_BUILD%%.8.gz > > +sbin/zabbix_%%ZABBIX_BUILD%% > > +@dir %%ETCDIR%%/zabbix/externalscripts > > +@dir lib/modules > > diff --git a/net-mgmt/zabbix6-server/pkg-plist.agent = > b/net-mgmt/zabbix6-server/pkg-plist.agent > > new file mode 100644 > > index 000000000000..e2e36a7e7499 > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/pkg-plist.agent > > @@ -0,0 +1,9 @@ > > +@sample %%ETCDIR%%/zabbix_agentd.conf.sample > > +bin/zabbix_get > > +bin/zabbix_sender > > +man/man1/zabbix_get.1.gz > > +man/man1/zabbix_sender.1.gz > > +man/man8/zabbix_%%ZABBIX_BUILD%%d.8.gz > > +sbin/zabbix_agentd > > +@dir %%ETCDIR%%/zabbix_agentd.conf.d > > +@dir lib/modules > > diff --git a/net-mgmt/zabbix6-server/pkg-plist.frontend = > b/net-mgmt/zabbix6-server/pkg-plist.frontend > > new file mode 100644 > > index 000000000000..8f999b017d0f > > --- /dev/null > > +++ b/net-mgmt/zabbix6-server/pkg-plist.frontend > > @@ -0,0 +1,1471 @@ > > +%%WWWDIR%%/actionconf.php > > +%%WWWDIR%%/api_jsonrpc.php > > +%%WWWDIR%%/app/.htaccess > > +%%WWWDIR%%/app/controllers/CControllerActionOperationGet.php > > +%%WWWDIR%%/app/controllers/CControllerActionOperationValidate.php > > +%%WWWDIR%%/app/controllers/CControllerAuditLogList.php > > +%%WWWDIR%%/app/controllers/CControllerAuditSettingsEdit.php > > +%%WWWDIR%%/app/controllers/CControllerAuditSettingsUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php > > +%%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerAutoregEdit.php > > +%%WWWDIR%%/app/controllers/CControllerAutoregUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerCharts.php > > +%%WWWDIR%%/app/controllers/CControllerChartsView.php > > +%%WWWDIR%%/app/controllers/CControllerChartsViewJson.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationConditionAdd.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationCreate.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationDelete.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationDisable.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationEdit.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationEnable.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationList.php > > +%%WWWDIR%%/app/controllers/CControllerCorrelationUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardDelete.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardList.php > > = > +%%WWWDIR%%/app/controllers/CControllerDashboardPagePropertiesCheck.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardPagePropertiesEdit.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardPrint.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardPropertiesCheck.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardPropertiesEdit.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardShareUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardView.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetCheck.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetConfigure.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetEdit.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php > > +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetsSanitize.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryCreate.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryDelete.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryDisable.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryEdit.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryEnable.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryList.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerDiscoveryView.php > > +%%WWWDIR%%/app/controllers/CControllerExport.php > > +%%WWWDIR%%/app/controllers/CControllerFavouriteCreate.php > > +%%WWWDIR%%/app/controllers/CControllerFavouriteDelete.php > > +%%WWWDIR%%/app/controllers/CControllerGeomapsEdit.php > > +%%WWWDIR%%/app/controllers/CControllerGeomapsUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerGuiEdit.php > > +%%WWWDIR%%/app/controllers/CControllerGuiUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerHintboxActionlist.php > > +%%WWWDIR%%/app/controllers/CControllerHintboxEventlist.php > > +%%WWWDIR%%/app/controllers/CControllerHost.php > > +%%WWWDIR%%/app/controllers/CControllerHostCreate.php > > +%%WWWDIR%%/app/controllers/CControllerHostDashboardView.php > > +%%WWWDIR%%/app/controllers/CControllerHostEdit.php > > +%%WWWDIR%%/app/controllers/CControllerHostList.php > > +%%WWWDIR%%/app/controllers/CControllerHostMacrosList.php > > +%%WWWDIR%%/app/controllers/CControllerHostMassDelete.php > > +%%WWWDIR%%/app/controllers/CControllerHostUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerHostUpdateGeneral.php > > +%%WWWDIR%%/app/controllers/CControllerHostView.php > > +%%WWWDIR%%/app/controllers/CControllerHostViewRefresh.php > > +%%WWWDIR%%/app/controllers/CControllerHousekeepingEdit.php > > +%%WWWDIR%%/app/controllers/CControllerHousekeepingUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerIconMapCreate.php > > +%%WWWDIR%%/app/controllers/CControllerIconMapDelete.php > > +%%WWWDIR%%/app/controllers/CControllerIconMapEdit.php > > +%%WWWDIR%%/app/controllers/CControllerIconMapList.php > > +%%WWWDIR%%/app/controllers/CControllerIconMapUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerImageCreate.php > > +%%WWWDIR%%/app/controllers/CControllerImageDelete.php > > +%%WWWDIR%%/app/controllers/CControllerImageEdit.php > > +%%WWWDIR%%/app/controllers/CControllerImageList.php > > +%%WWWDIR%%/app/controllers/CControllerImageUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerLatest.php > > +%%WWWDIR%%/app/controllers/CControllerLatestView.php > > +%%WWWDIR%%/app/controllers/CControllerLatestViewRefresh.php > > +%%WWWDIR%%/app/controllers/CControllerMacrosEdit.php > > +%%WWWDIR%%/app/controllers/CControllerMacrosUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerMapView.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeCreate.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeDelete.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeDisable.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeEdit.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeEnable.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeList.php > > +%%WWWDIR%%/app/controllers/CControllerMediatypeUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerMenuPopup.php > > +%%WWWDIR%%/app/controllers/CControllerMiscConfigEdit.php > > +%%WWWDIR%%/app/controllers/CControllerMiscConfigUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerModuleEdit.php > > +%%WWWDIR%%/app/controllers/CControllerModuleList.php > > +%%WWWDIR%%/app/controllers/CControllerModuleScan.php > > +%%WWWDIR%%/app/controllers/CControllerModuleUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerNotificationsGet.php > > +%%WWWDIR%%/app/controllers/CControllerNotificationsMute.php > > +%%WWWDIR%%/app/controllers/CControllerNotificationsRead.php > > +%%WWWDIR%%/app/controllers/CControllerPopup.php > > +%%WWWDIR%%/app/controllers/CControllerPopupAcknowledgeCreate.php > > +%%WWWDIR%%/app/controllers/CControllerPopupAcknowledgeEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupConditionActions.php > > +%%WWWDIR%%/app/controllers/CControllerPopupConditionCommon.php > > +%%WWWDIR%%/app/controllers/CControllerPopupConditionEventCorr.php > > +%%WWWDIR%%/app/controllers/CControllerPopupConditionOperations.php > > +%%WWWDIR%%/app/controllers/CControllerPopupDashboardShareEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupDiscoveryCheck.php > > +%%WWWDIR%%/app/controllers/CControllerPopupGeneric.php > > +%%WWWDIR%%/app/controllers/CControllerPopupHttpStep.php > > +%%WWWDIR%%/app/controllers/CControllerPopupImport.php > > +%%WWWDIR%%/app/controllers/CControllerPopupImportCompare.php > > +%%WWWDIR%%/app/controllers/CControllerPopupItemTest.php > > +%%WWWDIR%%/app/controllers/CControllerPopupItemTestEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupItemTestGetValue.php > > +%%WWWDIR%%/app/controllers/CControllerPopupItemTestSend.php > > +%%WWWDIR%%/app/controllers/CControllerPopupLldOperation.php > > +%%WWWDIR%%/app/controllers/CControllerPopupLldOverride.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMaintenancePeriod.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMassupdateAbstract.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMassupdateHost.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMassupdateItem.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMassupdateService.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMassupdateTemplate.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMassupdateTrigger.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMedia.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMediatypeMessage.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMediatypeTestEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupMediatypeTestSend.php > > +%%WWWDIR%%/app/controllers/CControllerPopupScheduledReportCreate.php > > +%%WWWDIR%%/app/controllers/CControllerPopupScheduledReportEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupScheduledReportList.php > > = > +%%WWWDIR%%/app/controllers/CControllerPopupScheduledReportSubscriptionEdi= > t.php > > +%%WWWDIR%%/app/controllers/CControllerPopupScheduledReportTest.php > > +%%WWWDIR%%/app/controllers/CControllerPopupScriptExec.php > > +%%WWWDIR%%/app/controllers/CControllerPopupServiceEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupServiceStatusRuleEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupServices.php > > +%%WWWDIR%%/app/controllers/CControllerPopupSlaEdit.php > > = > +%%WWWDIR%%/app/controllers/CControllerPopupSlaExcludedDowntimeEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupTabFilterDelete.php > > +%%WWWDIR%%/app/controllers/CControllerPopupTabFilterEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupTabFilterUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerPopupTestTriggerExpr.php > > +%%WWWDIR%%/app/controllers/CControllerPopupTopHostsColumnEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupTriggerExpr.php > > +%%WWWDIR%%/app/controllers/CControllerPopupValueMapEdit.php > > +%%WWWDIR%%/app/controllers/CControllerPopupValueMapUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerProblem.php > > +%%WWWDIR%%/app/controllers/CControllerProblemView.php > > +%%WWWDIR%%/app/controllers/CControllerProblemViewRefresh.php > > +%%WWWDIR%%/app/controllers/CControllerProfileUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerProxyCreate.php > > +%%WWWDIR%%/app/controllers/CControllerProxyDelete.php > > +%%WWWDIR%%/app/controllers/CControllerProxyEdit.php > > +%%WWWDIR%%/app/controllers/CControllerProxyHostDisable.php > > +%%WWWDIR%%/app/controllers/CControllerProxyHostEnable.php > > +%%WWWDIR%%/app/controllers/CControllerProxyList.php > > +%%WWWDIR%%/app/controllers/CControllerProxyUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerQueueDetails.php > > +%%WWWDIR%%/app/controllers/CControllerQueueOverview.php > > +%%WWWDIR%%/app/controllers/CControllerQueueOverviewProxy.php > > +%%WWWDIR%%/app/controllers/CControllerRegExCreate.php > > +%%WWWDIR%%/app/controllers/CControllerRegExDelete.php > > +%%WWWDIR%%/app/controllers/CControllerRegExEdit.php > > +%%WWWDIR%%/app/controllers/CControllerRegExList.php > > +%%WWWDIR%%/app/controllers/CControllerRegExTest.php > > +%%WWWDIR%%/app/controllers/CControllerRegExUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerReportStatus.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportCreate.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportDelete.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportDisable.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportEdit.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportEnable.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportList.php > > +%%WWWDIR%%/app/controllers/CControllerScheduledReportUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerScriptCreate.php > > +%%WWWDIR%%/app/controllers/CControllerScriptDelete.php > > +%%WWWDIR%%/app/controllers/CControllerScriptEdit.php > > +%%WWWDIR%%/app/controllers/CControllerScriptList.php > > +%%WWWDIR%%/app/controllers/CControllerScriptUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerSearch.php > > +%%WWWDIR%%/app/controllers/CControllerServiceCreate.php > > +%%WWWDIR%%/app/controllers/CControllerServiceDelete.php > > +%%WWWDIR%%/app/controllers/CControllerServiceList.php > > +%%WWWDIR%%/app/controllers/CControllerServiceListEdit.php > > +%%WWWDIR%%/app/controllers/CControllerServiceListEditRefresh.php > > +%%WWWDIR%%/app/controllers/CControllerServiceListGeneral.php > > +%%WWWDIR%%/app/controllers/CControllerServiceListRefresh.php > > +%%WWWDIR%%/app/controllers/CControllerServiceStatusRuleValidate.php > > +%%WWWDIR%%/app/controllers/CControllerServiceUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerSlaCreate.php > > +%%WWWDIR%%/app/controllers/CControllerSlaCreateUpdate.php > > +%%WWWDIR%%/app/controllers/CControllerSlaDelete.php > > +%%WWWDIR%%/app/controllers/CControllerSlaDisable.php > > +%%WWWDIR%%/app/controllers/CControllerSlaEnable.php > > *** 1290 LINES SKIPPED *** > > > --Apple-Mail=_BB5A96D5-4906-42CD-AD9F-B1F1CC20F729 > Content-Transfer-Encoding: 7bit > Content-Disposition: attachment; > filename=signature.asc > Content-Type: application/pgp-signature; > name=signature.asc > Content-Description: Message signed with OpenPGP > > -----BEGIN PGP SIGNATURE----- > > iQKTBAEBCgB9FiEETfdREoUGjQZKBS+fvbm1phfAvJEFAmIMyidfFIAAAAAALgAo > aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDRE > Rjc1MTEyODUwNjhEMDY0QTA1MkY5RkJEQjlCNUE2MTdDMEJDOTEACgkQvbm1phfA > vJGbfA//cSDVO4LzWAsdxcH4x6nICaJ0niMkN/BzKS6bX7aWGXJA32685tHbpwXd > /DOyd8dXwks57oVUkD7Sx4dNYX4dVU3zMpDfgv0KZNgOrsq6Zy1Hmd36eb96q3S9 > gCGawJtesXYqScP6puVd0zqWHSKP+nfzx2MSaoajABnFEdgqPMV4bGz7Q1VJgzpr > MQTswcDbT6g0H8Nwqe9KiJIyYJUPBOj6e73RKFn/hlOuyI/xWkiQyxJDsCpHxG/A > txMPYK1KAUl4znlB9oMMVclPhDl4TZbm9gVFGfzs8e1aTC3YKQJBtHRcpe+596sk > jY/7c/wJtIZeqP06gwnBfgqk2F7bo9Kj9RD3lH0uY4WbxxYZBPRYRtv4GqZQgpmu > 6ej/5SH76vIEWrZbomDm6I1wEMdYR0m/tjqbNnMH88Ltk6f7gCP0W8LRc47V+Bku > 8FaDlISX6Mw0T6T6qHlCYPzVaFPUJ20tmb+0MDwrfaRUx6RLGsfrTy0wAY4MKb52 > Wy0chS/EdZa9DHRF4p6a1pGk2VRgeS/Mc/UlB3GJnl44c91z8r9FmnG+iR/BBeWV > FlIzvUFnXYspGKTEfc/cEE9Eny3FsGVDQGj6xmklTysigqDb7T9ur5xcZF2A6tqZ > Y9aC1qXpkz+FilFdIGsEotiUwTPaQpolEPyrO3zsn80KF6j0tX4= > =PTY5 > -----END PGP SIGNATURE----- > > --Apple-Mail=_BB5A96D5-4906-42CD-AD9F-B1F1CC20F729--