cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Zabbix 1.8.6.

Browse Source 
For details, see:
http://www.zabbix.com/documentation/1.8/manual/about/what_s_new_1.8.6
This commit is contained in:
ajacoutot 2011-08-21 09:21:02 +00:00
parent 254dddc098
commit a713d9ca50
8 changed files with 48 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/zabbix/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.55 2011/07/28 10:51:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.56 2011/08/21 09:21:02 ajacoutot Exp $
COMMENT-main = network and application monitoring - agent
COMMENT-server = network and application monitoring - server
COMMENT-web = network and application monitoring - web frontend
VERSION = 1.8.5
VERSION = 1.8.6
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@ -13,10 +13,6 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
REVISION-main= 1
REVISION-web= 4
REVISION-server= 2
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
HOMEPAGE = http://www.zabbix.com/

10
net/zabbix/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zabbix-1.8.5.tar.gz) = WLklP7Dqzh4gsv5cH84yow==
RMD160 (zabbix-1.8.5.tar.gz) = IA4c3dsPcUnHz7YiN6RqVjBU+V4=
SHA1 (zabbix-1.8.5.tar.gz) = ZV9cc4ETnsl9I99MzgRp4eAyxU0=
SHA256 (zabbix-1.8.5.tar.gz) = iFufGVPD9qofE3YDQLPSPW4BKH3Ebm4kHJZK7Ho47zI=
SIZE (zabbix-1.8.5.tar.gz) = 4184672
MD5 (zabbix-1.8.6.tar.gz) = RkL9JjFnIRpzoC/n87zZmA==
RMD160 (zabbix-1.8.6.tar.gz) = kltD26F72+s5Z7M1wtomS9oJmW8=
SHA1 (zabbix-1.8.6.tar.gz) = A8jbZc5af6zgwjV9xtq1SHIxp2g=
SHA256 (zabbix-1.8.6.tar.gz) = nht3jBf5i4FjJDMmdbkQyc5uTRhMlVuc7oK2slNxpyk=
SIZE (zabbix-1.8.6.tar.gz) = 4204545

28
net/zabbix/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
--- configure.orig Fri Apr 15 21:18:33 2011
+++ configure Mon Apr 25 08:18:46 2011
$OpenBSD: patch-configure,v 1.4 2011/08/21 09:21:02 ajacoutot Exp $
--- configure.orig Thu Aug 4 10:23:23 2011
+++ configure Sun Aug 21 11:06:23 2011
@@ -558,6 +558,9 @@ ac_unique_file="src/zabbix_server/server.c"
# Factoring default headers for most tests.
ac_includes_default="\
@ -11,7 +11,15 @@ $OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -8284,7 +8287,7 @@ $as_echo "yes" >&6; }
@@ -5810,6 +5813,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
$as_echo_n "checking for field ss_family in struct sockaddr_storage... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <stdio.h>
#include <sys/socket.h>
int
main ()
@@ -8262,7 +8266,7 @@ $as_echo "yes" >&6; }
JABBER_INCDIR=$IKSEMEL_CPPFLAGS
JABBER_LIBDIR=$IKSEMEL_LIBS
@ -20,7 +28,7 @@ $OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
fi
else
@@ -8294,7 +8297,7 @@ $as_echo_n "checking for iksemel support... " >&6; }
@@ -8272,7 +8276,7 @@ $as_echo_n "checking for iksemel support... " >&6; }
if test -f $_libiksemel_with/include/iksemel.h; then
JABBER_INCDIR=-I$_libiksemel_with/include
JABBER_LIBDIR=-L$_libiksemel_with/lib
@ -29,7 +37,7 @@ $OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -10034,7 +10037,7 @@ $as_echo "no" >&6; }
@@ -10011,7 +10015,7 @@ $as_echo "no" >&6; }
if test "x$found_ldap" != "xno" ; then
if test "x$enable_static" = "xyes"; then
@ -38,8 +46,8 @@ $OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
fi
LDAP_CPPFLAGS=-I$LDAP_INCDIR
@@ -10094,13 +10097,13 @@ else
as_fn_error "Not found GnuTLS library" "$LINENO" 5
@@ -10071,13 +10075,13 @@ else
as_fn_error $? "Not found GnuTLS library" "$LINENO" 5
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
@ -55,7 +63,7 @@ $OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10129,7 +10132,7 @@ if test "x$ac_cv_lib_pthread_main" = x""yes; then :
@@ -10106,7 +10110,7 @@ if test "x$ac_cv_lib_pthread_main" = x""yes; then :
#define HAVE_LIBPTHREAD 1
_ACEOF
@ -63,4 +71,4 @@ $OpenBSD: patch-configure,v 1.3 2011/04/25 07:42:36 ajacoutot Exp $
+ LIBS="-pthread $LIBS"
else
as_fn_error "Not found Pthread library" "$LINENO" 5
as_fn_error $? "Not found Pthread library" "$LINENO" 5

