Bug 183958 - [REPOCOPY] net-mgmt/zabbix2 -> zabbiz22 (server/agent/frontend/proxy)
Summary: [REPOCOPY] net-mgmt/zabbix2 -> zabbiz22 (server/agent/frontend/proxy)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Vanilla I. Shu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-14 17:00 UTC by pg
Modified: 2013-12-19 09:30 UTC (History)
0 users

See Also:


Attachments
file.diff (20.38 KB, patch)
2013-11-14 17:00 UTC, pg
no flags Details | Diff
patch_zabbix22_1.txt (22.66 KB, text/plain; charset=US-ASCII)
2013-12-04 13:04 UTC, pg
no flags Details
patch_zabbix22_2.txt (22.44 KB, text/plain; charset=US-ASCII)
2013-12-04 14:15 UTC, pg
no flags Details
patch_zabbix221.txt (20.13 KB, text/plain; charset=UTF-8)
2013-12-19 07:55 UTC, pg
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description pg 2013-11-14 17:00:00 UTC
A new version 2.2 of Zabbix has been released.
Please set maintainer to me

Fix: Patch attached with submission follows:
Comment 1 Vanilla I. Shu freebsd_committer freebsd_triage 2013-11-21 03:18:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->vanilla

I will handle this one.
Comment 2 ari 2013-11-26 10:56:14 UTC
Please don't make a new port we have to migrate to, and then change all the paths to all config files and scripts. The upgrade to 2.2 is really not a big one. Having to manually migrate configurations for zabbix agents on hundreds of machines is a huge pain.

Ari Maniatis
Comment 3 pg 2013-11-26 13:31:12 UTC
All versions since 2.0.0 officially supported for 5 years. For example,
2.0.10 very soon.


2013/11/26 Aristedes Maniatis <ari@ish.com.au>

> Please don't make a new port we have to migrate to, and then change all
> the paths to all config files and scripts. The upgrade to 2.2 is really not
> a big one. Having to manually migrate configurations for zabbix agents on
> hundreds of machines is a huge pain.
>
> Ari Maniatis
>
Comment 4 ari 2013-11-27 03:46:57 UTC
My concern was that splitting the port into lots of different versions doesn't really help and it creates a lot of work during the upgrade process. All the folders in /usr/local/etc/zabbix-* have to be renamed, rc.conf configuration changed and much more.

If you really think that FreeBSD users are going to care about 2.0.10 (if it is ever released), then perhaps you could make a "zabbix20" and keep "zabbix" as the name for the current release (whatever that is), allowing people to continue to upgrade without pain.

I do look forward to upgrading to Zabbix 2.2 though. It looks like a nice incremental improvement, with better FreeBSD support. I wonder if we'll get first class ZFS support one day?
Comment 5 pg 2013-12-19 07:55:03 UTC
Update to 2.2.1
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-12-19 09:20:10 UTC
Author: vanilla
Date: Thu Dec 19 09:20:01 2013
New Revision: 336884
URL: http://svnweb.freebsd.org/changeset/ports/336884

Log:
  Add zabbix22-*
  
  PR:		ports/183958
  Submitted by:	Pakhom Golynga (origin zabbix2-* maintainer)

Added:
  head/net-mgmt/zabbix22-agent/
     - copied from r336883, head/net-mgmt/zabbix2-agent/
  head/net-mgmt/zabbix22-frontend/
     - copied from r336883, head/net-mgmt/zabbix2-frontend/
  head/net-mgmt/zabbix22-proxy/
     - copied from r336883, head/net-mgmt/zabbix2-proxy/
  head/net-mgmt/zabbix22-server/
     - copied from r336883, head/net-mgmt/zabbix2-server/
