From nobody Wed Mar 08 12:15:30 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 4PWrqk4WMKz3wKPm; Wed, 8 Mar 2023 12:15:30 +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 4PWrqk4CMBz4JQJ; Wed, 8 Mar 2023 12:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678277730; 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=vVJYsoJvLlWz/wCX43be0HgutF/WwZs0hGNN+YeAjQc=; b=bvu3N7kTn60mWO2gMitOWwvCRGAGsg1MUbsar4aC+Nrb8H2eMcdOGRc7LBDvg3sIT44xyg yYaM39IIDSSmo/hOPMzoERAp+MC6PlRA62R8/V4ZDGcn/dHspk+MzzKV8ry4bGFcGSFMJX gTUzSAXCyOoUfVRn7/w/ygTlJTRlPvPsk/f3bKUDyjZwAuGuq+d64mSFG1FNZ2HgNHOmyk 4EzeI1AUNLf56T6CD+sa8rLfTcM6iTA3ms2lBVj3YQjDdsLzU9xnUjig40hirURY5RRDdl wyt97fz86efTKekhpwbmvFNBDeLLEukHjmIbkb+Z56Rp4FjYMEFlF3uJLB/KiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678277730; 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=vVJYsoJvLlWz/wCX43be0HgutF/WwZs0hGNN+YeAjQc=; b=sXYssXj/towtcYN4KiIl+ojRrKG8T++EuunqW93r5+lHGeyZzgPgKt8RL2vZwAzRsf6T+F Stz07WIQYgcNJHiXfvkOsHCxJ0rqRyPxMdwRFvJmPQLfhKcxBvenhWpS6Hh2aLYqG90Tdy Qf8Zc4i3XkUus5mnQYwBSo8V24PKcB50K9ayJSrT4GLdRIzbj6LMaBqdd1W0K3YXAY9fII YHgvv9S6VC5i+tZ6l3TpcXgXvx52/xtnS/Y7DvIVakUm5yjZlCdlZOMiknPLgLqVH+r3IP 5sH8HpcJkfltfHbnXJTNhMQK5p9OJbTOzxWi2U/rdWKiBkuW/Gyb7Ttr2k/CuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678277730; a=rsa-sha256; cv=none; b=Pn2aviV6D9Keys9b+bL3/eSsw5pjVBzm8TzkUJ2ILeBrAnkiL7S/ht6w9LNSXZdfULdWii wqwYCI985F/rpTzwQDHag4idBxFfJL7m7SR9bUSKVmhCcuagO2Jw+PuyVTg0+lgaev9fCI w69qtcmpKwMLnBgjayrchhu4lCks0V1lsvMCAgnF5OiCSXJ+qQ4j02JhDDVBGURcdc+UB1 wtfWHBDUwhP20CzeSnZlzUDKKqQyDpzGrmnI8TcozX4aNfPpykxsOA4OSNUgpWlbUFd15H KtJoIFgfFT2xY1hhptB1HJnI6GYM74uYAOJV+wRG9pbAN4LUL3ffn89QD0LV1A== 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 4PWrqk3GGyzQQx; Wed, 8 Mar 2023 12:15:30 +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 328CFUBI035015; Wed, 8 Mar 2023 12:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328CFUKV035014; Wed, 8 Mar 2023 12:15:30 GMT (envelope-from git) Date: Wed, 8 Mar 2023 12:15:30 GMT Message-Id: <202303081215.328CFUKV035014@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: b76c43777966 - main - net-mgmt/zabbix64: Add zabbix 6.4 ports 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: b76c437779668c1687f7e8922334946505891387 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=b76c437779668c1687f7e8922334946505891387 commit b76c437779668c1687f7e8922334946505891387 Author: Juraj Lutter AuthorDate: 2023-03-08 10:18:53 +0000 Commit: Juraj Lutter CommitDate: 2023-03-08 12:14:01 +0000 net-mgmt/zabbix64: Add zabbix 6.4 ports Add new ports for zabbix 6.4, an enterprise-class monitoring system. Release notes: https://www.zabbix.com/rn/rn6.4.0 PR: 269992 PR: 270012 PR: 270013 --- net-mgmt/Makefile | 5 + net-mgmt/zabbix64-agent/Makefile | 11 + net-mgmt/zabbix64-frontend/Makefile | 30 + net-mgmt/zabbix64-java/Makefile | 13 + net-mgmt/zabbix64-proxy/Makefile | 7 + net-mgmt/zabbix64-server/Makefile | 254 +++ net-mgmt/zabbix64-server/distinfo | 3 + .../files/patch-src_libs_zbxembed_duktape.h | 11 + net-mgmt/zabbix64-server/files/pkg-message.in | 51 + net-mgmt/zabbix64-server/files/zabbix_agentd.in | 67 + net-mgmt/zabbix64-server/files/zabbix_java.in | 47 + net-mgmt/zabbix64-server/files/zabbix_proxy.in | 68 + net-mgmt/zabbix64-server/files/zabbix_server.in | 69 + net-mgmt/zabbix64-server/pkg-descr | 8 + net-mgmt/zabbix64-server/pkg-plist | 39 + net-mgmt/zabbix64-server/pkg-plist.agent | 9 + net-mgmt/zabbix64-server/pkg-plist.frontend | 1696 ++++++++++++++++++++ net-mgmt/zabbix64-server/pkg-plist.java | 11 + 18 files changed, 2399 insertions(+) diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 9b43d56e4087..81ec96d74b72 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -420,5 +420,10 @@ SUBDIR += zabbix62-java SUBDIR += zabbix62-proxy SUBDIR += zabbix62-server + SUBDIR += zabbix64-agent + SUBDIR += zabbix64-frontend + SUBDIR += zabbix64-java + SUBDIR += zabbix64-proxy + SUBDIR += zabbix64-server .include diff --git a/net-mgmt/zabbix64-agent/Makefile b/net-mgmt/zabbix64-agent/Makefile new file mode 100644 index 000000000000..c081f8879cef --- /dev/null +++ b/net-mgmt/zabbix64-agent/Makefile @@ -0,0 +1,11 @@ +PORTNAME= zabbix64 +CATEGORIES= net-mgmt +PKGNAMESUFFIX= -agent + +MASTERDIR= ${.CURDIR}/../${PORTNAME}-server +PLIST= ${PKGDIR}/pkg-plist.agent + +OPTIONS_DEFINE= CURL IPV6 MODBUS +OPTIONS_DEFAULT= CURL OPENSSL + +.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix64-frontend/Makefile b/net-mgmt/zabbix64-frontend/Makefile new file mode 100644 index 000000000000..913a6d945179 --- /dev/null +++ b/net-mgmt/zabbix64-frontend/Makefile @@ -0,0 +1,30 @@ +PORTNAME= zabbix64 +CATEGORIES= net-mgmt +PKGNAMESUFFIX= -frontend${PHP_PKGNAMESUFFIX} + +USES+= php:web,flavors +USE_PHP= bcmath ctype gd gettext mbstring session sockets xml \ + xmlreader xmlwriter +IGNORE_WITH_PHP= 82 + +MASTERDIR= ${.CURDIR}/../${PORTNAME}-server +PATCHDIR= +NO_ARCH= yes +NO_BUILD= yes + +PLIST= ${PKGDIR}/pkg-plist.frontend + +OPTIONS_DEFINE= MYSQLI ORACLE PGSQL +OPTIONS_DEFAULT= MYSQLI +MYSQLI_DESC= MySQLI backend + +MYSQLI_USE= PHP=mysqli +ORACLE_CONFIGURE_WITH= oracle +PGSQL_USE= PHP=pgsql + +do-install: + @${MKDIR} ${STAGEDIR}${WWWDIR} + (cd ${WRKSRC}/ui && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) + +.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix64-java/Makefile b/net-mgmt/zabbix64-java/Makefile new file mode 100644 index 000000000000..307c23eae773 --- /dev/null +++ b/net-mgmt/zabbix64-java/Makefile @@ -0,0 +1,13 @@ +PORTNAME= zabbix64 +PORTREVISION= 0 +CATEGORIES= net-mgmt +PKGNAMESUFFIX= -java + +MASTERDIR= ${.CURDIR}/../${PORTNAME}-server +PLIST= ${PKGDIR}/pkg-plist.java + +OPTIONS_DEFINE= IPV6 + +USE_JAVA= yes + +.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix64-proxy/Makefile b/net-mgmt/zabbix64-proxy/Makefile new file mode 100644 index 000000000000..a17199263748 --- /dev/null +++ b/net-mgmt/zabbix64-proxy/Makefile @@ -0,0 +1,7 @@ +PORTNAME= zabbix64 +CATEGORIES= net-mgmt +PKGNAMESUFFIX= -proxy + +MASTERDIR= ${.CURDIR}/../${PORTNAME}-server + +.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix64-server/Makefile b/net-mgmt/zabbix64-server/Makefile new file mode 100644 index 000000000000..5bd97718187b --- /dev/null +++ b/net-mgmt/zabbix64-server/Makefile @@ -0,0 +1,254 @@ +PORTNAME= zabbix64 +DISTVERSION= 6.4.0 +CATEGORIES= net-mgmt +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ +PKGNAMESUFFIX?= -server +DISTNAME= zabbix-${DISTVERSION} + +MAINTAINER= otis@FreeBSD.org +COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) +WWW= https://www.zabbix.com/ + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +CONFLICTS_INSTALL= zabbix[0-9]*${PKGNAMESUFFIX} + +ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//} + +.if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings +.if ${ZABBIX_BUILD} != "agent" +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 +.endif + +USES= iconv pkgconfig + +USERS= zabbix +GROUPS= zabbix + +.if ${ZABBIX_BUILD} == "proxy" +PLIST_SUB= PROXY="" +.else +PLIST_SUB= PROXY="@comment " +.endif +.if ${ZABBIX_BUILD} == "server" +PLIST_SUB+= SERVER="" +.else +PLIST_SUB+= SERVER="@comment " +.endif + +PLIST_SUB+= DISTVERSION=${DISTVERSION} \ + ZABBIX_BUILD=${ZABBIX_BUILD} +SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} + +MAKE_ARGS+= ARCH=freebsd +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --datadir=${ETCDIR} \ + --enable-${ZABBIX_BUILD} \ + --sysconfdir=${ETCDIR} \ + --with-iconv=${ICONV_PREFIX} + +PORTSCOUT= limit:^6\.4\. + +.if ${ZABBIX_BUILD} != "java" +OPTIONS_DEFAULT+= PCRE2 +OPTIONS_SINGLE+= PCRE +OPTIONS_SINGLE_PCRE= PCRE1 PCRE2 +PCRE_DESC= PCRE library to use +PCRE1_DESC= Use PCRE v1 library +PCRE2_DESC= Use PCRE v2 library + +PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE1_CONFIGURE_WITH= libpcre +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +PCRE2_CONFIGURE_WITH= libpcre2 + +.if ${ZABBIX_BUILD} != "agent" +CPPFLAGS+= -I${LOCALBASE}/include + +SUB_FILES= pkg-message + +OPTIONS_DEFAULT+= CURL FPING 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" +OPTIONS_SINGLE_DB+= SQLITE +.endif +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL +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 +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) +MYSQL_DESC= MySQL 8.0 database support +MYSQLDV_DESC= MYSQL DEFAULT_VERSIONS= (poudriere) + +FPING_RUN_DEPENDS= fping:net/fping + +IPMI_CONFIGURE_WITH= openipmi +IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi + +LDAP_CONFIGURE_WITH= ldap +LDAP_USES= ldap + +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 + +MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config +MDB6_USES+= compiler:c11 mysql:106m +MDB6_DESC= Mariadb 10.6 database support + +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 + +SSH_CONFIGURE_WITH= ssh2 +SSH_LIB_DEPENDS= libssh2.so:security/libssh2 + +UNIXODBC_CONFIGURE_WITH= unixodbc +UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +.elif ${ZABBIX_BUILD} == "agent" +OPTOINS_DEFINE+= PCRE +OPTIONS_SINGLE+= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL +.endif # if ${ZABBIX_BUILD} != "agent" + +CURL_DESC= Support for web monitoring +CURL_CONFIGURE_WITH= libcurl +CURL_LIB_DEPENDS= libcurl.so:ftp/curl + +IPV6_CONFIGURE_ENABLE= ipv6 + +LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} +LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 + +MODBUS_DESC= Support for Modbus checks +MODBUS_CONFIGURE_WITH= libmodbus +MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus + +NMAP_RUN_DEPENDS= nmap:security/nmap \ + sudo:security/sudo + +OPENSSL_CONFIGURE_WITH= openssl +OPENSSL_USES= ssl +OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ + BROKEN_SSL_REASON="PSK is not provided by LibreSSL" + +GNUTLS_CONFIGURE_WITH= gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls + +.endif # if ${ZABBIX_BUILD} != "java" + +.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} == "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 + @${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" + @${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} != "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=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache + +post-install: +.if ${ZABBIX_BUILD} == "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} != "agent" && ${ZABBIX_BUILD} != "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} == "agent" + ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ + ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample +.endif + +.if ${ZABBIX_BUILD} == "proxy" + ${MV} ${STAGEDIR}${LOCALBASE}/bin/zabbix_js \ + ${STAGEDIR}${LOCALBASE}/bin/zabbix_proxy_js +.endif + +.else # frontend +.include +.endif + +.include diff --git a/net-mgmt/zabbix64-server/distinfo b/net-mgmt/zabbix64-server/distinfo new file mode 100644 index 000000000000..26a13541f137 --- /dev/null +++ b/net-mgmt/zabbix64-server/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1678219983 +SHA256 (zabbix-6.4.0.tar.gz) = b1c771da8799bf2802e176adcc1f00ee8083834bf8b8b2cc0323a437fe2c62ce +SIZE (zabbix-6.4.0.tar.gz) = 42787621 diff --git a/net-mgmt/zabbix64-server/files/patch-src_libs_zbxembed_duktape.h b/net-mgmt/zabbix64-server/files/patch-src_libs_zbxembed_duktape.h new file mode 100644 index 000000000000..ff6595a49bb5 --- /dev/null +++ b/net-mgmt/zabbix64-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/zabbix64-server/files/pkg-message.in b/net-mgmt/zabbix64-server/files/pkg-message.in new file mode 100644 index 000000000000..ef1bd1d2558c --- /dev/null +++ b/net-mgmt/zabbix64-server/files/pkg-message.in @@ -0,0 +1,51 @@ +[ +{ type: install + message: < /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/zabbix64-server/files/zabbix_proxy.in b/net-mgmt/zabbix64-server/files/zabbix_proxy.in new file mode 100644 index 000000000000..274c75c29251 --- /dev/null +++ b/net-mgmt/zabbix64-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="zabbix_proxy" +rcvar=zabbix_proxy_enable + +load_rc_config $name + +: ${zabbix_proxy_enable:=NO} +: ${zabbix_proxy_config:=%%ETCDIR%%/${name}.conf} +: ${zabbix_proxy_pidfile:=/var/run/zabbix/zabbix_proxy.pid} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" + +start_cmd=zabbix_proxy_cmd +start_precmd=zabbix_proxy_precmd +status_precmd=zabbix_proxy_precmd +stop_precmd=zabbix_proxy_precmd + +zabbix_proxy_precmd() +{ + pidfile=${zabbix_proxy_pidfile} + if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then + pidfile="$_pidfile_from_conf" + fi + logfile=/var/log/zabbix/zabbix_proxy.log + if get_pidfile_from_conf LogFile ${zabbix_proxy_config}; then + logfile="$_pidfile_from_conf" + fi + local rundir=${pidfile%/*} + local logdir=${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=$(check_pidfile ${pidfile} ${command}) +} + +zabbix_proxy_cmd() +{ + PATH=$zabbix_proxy_paths $command -c $zabbix_proxy_config +} + +run_rc_command "$1" diff --git a/net-mgmt/zabbix64-server/files/zabbix_server.in b/net-mgmt/zabbix64-server/files/zabbix_server.in new file mode 100644 index 000000000000..68e9f052734e --- /dev/null +++ b/net-mgmt/zabbix64-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="zabbix_server" +rcvar=zabbix_server_enable + +load_rc_config $name + +: ${zabbix_server_enable:=NO} +: ${zabbix_server_config:=%%ETCDIR%%/${name}.conf} +: ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid} +: ${zabbix_server_paths:=$PATH} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" + +start_cmd=zabbix_server_cmd +start_precmd=zabbix_server_precmd +status_precmd=zabbix_server_precmd +stop_precmd=zabbix_server_precmd + +zabbix_server_precmd() +{ + pidfile=${zabbix_server_pidfile} + if get_pidfile_from_conf PidFile ${zabbix_server_config}; then + pidfile="$_pidfile_from_conf" + fi + logfile=/var/log/zabbix/zabbix_server.log + if get_pidfile_from_conf LogFile ${zabbix_server_config}; then + logfile="$_pidfile_from_conf" + fi + local rundir=${pidfile%/*} + local logdir=${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=$(check_pidfile ${pidfile} ${command}) +} + +zabbix_server_cmd() +{ + PATH=$zabbix_server_paths $command -c $zabbix_server_config +} + +run_rc_command "$1" diff --git a/net-mgmt/zabbix64-server/pkg-descr b/net-mgmt/zabbix64-server/pkg-descr new file mode 100644 index 000000000000..24dea091d7e0 --- /dev/null +++ b/net-mgmt/zabbix64-server/pkg-descr @@ -0,0 +1,8 @@ +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. diff --git a/net-mgmt/zabbix64-server/pkg-plist b/net-mgmt/zabbix64-server/pkg-plist new file mode 100644 index 000000000000..855b20d2e697 --- /dev/null +++ b/net-mgmt/zabbix64-server/pkg-plist @@ -0,0 +1,39 @@ +%%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/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_log.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_str.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_text.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_uint.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_log.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_str.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_text.sql +%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_uint.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%%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 +sbin/zabbix_%%ZABBIX_BUILD%% +@dir %%ETCDIR%%/zabbix/externalscripts +@dir lib/modules diff --git a/net-mgmt/zabbix64-server/pkg-plist.agent b/net-mgmt/zabbix64-server/pkg-plist.agent new file mode 100644 index 000000000000..e2e36a7e7499 --- /dev/null +++ b/net-mgmt/zabbix64-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/zabbix64-server/pkg-plist.frontend b/net-mgmt/zabbix64-server/pkg-plist.frontend new file mode 100644 index 000000000000..d7346c7081d9 --- /dev/null +++ b/net-mgmt/zabbix64-server/pkg-plist.frontend @@ -0,0 +1,1696 @@ +%%WWWDIR%%/api_jsonrpc.php +%%WWWDIR%%/api_scim.php +%%WWWDIR%%/app/.htaccess +%%WWWDIR%%/app/controllers/CControllerActionConditionCheck.php +%%WWWDIR%%/app/controllers/CControllerActionCreate.php +%%WWWDIR%%/app/controllers/CControllerActionDelete.php +%%WWWDIR%%/app/controllers/CControllerActionDisable.php +%%WWWDIR%%/app/controllers/CControllerActionEnable.php +%%WWWDIR%%/app/controllers/CControllerActionList.php +%%WWWDIR%%/app/controllers/CControllerActionLogList.php +%%WWWDIR%%/app/controllers/CControllerActionOperationCheck.php +%%WWWDIR%%/app/controllers/CControllerActionOperationConditionCheck.php +%%WWWDIR%%/app/controllers/CControllerActionUpdate.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/CControllerConnectorCreate.php +%%WWWDIR%%/app/controllers/CControllerConnectorDelete.php +%%WWWDIR%%/app/controllers/CControllerConnectorDisable.php +%%WWWDIR%%/app/controllers/CControllerConnectorEdit.php +%%WWWDIR%%/app/controllers/CControllerConnectorEnable.php +%%WWWDIR%%/app/controllers/CControllerConnectorList.php +%%WWWDIR%%/app/controllers/CControllerConnectorUpdate.php +%%WWWDIR%%/app/controllers/CControllerCopyCreate.php +%%WWWDIR%%/app/controllers/CControllerCopyEdit.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/CControllerDashboardConfigHash.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/CControllerDashboardWidgetEdit.php +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetRfRate.php +%%WWWDIR%%/app/controllers/CControllerDashboardWidgetView.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/CControllerFavoriteCreate.php +%%WWWDIR%%/app/controllers/CControllerFavoriteDelete.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/CControllerHostGroupCreate.php +%%WWWDIR%%/app/controllers/CControllerHostGroupDelete.php +%%WWWDIR%%/app/controllers/CControllerHostGroupDisable.php +%%WWWDIR%%/app/controllers/CControllerHostGroupEdit.php +%%WWWDIR%%/app/controllers/CControllerHostGroupEnable.php +%%WWWDIR%%/app/controllers/CControllerHostGroupList.php +%%WWWDIR%%/app/controllers/CControllerHostGroupUpdate.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/CControllerItemMassCheckNow.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/CControllerMaintenanceCreate.php +%%WWWDIR%%/app/controllers/CControllerMaintenanceDelete.php +%%WWWDIR%%/app/controllers/CControllerMaintenanceEdit.php +%%WWWDIR%%/app/controllers/CControllerMaintenanceList.php +%%WWWDIR%%/app/controllers/CControllerMaintenanceTimePeriodCheck.php +%%WWWDIR%%/app/controllers/CControllerMaintenanceTimePeriodEdit.php +%%WWWDIR%%/app/controllers/CControllerMaintenanceUpdate.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/CControllerPopupActionConditionEdit.php +%%WWWDIR%%/app/controllers/CControllerPopupActionEdit.php +%%WWWDIR%%/app/controllers/CControllerPopupActionOperationEdit.php +%%WWWDIR%%/app/controllers/CControllerPopupActionOperationsList.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 *** 1563 LINES SKIPPED ***