- update zabbix to 1.8

- remove -doc subpackage, the documentation is still available online

look good to sthen@
This commit is contained in:
jasper 2010-01-11 18:30:01 +00:00
parent 01f2b094a8
commit b00f0a97ab
13 changed files with 173 additions and 214 deletions

View File

@ -1,36 +1,28 @@
# $OpenBSD: Makefile,v 1.13 2009/10/02 14:09:10 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2010/01/11 18:30:01 jasper Exp $
COMMENT-main = network and application monitoring - agent
COMMENT-server = network and application monitoring - server
COMMENT-web = network and application monitoring - web frontend
COMMENT-doc = network and application monitoring - non-free documentation
VERSION = 1.6.5
VERSION = 1.8
MAJOR = ${VERSION:R}
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}p0
PKGNAME-server = zabbix-server-${VERSION}p0
FULLPKGNAME-doc = zabbix-doc-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
PKGNAME-server = zabbix-server-${VERSION}
PKGNAME-web = zabbix-web-${VERSION}
CATEGORIES = net
HOMEPAGE = http://www.zabbix.com/
# GPLv2
# Manual: - free for translation, if original content stays the same
# - printed copies for personal use allowed
# - all other uses need to be agreed upon with Zabbix Company
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =includes non-free documentation
PERMIT_DISTFILES_FTP = includes non-free documentation
PERMIT_PACKAGE_CDROM-doc = non-free documentation
PERMIT_PACKAGE_FTP-doc = non-free documentation
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=zabbix/}
MULTI_PACKAGES = -main -doc
MULTI_PACKAGES = -main
PSEUDO_FLAVORS = no_server
FLAVORS = mysql pgsql
@ -39,9 +31,6 @@ SUBST_VARS += PREFIX-web ZABBIX_WEB MAJOR
WANTLIB = c kvm m
LIB_DEPENDS = lber,ldap::databases/openldap
LIB_DEPENDS-doc =
WANTLIB-doc =
LIB_DEPENDS-server = ${LIB_DEPENDS} \
curl::net/curl \
netsnmp::net/net-snmp \
@ -102,8 +91,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zabbix
${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
${PREFIX}/share/doc/zabbix/README.OpenBSD
${INSTALL_DATA} "${WRKBUILD}/docs/ZABBIX Manual v1.6 rev 17.pdf" \
${PREFIX}/share/doc/zabbix/ZABBIX_Manual_v1.6_rev17.pdf
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/conf/
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX-web}/conf/modules.sample
${SUBST_CMD} -c ${FILESDIR}/zabbix.conf \

View File

@ -1,5 +1,5 @@
MD5 (zabbix-1.6.5.tar.gz) = 2MPaurz8C7z3N6KxPMozfA==
RMD160 (zabbix-1.6.5.tar.gz) = UDwRWcfz2nokZQ3VUpbPBdO4hjY=
SHA1 (zabbix-1.6.5.tar.gz) = tKIkzZA3kRweaHmaE1GIlt5nXT0=
SHA256 (zabbix-1.6.5.tar.gz) = FoDdYloUDJfqlF94w+YU3+W0ImHguk/PXJsneHBxajs=
SIZE (zabbix-1.6.5.tar.gz) = 8246218
MD5 (zabbix-1.8.tar.gz) = BmFTcTwF+HO0NE5OoeBl6Q==
RMD160 (zabbix-1.8.tar.gz) = HroarLdXm/VgBX/pzB1me/Nqxgg=
SHA1 (zabbix-1.8.tar.gz) = +oJyG3RcyqhMM2AvQBbEBXtSRbM=
SHA256 (zabbix-1.8.tar.gz) = Z0PwHycRbq17SJJ6wYRwi7kgVByI5jYC/h8rdAGGbuw=
SIZE (zabbix-1.8.tar.gz) = 3549582

View File