Modified:
  head/net-mgmt/Makefile
  head/net-mgmt/zabbix22-agent/Makefile
  head/net-mgmt/zabbix22-frontend/Makefile
  head/net-mgmt/zabbix22-proxy/Makefile
  head/net-mgmt/zabbix22-server/Makefile
  head/net-mgmt/zabbix22-server/distinfo
  head/net-mgmt/zabbix22-server/files/pkg-message.in
  head/net-mgmt/zabbix22-server/pkg-plist
  head/net-mgmt/zabbix22-server/pkg-plist.frontend

Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/Makefile	Thu Dec 19 09:20:01 2013	(r336884)
@@ -331,6 +331,10 @@
     SUBDIR += zabbix2-frontend
     SUBDIR += zabbix2-proxy
     SUBDIR += zabbix2-server
+    SUBDIR += zabbix22-agent
+    SUBDIR += zabbix22-frontend
+    SUBDIR += zabbix22-proxy
+    SUBDIR += zabbix22-server
     SUBDIR += zenoss
     SUBDIR += zenpack-checkping
     SUBDIR += zenpack-dellmon

Modified: head/net-mgmt/zabbix22-agent/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-agent/Makefile	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-agent/Makefile	Thu Dec 19 09:20:01 2013	(r336884)
@@ -1,11 +1,11 @@
-# Created by: Sergey Akifyev <asa@gascom.ru>
+# Created by: Pakhom Golynga <pakhom706@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	zabbix2
+PORTNAME=	zabbix22
 PKGNAMESUFFIX=	-agent
 CATEGORIES=	net-mgmt
 
-MASTERDIR=	${.CURDIR}/../zabbix2-server
+MASTERDIR=	${.CURDIR}/../zabbix22-server
 
 PLIST=		${PKGDIR}/pkg-plist.agent
 

Modified: head/net-mgmt/zabbix22-frontend/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-frontend/Makefile	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-frontend/Makefile	Thu Dec 19 09:20:01 2013	(r336884)
@@ -1,11 +1,11 @@
 # Created by: Jim Riggs <ports@christianserving.org>
 # $FreeBSD$
 
-PORTNAME=	zabbix2
+PORTNAME=	zabbix22
 PKGNAMESUFFIX=	-frontend
 CATEGORIES=	net-mgmt
 
-MASTERDIR=	${.CURDIR}/../zabbix2-server
+MASTERDIR=	${.CURDIR}/../zabbix22-server
 
 NO_BUILD=	yes
 PATCHDIR=
@@ -41,7 +41,7 @@ USE_PHP+=	sqlite3
 
 .if ${PORT_OPTIONS:MORACLE}
 ZABBIX_REQUIRE=
-CONFIGURE_ARGS+=	--with-oracle
+CONFIGURE_ARGS+=        --with-oracle
 .endif
 
 do-install:

Modified: head/net-mgmt/zabbix22-proxy/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-proxy/Makefile	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-proxy/Makefile	Thu Dec 19 09:20:01 2013	(r336884)
@@ -1,10 +1,10 @@
-# Created by: Jim Riggs <ports@christianserving.org>
+# Created by: Pakhom Golynga <pakhom706@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	zabbix2
+PORTNAME=	zabbix22
 PKGNAMESUFFIX=	-proxy
 
-MASTERDIR=	${.CURDIR}/../zabbix2-server
+MASTERDIR=	${.CURDIR}/../zabbix22-server
 
 NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/net-mgmt/zabbix22-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-server/Makefile	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-server/Makefile	Thu Dec 19 09:20:01 2013	(r336884)
@@ -1,8 +1,8 @@
-# Created by: Jim Riggs <ports@christianserving.org>
+# Created by: Pakhom Golynga <pakhom706@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	zabbix2
-PORTVERSION=	2.0.10
+PORTNAME=	zabbix22
+PORTVERSION=	2.2.1
 PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -16,7 +16,8 @@ LICENSE=	GPLv2
 
 CONFLICTS=	${PKGBASE}-1.[0-8]*
 
-IGNORE_WITH_MYSQL=	41
+IGNORE_WITH_PHP=	5 52
+IGNORE_WITH_MYSQL=      41
 
 .if ${PKGNAMESUFFIX} != "-agent"
 CONFLICTS+=	${PORTNAME}-1.[0-8]*
