Date: Wed, 12 Dec 2012 12:18:27 GMT From: Pakhom Golynga <pakhom706@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174390: net-mgmt/zabbix2-server: update to 2.0.4 Message-ID: <201212121218.qBCCIRDh090798@red.freebsd.org> Resent-Message-ID: <201212121220.qBCCK0tW061821@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174390
>Category: ports
>Synopsis: net-mgmt/zabbix2-server: update to 2.0.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 12 12:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Pakhom Golynga
>Release: 9.0-RELEASE
>Organization:
>Environment:
>Description:
- Update to 2.0.4
- add support for Java gateway
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --exclude=CVS -urN zabbix2-server.orig/Makefile zabbix2-server/Makefile
--- zabbix2-server.orig/Makefile 2012-10-11 11:18:47.488797000 +0400
+++ zabbix2-server/Makefile 2012-12-12 16:10:45.369292332 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= zabbix2
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
PORTREVISION= 0
CATEGORIES= net-mgmt
MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -67,7 +67,7 @@
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
-OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC
+OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW
OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL LDAP
CURL_DESC= Support for web monitoring
@@ -78,6 +78,7 @@
NMAP_DESC= Build/install nmap for o/s detection
SSH_DESC= Support for SSH-based checks
ODBC_DESC= Support for database checks via ODBC
+JAVAGW_DESC= Support for Java gateway
IODBC_DESC= Use iODBC for ODBC support
UNIXODBC_DESC= Use UnixODBC for ODBC support
@@ -154,6 +155,16 @@
sudo:${PORTSDIR}/security/sudo
.endif
+.if ${PORT_OPTIONS:MJAVAGW}
+USE_JAVA= yes
+CONFIGURE_ARGS+= --enable-java
+PLIST_SUB+= ZABBIX_JAVA="sbin/zabbix_java"
+PLIST_SUB+= JAVAGW=""
+.else
+PLIST_SUB+= JAVAGW="@comment "
+.endif
+
+
post-patch:
@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
| ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
diff --exclude=CVS -urN zabbix2-server.orig/distinfo zabbix2-server/distinfo
--- zabbix2-server.orig/distinfo 2012-10-11 11:33:44.431780000 +0400
+++ zabbix2-server/distinfo 2012-12-12 11:36:40.971292721 +0400
@@ -1,2 +1,2 @@
-SHA256 (zabbix-2.0.3.tar.gz) = b6febeab76e6af3efdc124bce1bb51a30651babcf41f2d22fe428ff69ab3f764
-SIZE (zabbix-2.0.3.tar.gz) = 12329606
+SHA256 (zabbix-2.0.4.tar.gz) = 7554223a927229b6317d211d413826fb0b2a974f460a9db9075b376a241a0051
+SIZE (zabbix-2.0.4.tar.gz) = 13045480
diff --exclude=CVS -urN zabbix2-server.orig/pkg-plist zabbix2-server/pkg-plist
--- zabbix2-server.orig/pkg-plist 2012-10-11 11:06:59.910786000 +0400
+++ zabbix2-server/pkg-plist 2012-12-12 16:06:02.025290492 +0400
@@ -31,6 +31,19 @@
%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
+%%JAVAGW%%%%ZABBIX_JAVA%%/shutdown.sh
+%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-console.xml
+%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-core-0.9.27.jar
+%%JAVAGW%%%%ZABBIX_JAVA%%/lib/org-json-2010-12-28.jar
+%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-classic-0.9.27.jar
+%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback.xml
+%%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar
+%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh
+%%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh
+%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-2.0.4.jar
+%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib
+%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/bin
+%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%
@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
diff --exclude=CVS -urN zabbix2-server.orig/pkg-plist.frontend zabbix2-server/pkg-plist.frontend
--- zabbix2-server.orig/pkg-plist.frontend 2012-10-11 12:27:30.567786000 +0400
+++ zabbix2-server/pkg-plist.frontend 2012-12-12 12:15:44.815291560 +0400
@@ -214,7 +214,6 @@
%%WWWDIR%%/include/classes/core/CAutoloader.php
%%WWWDIR%%/include/classes/core/ZBase.php
%%WWWDIR%%/include/classes/core/CSession.php
-%%WWWDIR%%/include/classes/class.cstringparser.php
%%WWWDIR%%/include/classes/class.cpagefilter.php
%%WWWDIR%%/include/classes/class.ctabview.php
%%WWWDIR%%/include/classes/class.cwarning.php
@@ -267,6 +266,7 @@
%%WWWDIR%%/include/classes/helpers/CArrayHelper.php
%%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/class.cimagetexttable.php
%%WWWDIR%%/include/classes/class.cpassbox.php
@@ -295,6 +295,7 @@
%%WWWDIR%%/include/classes/screens/CScreenTriggersInfo.php
%%WWWDIR%%/include/classes/screens/CScreenTriggersOverview.php
%%WWWDIR%%/include/classes/screens/CScreenUrl.php
+%%WWWDIR%%/include/classes/parsers/CTriggerExpression.php
%%WWWDIR%%/include/sounds.inc.php
%%WWWDIR%%/include/ident.inc.php
%%WWWDIR%%/include/regexp.inc.php
@@ -335,7 +336,6 @@
%%WWWDIR%%/authentication.php
%%WWWDIR%%/adm.images.php
%%WWWDIR%%/report3.php
-%%WWWDIR%%/vtext.php
%%WWWDIR%%/report4.php
%%WWWDIR%%/overview.php
%%WWWDIR%%/tr_events.php
@@ -366,7 +366,6 @@
%%WWWDIR%%/api/classes/CItemPrototype.php
%%WWWDIR%%/api/classes/CMaintenance.php
%%WWWDIR%%/api/classes/CItemGeneral.php
-%%WWWDIR%%/api/classes/CTriggerExpression.php
%%WWWDIR%%/api/classes/CGraph.php
%%WWWDIR%%/api/classes/CGraphGeneral.php
%%WWWDIR%%/api/classes/CTrigger.php
@@ -456,6 +455,10 @@
%%WWWDIR%%/images/general/jmx_unknown.png
%%WWWDIR%%/images/general/ipmi_available.png
%%WWWDIR%%/images/general/transparent.png
+%%WWWDIR%%/images/general/tr_space.gif
+%%WWWDIR%%/images/general/tr_top_bottom.gif
+%%WWWDIR%%/images/general/tr_top_right.gif
+%%WWWDIR%%/images/general/tr_top_right_bottom.gif
%%WWWDIR%%/images/general/ok_icon_bb.png
%%WWWDIR%%/images/general/zabbix.png
%%WWWDIR%%/images/general/dbl_arrow_up.png
@@ -590,6 +593,8 @@
%%WWWDIR%%/locale/hu/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/pt_BR/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/pt_BR/LC_MESSAGES/frontend.mo
+%%WWWDIR%%/locale/pt_PT/LC_MESSAGES/frontend.po
+%%WWWDIR%%/locale/pt_PT/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/pl/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/pl/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/update_po.sh
@@ -598,6 +603,10 @@
%%WWWDIR%%/locale/README
%%WWWDIR%%/locale/cs/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/cs/LC_MESSAGES/frontend.po
+%%WWWDIR%%/locale/fa/LC_MESSAGES/frontend.po
+%%WWWDIR%%/locale/fa/LC_MESSAGES/frontend.mo
+%%WWWDIR%%/locale/fi/LC_MESSAGES/frontend.po
+%%WWWDIR%%/locale/fi/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/fr/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/fr/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/nl/LC_MESSAGES/frontend.po
@@ -623,6 +632,8 @@
%%WWWDIR%%/locale/zh_CN/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/ru/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/ru/LC_MESSAGES/frontend.mo
+%%WWWDIR%%/locale/id/LC_MESSAGES/frontend.po
+%%WWWDIR%%/locale/id/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/it/LC_MESSAGES/frontend.po
%%WWWDIR%%/locale/it/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/tr/LC_MESSAGES/frontend.mo
@@ -631,7 +642,6 @@
%%WWWDIR%%/locale/sk/LC_MESSAGES/frontend.mo
%%WWWDIR%%/locale/add_new_language.sh
%%WWWDIR%%/conf/zabbix.conf.php.example
-%%WWWDIR%%/conf/COPYING
%%WWWDIR%%/conf/maintenance.inc.php
%%WWWDIR%%/conf/.htaccess
%%WWWDIR%%/users.php
@@ -666,6 +676,7 @@
%%WWWDIR%%/js/common.js
%%WWWDIR%%/js/class.cdebug.js
%%WWWDIR%%/js/servercheck.js
+%%WWWDIR%%/js/vendors/activity-indicator.js
%%WWWDIR%%/popup_trexpr.php
%%WWWDIR%%/chart2.php
%%WWWDIR%%/items.php
@@ -751,7 +762,6 @@
%%WWWDIR%%/tr_logform.php
%%WWWDIR%%/auditlogs.php
%%WWWDIR%%/report6.php
-%%WWWDIR%%/adm.triggerdisplayingoptions.php
@dirrm %%WWWDIR%%/audio
@dirrm %%WWWDIR%%/include/views/js
@dirrm %%WWWDIR%%/include/views
@@ -767,10 +777,11 @@
@dirrm %%WWWDIR%%/include/classes/core
@dirrm %%WWWDIR%%/include/classes/sysmaps
@dirrm %%WWWDIR%%/include/classes/db
-@dirrm %%WWWDIR%%/include/classes/validators
@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
@dirrm %%WWWDIR%%/include
@dirrm %%WWWDIR%%/api/rpc
@@ -792,12 +803,18 @@
@dirrm %%WWWDIR%%/locale/hu
@dirrm %%WWWDIR%%/locale/pt_BR/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/pt_BR
+@dirrm %%WWWDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%WWWDIR%%/locale/pt_PT
@dirrm %%WWWDIR%%/locale/pl/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/pl
@dirrm %%WWWDIR%%/locale/es/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/es
@dirrm %%WWWDIR%%/locale/cs/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/cs
+@dirrm %%WWWDIR%%/locale/fa/LC_MESSAGES
+@dirrm %%WWWDIR%%/locale/fa
+@dirrm %%WWWDIR%%/locale/fi/LC_MESSAGES
+@dirrm %%WWWDIR%%/locale/fi
@dirrm %%WWWDIR%%/locale/fr/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/fr
@dirrm %%WWWDIR%%/locale/nl/LC_MESSAGES
@@ -822,6 +839,8 @@
@dirrm %%WWWDIR%%/locale/zh_CN
@dirrm %%WWWDIR%%/locale/ru/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/ru
+@dirrm %%WWWDIR%%/locale/id/LC_MESSAGES
+@dirrm %%WWWDIR%%/locale/id
@dirrm %%WWWDIR%%/locale/it/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/it
@dirrm %%WWWDIR%%/locale/tr/LC_MESSAGES
@@ -833,6 +852,7 @@
@dirrm %%WWWDIR%%/locale
@dirrm %%WWWDIR%%/conf
@dirrm %%WWWDIR%%/js/jquery
+@dirrm %%WWWDIR%%/js/vendors
@dirrm %%WWWDIR%%/js
@dirrm %%WWWDIR%%/fonts
@dirrm %%WWWDIR%%/styles/themes/classic/images
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212121218.qBCCIRDh090798>