@ -1,18 +1,21 @@
$OpenBSD: patch-misc_conf_zabbix_agentd_conf,v 1.2 2009/08/24 12:28:48 jasper Exp $
--- misc/conf/zabbix_agentd.conf.orig Tue Jun 16 15:12:36 2009
+++ misc/conf/zabbix_agentd.conf Mon Aug 24 14:12:01 2009
@@ -67,12 +67,12 @@ DebugLevel=3
# Name of PID file
-PidFile=/var/tmp/zabbix_agentd.pid
$OpenBSD: patch-misc_conf_zabbix_agentd_conf,v 1.3 2010/01/11 18:30:01 jasper Exp $
--- misc/conf/zabbix_agentd.conf.orig Wed Dec 23 23:55:23 2009
+++ misc/conf/zabbix_agentd.conf Wed Dec 23 23:55:58 2009
@@ -9,6 +9,7 @@
# Mandatory: no
# Default:
# PidFile=/tmp/zabbix_agentd.pid
+PidFile=/var/run/zabbix/zabbix_agentd.pid
# Name of log file.
# If not set, syslog will be used
### Option: LogFile
# Name of log file.
@@ -17,8 +18,7 @@
# Mandatory: no
# Default:
# LogFile=
-
-LogFile=/tmp/zabbix_agentd.log
+#LogFile=/tmp/zabbix_agentd.log
+# LogFile=/tmp/zabbix_agentd.log
# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
#LogFileSize=1
### Option: LogFileSize
# Maximum size of log file in MB.

View File

@ -1,53 +1,61 @@
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.2 2009/07/12 19:51:51 ajacoutot Exp $
--- misc/conf/zabbix_proxy.conf.orig Fri Apr 3 16:44:06 2009
+++ misc/conf/zabbix_proxy.conf Thu Jul 2 10:00:27 2009
@@ -123,28 +123,28 @@ Timeout=5
#UnavailableDelay=60
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.3 2010/01/11 18:30:01 jasper Exp $
--- misc/conf/zabbix_proxy.conf.orig Wed Dec 23 23:56:09 2009
+++ misc/conf/zabbix_proxy.conf Wed Dec 23 23:57:56 2009
@@ -55,8 +55,6 @@ Server=127.0.0.1
# Default:
# LogFile=
# Name of PID file
-PidFile=/var/tmp/zabbix_proxy.pid
-LogFile=/tmp/zabbix_proxy.log
-
### Option: LogFileSize
# Maximum size of log file in MB.
# 0 - disable automatic log rotation.
@@ -83,6 +81,7 @@ LogFile=/tmp/zabbix_proxy.log
# Mandatory: no
# Default:
# PidFile=/tmp/zabbix_proxy.pid
+PidFile=/var/run/zabbix/zabbix_proxy.pid
# Name of log file
# If not set, syslog is used
-LogFile=/tmp/zabbix_proxy.log
+#LogFile=/tmp/zabbix_proxy.log
# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
#LogFileSize=1
# Location for custom alert scripts
-AlertScriptsPath=/home/zabbix/bin/
+AlertScriptsPath=${SYSCONFDIR}/zabbix/scripts/
# Location of external scripts
-#ExternalScripts=/etc/zabbix/externalscripts
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
# Location of 'fping. Default is /usr/sbin/fping
# Make sure that fping binary has root permissions and SUID flag set
-#FpingLocation=/usr/sbin/fping
+FpingLocation=${LOCALBASE}/sbin/fping
# Location of fping6. Default is /usr/sbin/fping6
# Make sure that fping binary has root permissions and SUID flag set
-#Fping6Location=/usr/sbin/fping6
+Fping6Location=${LOCALBASE}/sbin/fping6
# Temporary directory. Default is /tmp
#TmpDir=/tmp
@@ -163,7 +163,7 @@ DBName=proxy
# Database user
### Option: DBHost
# Database host name.
@@ -108,7 +107,7 @@ DBName=zabbix
# Default:
# DBUser=
-DBUser=root
+DBUser=zabbix
# Database password
# Comment this line if no password used
@@ -172,4 +172,4 @@ DBUser=root
# Connect to MySQL using Unix socket?
-#DBSocket=/tmp/mysql.sock
### Option: DBPassword
# Database password. Ignored for SQLite.
@@ -124,6 +123,7 @@ DBUser=root
# Mandatory: no
# Default:
# DBSocket=/tmp/mysql.sock
+DBSocket=/var/www/var/run/mysql/mysql.sock
# Option: DBPort
# Database port when not using local socket. Ignored for SQLite.
@@ -357,6 +357,7 @@ DBUser=root
# Mandatory: no
# Default:
# ExternalScripts=/etc/zabbix/externalscripts
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
### Option: FpingLocation
# Location of fping.
@@ -365,6 +366,7 @@ DBUser=root
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
+FpingLocation=${LOCALBASE}/sbin/fping
### Option: Fping6Location
# Location of fping6.
@@ -373,6 +375,7 @@ DBUser=root
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
+FpingLocation=${LOCALBASE}/sbin/fping6
### Option: SSHKeyLocation
# Location of public keys for SSH checks