@@ -112,7 +113,7 @@ CONFIGURE_ARGS+=	--with-sqlite3
 
 .if ${PORT_OPTIONS:MORACLE}
 ZABBIX_REQUIRE=
-CONFIGURE_ARGS+=	--with-oracle
+CONFIGURE_ARGS+=        --with-oracle
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
@@ -183,9 +184,9 @@ post-patch:
 .endif
 .for d in mysql oracle postgresql sqlite3
 	@${REINPLACE_CMD} -e 's|/bin/ping|/sbin/ping|g; \
-			      s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \
-			      s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \
-			      ${WRKSRC}/database/${d}/data.sql
+	                      s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \
+	                      s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \
+	                      ${WRKSRC}/database/${d}/data.sql
 .endfor
 .endif
 	@${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \

Modified: head/net-mgmt/zabbix22-server/distinfo
==============================================================================
--- head/net-mgmt/zabbix2-server/distinfo	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-server/distinfo	Thu Dec 19 09:20:01 2013	(r336884)
@@ -1,2 +1,2 @@
-SHA256 (zabbix-2.0.10.tar.gz) = 71415b5da223c6c0ba2f1c21c3c03cad9a5be0c8986791d7031c014986a9065d
-SIZE (zabbix-2.0.10.tar.gz) = 13671284
+SHA256 (zabbix-2.2.1.tar.gz) = 29c9e4cefb527bf929797b26a5a1d8a07c55675bfe6a86ff9ef8e46bd792c7fb
+SIZE (zabbix-2.2.1.tar.gz) = 14426358

Modified: head/net-mgmt/zabbix22-server/files/pkg-message.in
==============================================================================
--- head/net-mgmt/zabbix2-server/files/pkg-message.in	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-server/files/pkg-message.in	Thu Dec 19 09:20:01 2013	(r336884)
@@ -32,11 +32,19 @@ shell> db2batch -d zabbix -f schema.sql
 shell> db2batch -d zabbix -f images.sql
 shell> db2batch -d zabbix -f data.sql
 
+Upgrade notes for 2.2.0
+
+    Minimum supported PHP version changed from 5.1.6 to 5.3.0
+    Minimum supported MySQL version changed from 5.0.0 to 5.0.3
+    Accepted data limit when using Zabbix protocol was changed from 128MB to 64MB.
+
+New upgrade procedure
+There are no upgrade SQL scripts anymore - database upgrade is performed by the Zabbix server. 
 
 To upgrade an existing database, see the scripts in
-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades.
+Upgrade notes for 2.2.0 https://www.zabbix.com/documentation/2.2/manual/installation/upgrade_notes_220
 
-Please see http://www.zabbix.com/documentation/2.0/manual/installation/install for installation instructions.
+Please see https://www.zabbix.com/documentation/2.2/manual/installation for installation instructions.
 
 For use NMAP please edit sudoers
 ======================================================================

Modified: head/net-mgmt/zabbix22-server/pkg-plist
==============================================================================
--- head/net-mgmt/zabbix2-server/pkg-plist	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-server/pkg-plist	Thu Dec 19 09:20:01 2013	(r336884)
@@ -15,6 +15,7 @@ sbin/zabbix_%%ZABBIX_BUILD%%
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/data.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.2/README
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2/patch.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2/rc4_rc5.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql/rc4_rc5.sql
@@ -44,6 +45,7 @@ sbin/zabbix_%%ZABBIX_BUILD%%
 %%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib
 %%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/bin
 %%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%
+@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.2
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle

Modified: head/net-mgmt/zabbix22-server/pkg-plist.frontend
==============================================================================
--- head/net-mgmt/zabbix2-server/pkg-plist.frontend	Thu Dec 19 08:01:24 2013	(r336883)
+++ head/net-mgmt/zabbix22-server/pkg-plist.frontend	Thu Dec 19 09:20:01 2013	(r336884)
@@ -1,6 +1,7 @@
 %%WWWDIR%%/auditacts.php
 %%WWWDIR%%/jsrpc.php
 %%WWWDIR%%/dashboard.php
+%%WWWDIR%%/host_prototypes.php
 %%WWWDIR%%/audio/alarm_ok.wav
 %%WWWDIR%%/audio/no_sound.wav
 %%WWWDIR%%/audio/alarm_information.wav
@@ -19,7 +20,6 @@
 %%WWWDIR%%/report5.php
 %%WWWDIR%%/report2.php
 %%WWWDIR%%/popup_bitem.php
-%%WWWDIR%%/warning.php
 %%WWWDIR%%/hostinventoriesoverview.php
 %%WWWDIR%%/discovery.php
 %%WWWDIR%%/hosts.php
@@ -36,6 +36,7 @@
 %%WWWDIR%%/include/profiles.inc.php
 %%WWWDIR%%/include/locales.inc.php
 %%WWWDIR%%/include/translateDefines.inc.php
+%%WWWDIR%%/include/draw.inc.php
 %%WWWDIR%%/include/views/administration.general.image.edit.php
 %%WWWDIR%%/include/views/administration.general.regularexpressions.list.php
 %%WWWDIR%%/include/views/monitoring.discovery.php
@@ -96,13 +97,21 @@
 %%WWWDIR%%/include/views/administration.general.housekeeper.edit.php
 %%WWWDIR%%/include/views/configuration.slideconf.list.php
 %%WWWDIR%%/include/views/configuration.screen.edit.php
+%%WWWDIR%%/include/views/configuration.host.prototype.edit.php
+%%WWWDIR%%/include/views/configuration.host.prototype.list.php
+%%WWWDIR%%/include/views/configuration.sysmap.constructor.php
+%%WWWDIR%%/include/views/configuration.sysmap.list.php
+%%WWWDIR%%/include/views/general.warning.php
+%%WWWDIR%%/include/views/inventory.host.list.php
+%%WWWDIR%%/include/views/inventory.host.view.php
+%%WWWDIR%%/include/views/monitoring.dashconf.php
+%%WWWDIR%%/include/views/monitoring.triggerComment.php
 %%WWWDIR%%/include/views/js/configuration.slideconf.edit.js.php
 %%WWWDIR%%/include/views/js/configuration.discovery.edit.js.php
 %%WWWDIR%%/include/views/js/administration.general.valuemapping.edit.js.php
 %%WWWDIR%%/include/views/js/administration.general.gui.php
 %%WWWDIR%%/include/views/js/administration.script.edit.js.php
 %%WWWDIR%%/include/views/js/administration.general.triggerDisplayOptions.js.php
-%%WWWDIR%%/include/views/js/configuration.host.edit.macros.js.php
 %%WWWDIR%%/include/views/js/configuration.action.edit.js.php
 %%WWWDIR%%/include/views/js/administration.general.iconmap.js.php
 %%WWWDIR%%/include/views/js/administration.users.edit.js.php
@@ -110,11 +119,9 @@
 %%WWWDIR%%/include/views/js/configuration.host.edit.js.php
 %%WWWDIR%%/include/views/js/configuration.httpconf.edit.js.php
 %%WWWDIR%%/include/views/js/configuration.graph.edit.js.php
-%%WWWDIR%%/include/views/js/general.script.confirm.js.php
 %%WWWDIR%%/include/views/js/configuration.triggers.expression.js.php
 %%WWWDIR%%/include/views/js/configuration.item.edit.js.php
 %%WWWDIR%%/include/views/js/configuration.sysmap.edit.js.php
-%%WWWDIR%%/include/views/js/setup.js.php
 %%WWWDIR%%/include/views/js/common.macros.js.php
 %%WWWDIR%%/include/views/js/configuration.triggers.edit.js.php
 %%WWWDIR%%/include/views/js/configuration.services.list.js.php
@@ -123,7 +130,12 @@
 %%WWWDIR%%/include/views/js/configuration.sysmaps.js.php
 %%WWWDIR%%/include/views/js/configuration.services.edit.js.php
 %%WWWDIR%%/include/views/js/monitoring.history.js.php
-%%WWWDIR%%/include/views/js/monitoring.maps.js.php
+%%WWWDIR%%/include/views/js/adm.regexprs.edit.js.php
+%%WWWDIR%%/include/views/js/administration.general.housekeeper.edit.js.php
+%%WWWDIR%%/include/views/js/configuration.host.prototype.edit.js.php
+%%WWWDIR%%/include/views/js/configuration.item.list.js.php
+%%WWWDIR%%/include/views/js/monitoring.latest.js.php
+%%WWWDIR%%/include/views/js/monitoring.triggerComment.js.php
 %%WWWDIR%%/include/views/administration.usergroups.edit.php
 %%WWWDIR%%/include/views/administration.authentication.edit.php
 %%WWWDIR%%/include/views/configuration.item.copy.php
@@ -154,9 +166,12 @@
 %%WWWDIR%%/include/actions.inc.php
 %%WWWDIR%%/include/perm.inc.php
 %%WWWDIR%%/include/hosts.inc.php
-%%WWWDIR%%/include/classes/class.cchart.php
 %%WWWDIR%%/include/classes/class.cview.php
 %%WWWDIR%%/include/classes/class.ctextbox.php
+%%WWWDIR%%/include/classes/graphdraw/CBarGraphDraw.php
+%%WWWDIR%%/include/classes/graphdraw/CGraphDraw.php
+%%WWWDIR%%/include/classes/graphdraw/CLineGraphDraw.php
+%%WWWDIR%%/include/classes/graphdraw/CPieGraphDraw.php
 %%WWWDIR%%/include/classes/import/formatters/C20ImportFormatter.php
 %%WWWDIR%%/include/classes/import/formatters/CImportFormatter.php
 %%WWWDIR%%/include/classes/import/CXmlImport18.php
@@ -198,6 +213,7 @@
 %%WWWDIR%%/include/classes/api/APIException.php
 %%WWWDIR%%/include/classes/api/CAPIObject.php
 %%WWWDIR%%/include/classes/api/CZBXAPI.php
+%%WWWDIR%%/include/classes/api/CRelationMap.php
 %%WWWDIR%%/include/classes/class.cwidget.php
 %%WWWDIR%%/include/classes/class.crow.php
 %%WWWDIR%%/include/classes/class.cbuttondelete.php
@@ -215,6 +231,9 @@
 %%WWWDIR%%/include/classes/core/CAutoloader.php
 %%WWWDIR%%/include/classes/core/ZBase.php
 %%WWWDIR%%/include/classes/core/CSession.php
+%%WWWDIR%%/include/classes/core/CFactoryRegistry.php
+%%WWWDIR%%/include/classes/core/ConfigFileException.php
+%%WWWDIR%%/include/classes/core/Manager.php
 %%WWWDIR%%/include/classes/class.cpagefilter.php
 %%WWWDIR%%/include/classes/class.ctabview.php
 %%WWWDIR%%/include/classes/class.cwarning.php
@@ -224,7 +243,6 @@
 %%WWWDIR%%/include/classes/class.clist.php
 %%WWWDIR%%/include/classes/class.ccheckbox.php
 %%WWWDIR%%/include/classes/class.globalregexp.php
-%%WWWDIR%%/include/classes/class.cgraphdraw.php
 %%WWWDIR%%/include/classes/class.clistbox.php
 %%WWWDIR%%/include/classes/class.chostsinfo.php
 %%WWWDIR%%/include/classes/class.ccolorcell.php
@@ -242,14 +260,18 @@
 %%WWWDIR%%/include/classes/class.cinput.php
 %%WWWDIR%%/include/classes/class.cwebuser.php
 %%WWWDIR%%/include/classes/class.cjsscript.php
-%%WWWDIR%%/include/classes/class.cpie.php
 %%WWWDIR%%/include/classes/class.cradiobuttonlist.php
 %%WWWDIR%%/include/classes/class.curl.php
 %%WWWDIR%%/include/classes/class.cform.php
 %%WWWDIR%%/include/classes/class.cbuttoncancel.php
 %%WWWDIR%%/include/classes/db/DB.php
 %%WWWDIR%%/include/classes/db/DBException.php
-%%WWWDIR%%/include/classes/class.cpumenu.php
+%%WWWDIR%%/include/classes/db/Db2DbBackend.php
+%%WWWDIR%%/include/classes/db/DbBackend.php
+%%WWWDIR%%/include/classes/db/MysqlDbBackend.php
+%%WWWDIR%%/include/classes/db/OracleDbBackend.php
+%%WWWDIR%%/include/classes/db/PostgresqlDbBackend.php
+%%WWWDIR%%/include/classes/db/SqliteDbBackend.php
 %%WWWDIR%%/include/classes/class.ccolor.php
 %%WWWDIR%%/include/classes/class.cradiobutton.php
 %%WWWDIR%%/include/classes/class.ajaxresponse.php
@@ -257,10 +279,6 @@
 %%WWWDIR%%/include/classes/class.ctableinfo.php
 %%WWWDIR%%/include/classes/class.cdiv.php
 %%WWWDIR%%/include/classes/class.cflashembed.php
-%%WWWDIR%%/include/classes/helpers/trigger/CTriggerHelper.php
-%%WWWDIR%%/include/classes/helpers/trigger/CTriggerDescription.php
-%%WWWDIR%%/include/classes/helpers/trigger/CEventHelper.php
-%%WWWDIR%%/include/classes/helpers/trigger/CEventDescription.php
 %%WWWDIR%%/include/classes/helpers/CJs.php
 %%WWWDIR%%/include/classes/helpers/CUploadFile.php
 %%WWWDIR%%/include/classes/helpers/CHtml.php
@@ -268,7 +286,20 @@
 %%WWWDIR%%/include/classes/validators/CValidator.php
 %%WWWDIR%%/include/classes/validators/CTimePeriodValidator.php
 %%WWWDIR%%/include/classes/validators/CTriggerFunctionValidator.php
-%%WWWDIR%%/include/classes/class.cbar.php
+%%WWWDIR%%/include/classes/validators/CCollectionValidator.php
+%%WWWDIR%%/include/classes/validators/CColorValidator.php
+%%WWWDIR%%/include/classes/validators/CIdValidator.php
+%%WWWDIR%%/include/classes/validators/CLdapAuthValidator.php
+%%WWWDIR%%/include/classes/validators/CPartialValidatorInterface.php
+%%WWWDIR%%/include/classes/validators/CSetValidator.php
+%%WWWDIR%%/include/classes/validators/schema/CPartialSchemaValidator.php
+%%WWWDIR%%/include/classes/validators/schema/CSchemaValidator.php
+%%WWWDIR%%/include/classes/validators/hostgroup/CHostGroupNormalValidator.php
+%%WWWDIR%%/include/classes/validators/event/CEventSourceObjectValidator.php
+%%WWWDIR%%/include/classes/validators/host/CHostNormalValidator.php
+%%WWWDIR%%/include/classes/validators/string/CStringValidator.php
+%%WWWDIR%%/include/classes/validators/string/CLldMacroStringValidator.php
+%%WWWDIR%%/include/classes/validators/object/CUpdateDiscoveredValidator.php
 %%WWWDIR%%/include/classes/class.cimagetexttable.php
 %%WWWDIR%%/include/classes/class.cpassbox.php
 %%WWWDIR%%/include/classes/class.cfile.php
@@ -296,7 +327,17 @@
 %%WWWDIR%%/include/classes/screens/CScreenTriggersInfo.php
 %%WWWDIR%%/include/classes/screens/CScreenTriggersOverview.php
 %%WWWDIR%%/include/classes/screens/CScreenUrl.php
+%%WWWDIR%%/include/classes/server/CZabbixServer.php
 %%WWWDIR%%/include/classes/parsers/CTriggerExpression.php
+%%WWWDIR%%/include/classes/html/CButtonPopup.php
+%%WWWDIR%%/include/classes/html/CPageHeader.php
+%%WWWDIR%%/include/classes/items/CHelpItems.php
+%%WWWDIR%%/include/classes/macros/CMacrosResolver.php
+%%WWWDIR%%/include/classes/macros/CMacrosResolverHelper.php
+%%WWWDIR%%/include/classes/class.cfavorite.php
+%%WWWDIR%%/include/classes/class.cmultiselect.php
+%%WWWDIR%%/include/classes/class.cseverity.php
+%%WWWDIR%%/include/classes/class.cstringparser.php
 %%WWWDIR%%/include/sounds.inc.php
 %%WWWDIR%%/include/ident.inc.php
 %%WWWDIR%%/include/regexp.inc.php
@@ -390,7 +431,6 @@
 %%WWWDIR%%/api/classes/CApplication.php
 %%WWWDIR%%/api/classes/CUserGroup.php
 %%WWWDIR%%/api/classes/CDiscoveryRule.php
-%%WWWDIR%%/api/classes/CWebCheck.php
 %%WWWDIR%%/api/classes/CDHost.php
 %%WWWDIR%%/api/classes/CUser.php
 %%WWWDIR%%/api/classes/CIconMap.php
@@ -401,6 +441,12 @@
 %%WWWDIR%%/api/classes/CTemplate.php
 %%WWWDIR%%/api/classes/CHostGeneral.php
 %%WWWDIR%%/api/classes/CTemplateScreenItem.php
+%%WWWDIR%%/api/classes/CHostBase.php
+%%WWWDIR%%/api/classes/CHostPrototype.php
+%%WWWDIR%%/api/classes/CHttpTest.php
+%%WWWDIR%%/api/classes/managers/CApplicationManager.php
+%%WWWDIR%%/api/classes/managers/CHistoryManager.php
+%%WWWDIR%%/api/classes/managers/CHttpTestManager.php
 %%WWWDIR%%/api/.htaccess
 %%WWWDIR%%/triggers.php
 %%WWWDIR%%/slideconf.php
@@ -447,11 +493,10 @@
 %%WWWDIR%%/images/gradients/menu_not_active2.gif
 %%WWWDIR%%/images/gradients/gradient.png
 %%WWWDIR%%/images/gradients/menu_not_active_blue.png
-%%WWWDIR%%/images/gradients/blink.gif
 %%WWWDIR%%/images/gradients/table_head_bb.gif
-%%WWWDIR%%/images/gradients/texture_diagonal.gif
 %%WWWDIR%%/images/gradients/sla_green.png
 %%WWWDIR%%/images/gradients/menu_not_active_bb.gif
+%%WWWDIR%%/images/general/multiselect.png
 %%WWWDIR%%/images/general/ipmi_unknown.png
 %%WWWDIR%%/images/general/jmx_unknown.png
 %%WWWDIR%%/images/general/ipmi_available.png
@@ -510,7 +555,6 @@
 %%WWWDIR%%/images/general/zabbix_bb.ico
 %%WWWDIR%%/images/general/setup/welcome_screen.png
 %%WWWDIR%%/images/general/setup/background.png
-%%WWWDIR%%/images/general/setup/logo.png
 %%WWWDIR%%/images/general/zabbix_unknown.png
 %%WWWDIR%%/images/general/chart.png
 %%WWWDIR%%/images/general/dbl_arrow_up2.png
@@ -519,7 +563,7 @@
 %%WWWDIR%%/images/general/jmx_unavailable.png
 %%WWWDIR%%/images/general/login/logo.png
 %%WWWDIR%%/images/general/login/background.png
-%%WWWDIR%%/images/general/login/username_pass_field.png
+%%WWWDIR%%/images/general/login/glow.png
 %%WWWDIR%%/images/general/ipmi_available_bb.png
 %%WWWDIR%%/images/general/unknown_icon.png
 %%WWWDIR%%/images/general/zabbix.ico
@@ -559,7 +603,6 @@
 %%WWWDIR%%/images/general/wrench12transp.png
 %%WWWDIR%%/images/general/zero.png
 %%WWWDIR%%/chart7.php
-%%WWWDIR%%/css.css
 %%WWWDIR%%/applications.php
 %%WWWDIR%%/scripts_exec.php
 %%WWWDIR%%/screens.php
@@ -683,6 +726,8 @@
 %%WWWDIR%%/js/common.js
 %%WWWDIR%%/js/class.cdebug.js
 %%WWWDIR%%/js/servercheck.js
+%%WWWDIR%%/js/menupopup.js
+%%WWWDIR%%/js/multiselect.js
 %%WWWDIR%%/js/vendors/activity-indicator.js
 %%WWWDIR%%/popup_trexpr.php
 %%WWWDIR%%/chart2.php
@@ -696,6 +741,8 @@
 %%WWWDIR%%/styles/handheld.css
 %%WWWDIR%%/styles/default.css
 %%WWWDIR%%/styles/icon.css
+%%WWWDIR%%/styles/pages.css
+%%WWWDIR%%/styles/print.css
 %%WWWDIR%%/styles/themes/classic/jquery-ui.css
 %%WWWDIR%%/styles/themes/classic/main.css
 %%WWWDIR%%/styles/themes/classic/images/icons_469bdd.png
@@ -772,6 +819,7 @@
 @dirrm %%WWWDIR%%/audio
 @dirrm %%WWWDIR%%/include/views/js
 @dirrm %%WWWDIR%%/include/views
+@dirrm %%WWWDIR%%/include/classes/graphdraw/
 @dirrm %%WWWDIR%%/include/classes/import/formatters
 @dirrm %%WWWDIR%%/include/classes/import/readers
 @dirrm %%WWWDIR%%/include/classes/import/importers
@@ -784,14 +832,24 @@
 @dirrm %%WWWDIR%%/include/classes/core
 @dirrm %%WWWDIR%%/include/classes/sysmaps
 @dirrm %%WWWDIR%%/include/classes/db
-@dirrm %%WWWDIR%%/include/classes/helpers/trigger
 @dirrm %%WWWDIR%%/include/classes/helpers
 @dirrm %%WWWDIR%%/include/classes/screens
 @dirrm %%WWWDIR%%/include/classes/parsers
-@dirrm %%WWWDIR%%/include/classes/validators
+@dirrm %%WWWDIR%%/include/classes/html
+@dirrm %%WWWDIR%%/include/classes/items
+@dirrm %%WWWDIR%%/include/classes/macros
+@dirrm %%WWWDIR%%/include/classes/server
+@dirrm %%WWWDIR%%/include/classes/validators/schema
+@dirrm %%WWWDIR%%/include/classes/validators/hostgroup
+@dirrm %%WWWDIR%%/include/classes/validators/event
+@dirrm %%WWWDIR%%/include/classes/validators/host
+@dirrm %%WWWDIR%%/include/classes/validators/string
+@dirrm %%WWWDIR%%/include/classes/validators/object
+@dirrm %%WWWDIR%%/include/classes/validators/
 @dirrm %%WWWDIR%%/include/classes
 @dirrm %%WWWDIR%%/include
 @dirrm %%WWWDIR%%/api/rpc
+@dirrm %%WWWDIR%%/api/classes/managers
 @dirrm %%WWWDIR%%/api/classes
 @dirrm %%WWWDIR%%/api
 @dirrm %%WWWDIR%%/images/sysmaps/old
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Vanilla I. Shu freebsd_committer freebsd_triage 2013-12-19 09:20:31 UTC
State Changed
From-To: open->closed

Committed, thanks.