18
net/zabbix/patches/patch-misc_conf_zabbix_proxy_conf
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.7 2011/04/25 07:42:36 ajacoutot Exp $
--- misc/conf/zabbix_proxy.conf.orig Fri Apr 15 21:17:30 2011
+++ misc/conf/zabbix_proxy.conf Mon Apr 25 08:17:22 2011
@@ -94,6 +94,7 @@ LogFile=/tmp/zabbix_proxy.log
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.8 2011/08/21 09:21:02 ajacoutot Exp $
--- misc/conf/zabbix_proxy.conf.orig Thu Aug 4 10:23:14 2011
+++ misc/conf/zabbix_proxy.conf Sun Aug 21 11:01:16 2011
@@ -104,6 +104,7 @@ LogFile=/tmp/zabbix_proxy.log
# Mandatory: no
# Default:
# PidFile=/tmp/zabbix_proxy.pid
@ -9,7 +9,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.7 2011/04/25 07:42:36 ajacoutot
### Option: DBHost
# Database host name.
@@ -126,7 +127,7 @@ DBName=zabbix
@@ -136,7 +137,7 @@ DBName=zabbix
# Default:
# DBUser=
@ -18,7 +18,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.7 2011/04/25 07:42:36 ajacoutot
### Option: DBPassword
# Database password. Ignored for SQLite.
@@ -142,6 +143,7 @@ DBUser=root
@@ -152,6 +153,7 @@ DBUser=root
# Mandatory: no
# Default:
# DBSocket=/tmp/mysql.sock
@ -26,7 +26,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.7 2011/04/25 07:42:36 ajacoutot
# Option: DBPort
# Database port when not using local socket. Ignored for SQLite.
@@ -372,6 +374,7 @@ DBUser=root
@@ -374,6 +376,7 @@ DBUser=root
# Mandatory: no
# Default:
# ExternalScripts=/etc/zabbix/externalscripts
@ -34,7 +34,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.7 2011/04/25 07:42:36 ajacoutot
### Option: FpingLocation
# Location of fping.
@@ -380,6 +383,7 @@ DBUser=root
@@ -382,6 +385,7 @@ DBUser=root
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@ -42,7 +42,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.7 2011/04/25 07:42:36 ajacoutot
### Option: Fping6Location
# Location of fping6.
@@ -389,6 +393,7 @@ DBUser=root
@@ -391,6 +395,7 @@ DBUser=root
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6

29
net/zabbix/patches/patch-src_libs_zbxcomms_comms_c
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-src_libs_zbxcomms_comms_c,v 1.1 2011/04/25 07:42:36 ajacoutot Exp $
comms.c:765: error: 'SOL_IPV6' undeclared (first use in this function)
(patch from FreeBSD)
--- src/libs/zbxcomms/comms.c.orig Fri Apr 15 21:17:29 2011
+++ src/libs/zbxcomms/comms.c Mon Apr 25 08:58:46 2011
@@ -756,19 +756,14 @@ int zbx_tcp_listen(zbx_sock_t *s, const char *listen_i
ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
}
-#if defined(IPV6_V6ONLY)
-#ifdef _WINDOWS
+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
if (PF_INET6 == current_ai->ai_family &&
ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], IPPROTO_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
-#else
- if (PF_INET6 == current_ai->ai_family &&
- ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], SOL_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
-#endif
{
zbx_set_tcp_strerror("setsockopt() with IPV6_V6ONLY for [[%s]:%s] failed with error %d: %s",
ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
}
-#endif /* IPV6_V6ONLY */
+#endif
if (ZBX_TCP_ERROR == bind(s->sockets[s->num_socks], current_ai->ai_addr, current_ai->ai_addrlen))
{

12
net/zabbix/patches/patch-src_libs_zbxnix_daemon_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.6 2011/04/25 07:42:36 ajacoutot Exp $
--- src/libs/zbxnix/daemon.c.orig Fri Apr 15 21:17:29 2011
+++ src/libs/zbxnix/daemon.c Mon Apr 25 08:17:22 2011
@@ -147,7 +147,7 @@ int daemon_start(int allow_root)
$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.7 2011/08/21 09:21:02 ajacoutot Exp $
--- src/libs/zbxnix/daemon.c.orig Thu Aug 4 10:23:13 2011
+++ src/libs/zbxnix/daemon.c Sun Aug 21 11:01:16 2011
@@ -182,7 +182,7 @@ int daemon_start(int allow_root)
pid_t pid;
struct passwd *pwd;
struct sigaction phan;
- char user[7] = "zabbix";
+ char user[8] = "_zabbix";
/* running as root ?*/
if((0 == allow_root) && (0 == getuid() || 0 == getgid()))
/* running as root ? */
if (0 == allow_root && (0 == getuid() || 0 == getgid()))

3
net/zabbix/pkg/PLIST-web
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.14 2011/07/28 10:51:54 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.15 2011/08/21 09:21:02 ajacoutot Exp $
@pkgpath net/zabbix,-web,mysql
@pkgpath net/zabbix,-web,pgsql
conf/modules.sample/zabbix.conf
@ -25,6 +25,7 @@ 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.citemkey.php
zabbix/api/classes/class.cmaintenance.php
zabbix/api/classes/class.cmap.php
zabbix/api/classes/class.cmediatype.php

7
net/zabbix/pkg/README-server
View File

@ -1,9 +1,14 @@
$OpenBSD: README-server,v 1.4 2011/06/02 13:41:40 ajacoutot Exp $
$OpenBSD: README-server,v 1.5 2011/08/21 09:21:02 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
NOTE for users updating from version <1.8.6 using a node-based
distributed setup, see
http://www.zabbix.com/rn1.8.6.php
for improving performance of configuration syncing.
The original documentation is available as a PDF file at
${HOMEPAGE}