View File

@ -1,54 +1,69 @@
$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.2 2009/07/12 19:51:51 ajacoutot Exp $
--- misc/conf/zabbix_server.conf.orig Fri Apr 3 16:44:06 2009
+++ misc/conf/zabbix_server.conf Thu Jul 2 10:07:49 2009
@@ -99,29 +99,29 @@ Timeout=5
# Name of PID file
-PidFile=/var/tmp/zabbix_server.pid
+PidFile=/var/run/zabbix/zabbix_server.pid
# Name of log file
# If not set, syslog is used
$OpenBSD: patch-misc_conf_zabbix_server_conf,v 1.3 2010/01/11 18:30:01 jasper Exp $
--- misc/conf/zabbix_server.conf.orig Wed Dec 23 23:58:05 2009
+++ misc/conf/zabbix_server.conf Wed Dec 23 23:59:44 2009
@@ -35,8 +35,6 @@
# Default:
# LogFile=
-LogFile=/tmp/zabbix_server.log
+#LogFile=/tmp/zabbix_server.log
-
### Option: LogFileSize
# Maximum size of log file in MB.
# 0 - disable automatic log rotation.
@@ -63,6 +61,7 @@ LogFile=/tmp/zabbix_server.log
# Mandatory: no
# Default:
# PidFile=/tmp/zabbix_server.pid
+PidFile=/var/run/zabbix/zabbix_server.pid
# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
#LogFileSize=1
# Location for custom alert scripts
-AlertScriptsPath=/home/zabbix/bin/
+AlertScriptsPath=${SYSCONFDIR}/zabbix/scripts/
# Location of external scripts
-#ExternalScripts=/etc/zabbix/externalscripts
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
# Location of fping. Default is /usr/sbin/fping
# Make sure that fping binary has root permissions and SUID flag set
-#FpingLocation=/usr/sbin/fping
+FpingLocation=${LOCALBASE}/sbin/fping
# Location of fping6. Default is /usr/sbin/fping6
# Make sure that fping binary has root permissions and SUID flag set
-#Fping6Location=/usr/sbin/fping6
+Fping6Location=${LOCALBASE}/sbin/fping6
# Temporary directory. Default is /tmp
#TmpDir=/tmp
@@ -140,7 +140,7 @@ DBName=zabbix
# Database user
### Option: DBHost
# Database host name.
@@ -88,7 +87,7 @@ DBName=zabbix
# Default:
# DBUser=
-DBUser=root
+DBUser=zabbix
# Database password
# Comment this line if no password used
@@ -149,4 +149,4 @@ DBUser=root
# Connect to MySQL using Unix socket?
-#DBSocket=/tmp/mysql.sock
### Option: DBPassword
# Database password. Ignored for SQLite.
@@ -104,6 +103,7 @@ DBUser=root
# Mandatory: no
# Default:
# DBSocket=/tmp/mysql.sock
+DBSocket=/var/www/var/run/mysql/mysql.sock
### Option: DBPort
# Database port when not using local socket. Ignored for SQLite.
@@ -316,6 +316,7 @@ DBUser=root
# Mandatory: no
# Default:
# AlertScriptsPath=/home/zabbix/bin/
+AlertScriptsPath=${SYSCONFDIR}/zabbix/scripts/
### Option: ExternalScripts
# Location of external scripts
@@ -323,6 +324,7 @@ DBUser=root
# Mandatory: no
# Default:
# ExternalScripts=/etc/zabbix/externalscripts
+ExternalScripts=${SYSCONFDIR}/zabbix/externalscripts
### Option: FpingLocation
# Location of fping.
@@ -331,6 +333,7 @@ DBUser=root
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
+FpingLocation=${LOCALBASE}/sbin/fping
### Option: Fping6Location
# Location of fping6.
@@ -339,6 +342,7 @@ DBUser=root
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6
+FpingLocation=${LOCALBASE}/sbin/fping6
### Option: SSHKeyLocation
# Location of public keys for SSH checks

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-misc_conf_zabbix_trapper_conf,v 1.2 2009/07/12 19:51:51 ajacoutot Exp $
--- misc/conf/zabbix_trapper.conf.orig Fri Apr 3 16:44:06 2009
+++ misc/conf/zabbix_trapper.conf Thu Jul 2 10:00:43 2009
@@ -19,7 +19,7 @@ Timeout=3
# Name of log file
# If not set, syslog will be used
-LogFile=/tmp/zabbix_trapper.log
+#LogFile=/tmp/zabbix_trapper.log
# Database host name
# Default is localhost
@@ -32,7 +32,7 @@ DBName=zabbix
# Database user
-DBUser=root
+DBUser=zabbix
# Database password
# Comment this line if no password used
@@ -41,4 +41,4 @@ DBUser=root
# Connect to MySQL usig Unix socket?
-#DBSocket=/tmp/mysql.sock
+DBSocket=/var/www/var/run/mysql/mysql.sock

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.2 2009/04/26 20:56:50 jasper Exp $
--- src/libs/zbxnix/daemon.c.orig Wed Apr 22 23:04:10 2009
+++ src/libs/zbxnix/daemon.c Wed Apr 22 23:04:22 2009
@@ -90,7 +90,7 @@ int daemon_start(int allow_root)
pid_t pid;
$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)
pid_t pid;
struct passwd *pwd;
struct sigaction phan;
- char user[7] = "zabbix";

