Hello,
here is a diff for updating net/zabbix to the latest version 1.8.3.
After startup the server log showed a lot of errors
Expression [...] cannot be evaluated: Evaluation failed for function: [...]
which has also been reported in the forum
http://zabbix.com/forum/showthread.php?t=18819
It does not look like an OpenBSD-port-specific problem to me and the
errors went away after the items received there first update.
Hope this helps
Florian
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 12 Jul 2010 22:07:42 -0000 1.25
+++ Makefile 19 Aug 2010 17:28:18 -0000
@@ -4,11 +4,11 @@
COMMENT-server = network and application monitoring - server
COMMENT-web = network and application monitoring - web frontend
-VERSION = 1.8.2
+VERSION = 1.8.3
DISTNAME = zabbix-${VERSION}
-REVISION-main = 3
-REVISION-server = 2
-REVISION-web = 2
+REVISION-main = 0
+REVISION-server = 0
+REVISION-web = 0
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
PKGNAME-server = zabbix-server-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 9 Apr 2010 10:17:59 -0000 1.4
+++ distinfo 19 Aug 2010 17:28:18 -0000
@@ -1,5 +1,5 @@
-MD5 (zabbix-1.8.2.tar.gz) = +kvk+nrCCjPMCqXCe4J3Rg==
-RMD160 (zabbix-1.8.2.tar.gz) = YzO7TGdkIpVqYMAcruPGfJwF3eI=
-SHA1 (zabbix-1.8.2.tar.gz) = WVc+/f/kgfHg0CD051tnDaqDfe0=
-SHA256 (zabbix-1.8.2.tar.gz) = uh0ARUVRwcbw0nD3Zxi2nOn1TEJ+Iqy1oTzLyeYh/YE=
-SIZE (zabbix-1.8.2.tar.gz) = 3706540
+MD5 (zabbix-1.8.3.tar.gz) = V1wxiA1z9v5B5zCHTr/GMw==
+RMD160 (zabbix-1.8.3.tar.gz) = 8NVMHNiGXJUpRajsOVjn692aktU=
+SHA1 (zabbix-1.8.3.tar.gz) = aPXR8SiXvGnG/13uorrYKwwfV2E=
+SHA256 (zabbix-1.8.3.tar.gz) = NyYtdRyWYaNhOAvxSA0nfYFiHYpJxgqBZny+JYAhBlw=
+SIZE (zabbix-1.8.3.tar.gz) = 4106152
Index: patches/patch-misc_conf_zabbix_proxy_conf
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-misc_conf_zabbix_proxy_conf,v
retrieving revision 1.4
diff -u -r1.4 patch-misc_conf_zabbix_proxy_conf
--- patches/patch-misc_conf_zabbix_proxy_conf 9 Apr 2010 10:17:59 -0000 1.4
+++ patches/patch-misc_conf_zabbix_proxy_conf 19 Aug 2010 17:28:18 -0000
@@ -1,16 +1,7 @@
-$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.4 2010/04/09 10:17:59 ajacoutot Exp $
---- misc/conf/zabbix_proxy.conf.orig Mon Mar 29 19:22:44 2010
-+++ misc/conf/zabbix_proxy.conf Fri Apr 9 10:23:05 2010
-@@ -55,8 +55,6 @@ Server=127.0.0.1
- # Default:
- # LogFile=
-
--LogFile=/tmp/zabbix_proxy.log
--
- ### Option: LogFileSize
- # Maximum size of log file in MB.
- # 0 - disable automatic log rotation.
-@@ -85,6 +83,7 @@ LogFile=/tmp/zabbix_proxy.log
+$OpenBSD$
+--- misc/conf/zabbix_proxy.conf.orig Thu Aug 19 16:33:48 2010
++++ misc/conf/zabbix_proxy.conf Thu Aug 19 16:36:24 2010
+@@ -96,6 +96,7 @@ LogFile=/tmp/zabbix_proxy.log
# Mandatory: no
# Default:
# PidFile=/tmp/zabbix_proxy.pid
@@ -18,7 +9,7 @@
### Option: DBHost
# Database host name.
-@@ -110,7 +109,7 @@ DBName=zabbix
+@@ -121,7 +122,7 @@ DBName=zabbix
# Default:
# DBUser=
@@ -27,7 +18,7 @@
### Option: DBPassword
# Database password. Ignored for SQLite.
-@@ -126,6 +125,7 @@ DBUser=root
+@@ -137,6 +138,7 @@ DBUser=root
# Mandatory: no
# Default:
# DBSocket=/tmp/mysql.sock
@@ -35,7 +26,7 @@
# Option: DBPort
# Database port when not using local socket. Ignored for SQLite.
-@@ -359,6 +359,7 @@ DBUser=root
+@@ -372,6 +374,7 @@ DBUser=root
# Mandatory: no
# Default:
# ExternalScripts=/etc/zabbix/externalscripts
@@ -43,7 +34,7 @@
### Option: FpingLocation
# Location of fping.
-@@ -367,6 +368,7 @@ DBUser=root
+@@ -380,6 +383,7 @@ DBUser=root
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@@ -51,11 +42,11 @@
### Option: Fping6Location
# Location of fping6.
-@@ -376,6 +378,7 @@ DBUser=root
+@@ -389,6 +393,7 @@ DBUser=root
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
-+FpingLocation=${LOCALBASE}/sbin/fping6
++Fping6Location=${LOCALBASE}/sbin/fping6
### Option: SSHKeyLocation
# Location of public keys for SSH checks
Index: patches/patch-misc_conf_zabbix_server_conf
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-misc_conf_zabbix_server_conf,v
retrieving revision 1.4
diff -u -r1.4 patch-misc_conf_zabbix_server_conf
--- patches/patch-misc_conf_zabbix_server_conf 9 Apr 2010 10:17:59 -0000 1.4
+++ patches/patch-misc_conf_zabbix_server_conf 19 Aug 2010 17:28:18 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.4 2010/04/09 10:17:59 ajacoutot Exp $
---- misc/conf/zabbix_server.conf.orig Mon Mar 29 19:22:44 2010
-+++ misc/conf/zabbix_server.conf Fri Apr 9 10:23:05 2010
+$OpenBSD$
+--- misc/conf/zabbix_server.conf.orig Thu Aug 19 16:37:36 2010
++++ misc/conf/zabbix_server.conf Thu Aug 19 16:40:20 2010
@@ -36,8 +36,6 @@
# Default:
# LogFile=
@@ -35,7 +35,7 @@
### Option: DBPort
# Database port when not using local socket. Ignored for SQLite.
-@@ -335,6 +335,7 @@ DBUser=root
+@@ -334,6 +334,7 @@ DBUser=root
# Mandatory: no
# Default:
# AlertScriptsPath=/home/zabbix/bin/
@@ -43,7 +43,7 @@
### Option: ExternalScripts
# Location of external scripts
-@@ -342,6 +343,7 @@ DBUser=root
+@@ -341,6 +342,7 @@ DBUser=root
# Mandatory: no
# Default:
# ExternalScripts=/etc/zabbix/externalscripts
@@ -51,7 +51,7 @@
### Option: FpingLocation
# Location of fping.
-@@ -350,6 +352,7 @@ DBUser=root
+@@ -349,6 +351,7 @@ DBUser=root
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@@ -59,11 +59,11 @@
### Option: Fping6Location
# Location of fping6.
-@@ -359,6 +362,7 @@ DBUser=root
+@@ -358,6 +361,7 @@ DBUser=root
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
-+FpingLocation=${LOCALBASE}/sbin/fping6
++Fping6Location=${LOCALBASE}/sbin/fping6
### Option: SSHKeyLocation
# Location of public keys for SSH checks
Index: patches/patch-src_libs_zbxnix_daemon_c
===================================================================
RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_libs_zbxnix_daemon_c
--- patches/patch-src_libs_zbxnix_daemon_c 11 Jan 2010 18:30:01 -0000 1.3
+++ patches/patch-src_libs_zbxnix_daemon_c 19 Aug 2010 17:28:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.3 2010/01/11 18:30:01 jasper Exp $
---- src/libs/zbxnix/daemon.c.orig Thu Dec 24 00:00:51 2009
-+++ src/libs/zbxnix/daemon.c Thu Dec 24 00:01:05 2009
-@@ -91,7 +91,7 @@ int daemon_start(int allow_root)
+$OpenBSD$
+--- src/libs/zbxnix/daemon.c.orig Thu Aug 19 16:43:41 2010
++++ src/libs/zbxnix/daemon.c Thu Aug 19 16:44:01 2010
+@@ -138,7 +138,7 @@ int daemon_start(int allow_root)
pid_t pid;
struct passwd *pwd;
struct sigaction phan;
Index: pkg/PLIST-web
===================================================================
RCS file: /cvs/ports/net/zabbix/pkg/PLIST-web,v
retrieving revision 1.9
diff -u -r1.9 PLIST-web
--- pkg/PLIST-web 9 Apr 2010 10:17:59 -0000 1.9
+++ pkg/PLIST-web 19 Aug 2010 17:28:18 -0000
@@ -15,15 +15,21 @@
zabbix/api/classes/class.calert.php
zabbix/api/classes/class.capiinfo.php
zabbix/api/classes/class.capplication.php
+zabbix/api/classes/class.cdcheck.php
+zabbix/api/classes/class.cdhost.php
+zabbix/api/classes/class.cdrule.php
+zabbix/api/classes/class.cdservice.php
zabbix/api/classes/class.cevent.php
zabbix/api/classes/class.cgraph.php
zabbix/api/classes/class.cgraphitem.php
+zabbix/api/classes/class.chistory.php
zabbix/api/classes/class.chost.php
zabbix/api/classes/class.chostgroup.php
zabbix/api/classes/class.cimage.php
zabbix/api/classes/class.citem.php
zabbix/api/classes/class.cmaintenance.php
zabbix/api/classes/class.cmap.php
+zabbix/api/classes/class.cmediatype.php
zabbix/api/classes/class.cproxy.php
zabbix/api/classes/class.cscreen.php
zabbix/api/classes/class.cscript.php
@@ -39,12 +45,13 @@
zabbix/api_jsonrpc.php
zabbix/applications.php
zabbix/audio/
-zabbix/audio/trigger_off.wav
-zabbix/audio/trigger_on.wav
-zabbix/audio/trigger_on_average.wav
-zabbix/audio/trigger_on_disaster.wav
-zabbix/audio/trigger_on_high.wav
-zabbix/audio/trigger_on_warning.wav
+zabbix/audio/alarm_average.wav
+zabbix/audio/alarm_disaster.wav
+zabbix/audio/alarm_high.wav
+zabbix/audio/alarm_information.wav
+zabbix/audio/alarm_ok.wav
+zabbix/audio/alarm_warning.wav
+zabbix/audio/no_sound.wav
zabbix/auditacts.php
zabbix/auditlogs.php
zabbix/authentication.php
@@ -72,7 +79,6 @@
zabbix/discovery.php
zabbix/discoveryconf.php
zabbix/events.php
-zabbix/export.php
zabbix/fonts/
zabbix/fonts/DejaVuSans.ttf
zabbix/graphs.php
@@ -104,37 +110,24 @@
zabbix/images/general/bar/right_arr.png
zabbix/images/general/bttn/
zabbix/images/general/bttn/arrowdown.png
-zabbix/images/general/bttn/arrowdown_bb.png
zabbix/images/general/bttn/arrowleft.png
-zabbix/images/general/bttn/arrowleft_bb.png
zabbix/images/general/bttn/arrowright.png
-zabbix/images/general/bttn/arrowright_bb.png
zabbix/images/general/bttn/arrowup.png
-zabbix/images/general/bttn/arrowup_bb.png
+zabbix/images/general/bttn/close.png
zabbix/images/general/bttn/config.png
-zabbix/images/general/bttn/config_bb.png
zabbix/images/general/bttn/config_hl.png
-zabbix/images/general/bttn/config_hl_bb.png
zabbix/images/general/bttn/down.png
-zabbix/images/general/bttn/down_bb.png
zabbix/images/general/bttn/fullscreen.png
-zabbix/images/general/bttn/fullscreen_bb.png
zabbix/images/general/bttn/help.png
-zabbix/images/general/bttn/help_bb.png
zabbix/images/general/bttn/menu.png
-zabbix/images/general/bttn/menu_bb.png
zabbix/images/general/bttn/minus.png
-zabbix/images/general/bttn/minus_bb.png
+zabbix/images/general/bttn/move.png
zabbix/images/general/bttn/mute.png
-zabbix/images/general/bttn/mute_bb.png
zabbix/images/general/bttn/plus.png
-zabbix/images/general/bttn/plus_bb.png
zabbix/images/general/bttn/reset.png
-zabbix/images/general/bttn/reset_bb.png
+zabbix/images/general/bttn/snooze.png
zabbix/images/general/bttn/sound.png
-zabbix/images/general/bttn/sound_bb.png
zabbix/images/general/bttn/up.png
-zabbix/images/general/bttn/up_bb.png
zabbix/images/general/chart.png
zabbix/images/general/closed.gif
zabbix/images/general/dbl_arrow_down.png
@@ -163,16 +156,10 @@
zabbix/images/general/snmp_available_bb.png
zabbix/images/general/snmp_unavailable.png
zabbix/images/general/snmp_unknown.png
-zabbix/images/general/sort_down.png
-zabbix/images/general/sort_down_bb.png
-zabbix/images/general/sort_downw.gif
-zabbix/images/general/sort_up.png
-zabbix/images/general/sort_up_bb.png
-zabbix/images/general/sort_upw.gif
-zabbix/images/general/sortdown.gif
-zabbix/images/general/sortdown_off.gif
-zabbix/images/general/sortup.gif
-zabbix/images/general/sortup_off.gif
+zabbix/images/general/sort_down.gif
+zabbix/images/general/sort_down_od.gif
+zabbix/images/general/sort_up.gif
+zabbix/images/general/sort_up_od.gif
zabbix/images/general/tick.png
zabbix/images/general/tr_space.gif
zabbix/images/general/tr_top_bottom.gif
@@ -188,6 +175,7 @@
zabbix/images/general/up_icon.png
zabbix/images/general/warning16r.gif
zabbix/images/general/warning_small.gif
+zabbix/images/general/x.gif
zabbix/images/general/zabbix.ico
zabbix/images/general/zabbix.png
zabbix/images/general/zabbix_available.png
@@ -195,6 +183,7 @@
zabbix/images/general/zabbix_bb.ico
zabbix/images/general/zabbix_bb.png
zabbix/images/general/zabbix_ob.ico
+zabbix/images/general/zabbix_od.png
zabbix/images/general/zabbix_unavailable.png
zabbix/images/general/zabbix_unknown.png
zabbix/images/general/zero.gif
@@ -246,12 +235,10 @@
zabbix/images/sysmaps/old/Server.png
zabbix/images/sysmaps/old/Workstation.png
zabbix/imgstore.php
-zabbix/import.php
zabbix/include/
zabbix/include/.htaccess
zabbix/include/acknow.inc.php
zabbix/include/actions.inc.php
-zabbix/include/apicalls.inc.php
zabbix/include/audit.inc.php
zabbix/include/blocks.inc.php
zabbix/include/classes/
@@ -277,11 +264,13 @@
zabbix/include/classes/class.cflashclock.php
zabbix/include/classes/class.cflashembed.php
zabbix/include/classes/class.cform.php
+zabbix/include/classes/class.cformelement.php
zabbix/include/classes/class.cformtable.php
zabbix/include/classes/class.cgraphdraw.php
zabbix/include/classes/class.chelp.php
zabbix/include/classes/class.chostsinfo.php
zabbix/include/classes/class.chttp_request.php
+zabbix/include/classes/class.cicon.php
zabbix/include/classes/class.ciframe.php
zabbix/include/classes/class.cimagetexttable.php
zabbix/include/classes/class.cimg.php
@@ -295,6 +284,7 @@
zabbix/include/classes/class.clistitem.php
zabbix/include/classes/class.cnumericbox.php
zabbix/include/classes/class.cobject.php
+zabbix/include/classes/class.cpagefilter.php
zabbix/include/classes/class.cparam.php
zabbix/include/classes/class.cpassbox.php
zabbix/include/classes/class.cpie.php
@@ -302,6 +292,7 @@
zabbix/include/classes/class.crow.php
zabbix/include/classes/class.cserverinfo.php
zabbix/include/classes/class.cspan.php
+zabbix/include/classes/class.cstringparser.php
zabbix/include/classes/class.ctable.php
zabbix/include/classes/class.ctableinfo.php
zabbix/include/classes/class.ctag.php
@@ -336,6 +327,7 @@
zabbix/include/locales/
zabbix/include/locales.inc.php
zabbix/include/locales/cn_zh.inc.php
+zabbix/include/locales/cs_cz.inc.php
zabbix/include/locales/de_de.inc.php
zabbix/include/locales/en_gb.inc.php
zabbix/include/locales/fr_fr.inc.php
@@ -363,40 +355,52 @@
zabbix/include/regexp.inc.php
zabbix/include/reports.inc.php
zabbix/include/requirements.inc.php
+zabbix/include/schema.inc.php
zabbix/include/screens.inc.php
zabbix/include/scripts.inc.php
zabbix/include/services.inc.php
zabbix/include/setup.inc.php
+zabbix/include/sounds.inc.php
zabbix/include/triggers.inc.php
zabbix/include/users.inc.php
zabbix/include/validate.inc.php
+zabbix/include/valuemap.inc.php
zabbix/index.php
zabbix/instal.php
zabbix/items.php
zabbix/js/
+zabbix/js/class.bbcode.js
zabbix/js/class.calendar.js
zabbix/js/class.cdate.js
+zabbix/js/class.cdebug.js
zabbix/js/class.cmap.js
+zabbix/js/class.cmessages.js
zabbix/js/class.cookie.js
zabbix/js/class.cscreen.js
+zabbix/js/class.csuggest.js
zabbix/js/class.cswitcher.js
zabbix/js/class.ctree.js
zabbix/js/class.curl.js
+zabbix/js/class.cviewswitcher.js
zabbix/js/class.pmaster.js
+zabbix/js/class.rpc.js
zabbix/js/common.js
+zabbix/js/dom.js
zabbix/js/functions.js
zabbix/js/gtlc.js
+zabbix/js/ie6fix.js
zabbix/js/main.js
zabbix/js/menu.js
zabbix/js/prototype.js
zabbix/js/scriptaculous/
-zabbix/js/scriptaculous.js
zabbix/js/scriptaculous/builder.js
zabbix/js/scriptaculous/controls.js
zabbix/js/scriptaculous/dragdrop.js
zabbix/js/scriptaculous/effects.js
zabbix/js/scriptaculous/slider.js
zabbix/js/scriptaculous/sound.js
+zabbix/jsLoader.php
+zabbix/jsrpc.php
zabbix/latest.php
zabbix/locales.php
zabbix/maintenance.php
@@ -434,6 +438,7 @@
zabbix/services.php
zabbix/services_form.php
zabbix/setup.php
+zabbix/slideconf.php
zabbix/slides.php
zabbix/srv_status.php
zabbix/styles/
@@ -441,9 +446,12 @@
zabbix/styles/calendar.css
zabbix/styles/css_bb.css
zabbix/styles/css_ob.css
+zabbix/styles/css_od.css
zabbix/styles/default.css
zabbix/styles/div.css
zabbix/styles/form.css
+zabbix/styles/ie.css
+zabbix/styles/ie_css_od.css
zabbix/styles/link.css
zabbix/styles/p.css
zabbix/styles/popupmenu.css