View File

@ -1,32 +1,12 @@
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_diskspace_c,v 1.1 2009/04/23 15:38:11 jasper Exp $
--- src/libs/zbxsysinfo/openbsd/diskspace.c.orig Wed Apr 22 23:17:52 2009
+++ src/libs/zbxsysinfo/openbsd/diskspace.c Wed Apr 22 23:17:56 2009
@@ -42,22 +42,22 @@ int get_fs_size_stat(const char *fs, zbx_uint64_t *tot
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_diskspace_c,v 1.2 2010/01/11 18:30:01 jasper Exp $
--- src/libs/zbxsysinfo/openbsd/diskspace.c.orig Thu Dec 24 00:01:41 2009
+++ src/libs/zbxsysinfo/openbsd/diskspace.c Thu Dec 24 00:03:36 2009
@@ -25,7 +25,7 @@ static int get_fs_size_stat(const char *fs, zbx_uint64
{
#ifdef HAVE_SYS_STATVFS_H
if (total)
- *total = (zbx_uint64_t)s.f_blocks * s.f_frsize;
+ *total = (zbx_uint64_t)s.f_blocks * (s.f_frsize / 1024.0);
if (free)
- *free = (zbx_uint64_t)s.f_bfree * s.f_frsize;
+ *free = (zbx_uint64_t)s.f_bfree * (s.f_frsize / 1024.0);
if (used)
- *used = (zbx_uint64_t)(s.f_blocks - s.f_bfree) * s.f_frsize;
+ *used = (zbx_uint64_t)(s.f_blocks - s.f_bfree) * (s.f_frsize / 1024.0);
if (pfree)
*pfree = (double)(100.0 * s.f_bfree) / s.f_blocks;
if (pused)
*pused = (double)(100.0 * (s.f_blocks - s.f_bfree)) / s.f_blocks;
# define STATFS statvfs
-# define BSIZE f_frsize
+# define BSIZE f_frsize / 1024.0
#else
if (total)
- *total = (zbx_uint64_t)s.f_blocks * s.f_bsize;
+ *total = (zbx_uint64_t)s.f_blocks * (s.f_bsize / 1024.0);
if (free)
- *free = (zbx_uint64_t)s.f_bfree * s.f_bsize;
+ *free = (zbx_uint64_t)s.f_bfree * (s.f_bsize / 1024.0);
if (used)
- *used = (zbx_uint64_t)(s.f_blocks - s.f_bfree) * s.f_bsize;
+ *used = (zbx_uint64_t)(s.f_blocks - s.f_bfree) * (s.f_bsize / 1024.0);
if (pfree)
*pfree = (double)(100.0 * s.f_bfree) / s.f_blocks;
if (pused)
# define STATFS statfs
# define BSIZE f_bsize

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_net_c,v 1.1.1.1 2009/04/22 15:03:52 jasper Exp $
--- src/libs/zbxsysinfo/openbsd/net.c.orig Wed Apr 22 15:56:31 2009
+++ src/libs/zbxsysinfo/openbsd/net.c Wed Apr 22 16:03:55 2009
$OpenBSD: patch-src_libs_zbxsysinfo_openbsd_net_c,v 1.2 2010/01/11 18:30:01 jasper Exp $
--- src/libs/zbxsysinfo/openbsd/net.c.orig Thu Dec 24 00:03:53 2009
+++ src/libs/zbxsysinfo/openbsd/net.c Thu Dec 24 00:04:20 2009
@@ -21,6 +21,8 @@
#include "sysinfo.h"
+#define N_UNDF 0x00 /* undefined */
+
static struct nlist kernel_symbols[] =
static struct nlist kernel_symbols[] =
{
{"_ifnet", N_UNDF, 0, 0, 0},

View File

@ -1,6 +0,0 @@
ZABBIX is an enterprise-class open source distributed monitoring
solution designed to monitor and track performance and availability of
network servers, devices and other IT resources. It supports distributed
and WEB monitoring, and more.
This package contains the non-free documentation.

View File

@ -1,6 +0,0 @@
@comment $OpenBSD: PLIST-doc,v 1.2 2009/07/13 17:13:01 ajacoutot Exp $
@conflict zabbix-server-<1.6.4p2
@pkgpath net/zabbix,-doc,mysql
@pkgpath net/zabbix,-doc,pgsql
share/doc/zabbix/
share/doc/zabbix/ZABBIX_Manual_v${MAJOR}_rev17.pdf

View File

@ -1,12 +1,18 @@
@comment $OpenBSD: PLIST-main,v 1.5 2009/07/13 17:13:01 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2010/01/11 18:30:01 jasper Exp $
@pkgpath net/zabbix,-main,mysql
@pkgpath net/zabbix,-main,pgsql
@pkgpath net/zabbix,-doc,mysql
@pkgpath net/zabbix,-doc,pgsql
@pkgpath net/zabbix,-doc
@newgroup _zabbix:623
@newuser _zabbix:623:_zabbix:daemon:zabbix user:/nonexistent:/sbin/nologin
@bin bin/zabbix_get
@bin bin/zabbix_sender
@man man/man1/zabbix_get.1
@man man/man1/zabbix_sender.1
@man man/man8/zabbix_agentd.8
@bin sbin/zabbix_agent
@bin sbin/zabbix_agentd
@bin sbin/zabbix_get
@bin sbin/zabbix_sender
share/doc/zabbix/
share/doc/zabbix/README.OpenBSD
share/examples/zabbix/
@ -17,5 +23,6 @@ share/examples/zabbix/zabbix_agent.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_agent.conf
share/examples/zabbix/zabbix_agentd.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_agentd.conf
@comment share/examples/zabbix/zabbix_agentd.win.conf
@mode
@group

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.4 2009/07/12 19:51:51 ajacoutot Exp $
@comment $OpenBSD: PLIST-server,v 1.5 2010/01/11 18:30:01 jasper Exp $
@bin sbin/zabbix_proxy
@bin sbin/zabbix_server
@sample ${SYSCONFDIR}/zabbix/
@ -9,8 +9,6 @@ share/examples/zabbix/zabbix_proxy.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_proxy.conf
share/examples/zabbix/zabbix_server.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_server.conf
share/examples/zabbix/zabbix_trapper.conf
@sample ${SYSCONFDIR}/zabbix/zabbix_trapper.conf
@mode
@group
share/zabbix/