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

Update to zabbix 1.8.5.

Browse Source 
See http://www.zabbix.com/documentation/1.8/manual/about/what_s_new_1.8.5
for details.
This commit is contained in:
ajacoutot 2011-04-25 07:42:36 +00:00
parent 3326fa60dd
commit 86c929fbef
7 changed files with 73 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/zabbix/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.49 2011/04/15 16:13:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.50 2011/04/25 07:42:36 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.4
VERSION = 1.8.5
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@ -13,9 +13,6 @@ FULLPKGNAME-web = zabbix-web-${VERSION}
FULLPKGPATH-web = net/zabbix,-web
CATEGORIES = net
REVISION-main = 0
REVISION-server = 0
MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
HOMEPAGE = http://www.zabbix.com/
@ -39,7 +36,7 @@ FLAVORS = mysql pgsql sqlite3
SUBST_VARS += PREFIX-web ZABBIX_WEB MAJV
WANTLIB = c kvm m execinfo lber ldap pthread
WANTLIB = c kvm m execinfo lber ldap
LIB_DEPENDS = databases/openldap \
devel/libexecinfo
@ -50,7 +47,7 @@ LIB_DEPENDS-server = ${LIB_DEPENDS} \
RUN_DEPENDS-server = net/fping
# we want the _zabbix user&group as well as README-main
RUN_DEPENDS-server += net/zabbix,-main>=${VERSION}
WANTLIB-server = ${WANTLIB} crypto idn ssl z curl netsnmp iksemel
WANTLIB-server = ${WANTLIB} crypto idn ssl z curl netsnmp iksemel pthread
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-server \

10
net/zabbix/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zabbix-1.8.4.tar.gz) = lpzgkxfJiyBbyWFX4W9cjA==
RMD160 (zabbix-1.8.4.tar.gz) = ZH4Veln8VeyQPKW+An6we27+ihA=
SHA1 (zabbix-1.8.4.tar.gz) = twoxo51/VPMqPWlWWUwr/E/R4OQ=
SHA256 (zabbix-1.8.4.tar.gz) = DLsjfiUkYxxMhJ9PGaZ+9X5CAl1lHiE+8M2kjPgjFjo=
SIZE (zabbix-1.8.4.tar.gz) = 4123814
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

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2011/04/15 16:13:23 ajacoutot Exp $
--- configure.orig Tue Jan 4 14:58:12 2011
+++ configure Thu Apr 14 18:44:55 2011
@@ -580,6 +580,9 @@ ac_unique_file="src/zabbix_server/server.c"
$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
@@ -558,6 +558,9 @@ ac_unique_file="src/zabbix_server/server.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.2 2011/04/15 16:13:23 ajacoutot Exp $
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
@@ -11034,7 +11037,7 @@ echo "${ECHO_T}yes" >&6; }
@@ -8284,7 +8287,7 @@ $as_echo "yes" >&6; }
JABBER_INCDIR=$IKSEMEL_CPPFLAGS
JABBER_LIBDIR=$IKSEMEL_LIBS
@ -20,16 +20,16 @@ $OpenBSD: patch-configure,v 1.2 2011/04/15 16:13:23 ajacoutot Exp $
fi
else
@@ -11044,7 +11047,7 @@ echo $ECHO_N "checking for iksemel support... $ECHO_C"
@@ -8294,7 +8297,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
- JABBER_LIBS="-liksemel"
+ JABBER_LIBS="-liksemel -pthread"
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -13440,7 +13443,7 @@ echo "${ECHO_T}no" >&6; }
@@ -10034,7 +10037,7 @@ $as_echo "no" >&6; }
if test "x$found_ldap" != "xno" ; then
if test "x$enable_static" = "xyes"; then
@ -38,24 +38,24 @@ $OpenBSD: patch-configure,v 1.2 2011/04/15 16:13:23 ajacoutot Exp $
fi
LDAP_CPPFLAGS=-I$LDAP_INCDIR
@@ -13533,13 +13536,13 @@ echo "$as_me: error: Not found GnuTLS library" >&2;}
@@ -10094,13 +10097,13 @@ else
as_fn_error "Not found GnuTLS library" "$LINENO" 5
fi
-{ echo "$as_me:$LINENO: checking for main in -lpthread" >&5
-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for main in -pthread" >&5
+echo $ECHO_N "checking for main in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
-$as_echo_n "checking for main in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -pthread" >&5
+$as_echo_n "checking for main in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -13593,7 +13596,7 @@ if test $ac_cv_lib_pthread_main = yes; then
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 :
#define HAVE_LIBPTHREAD 1
_ACEOF
@ -63,4 +63,4 @@ $OpenBSD: patch-configure,v 1.2 2011/04/15 16:13:23 ajacoutot Exp $
+ LIBS="-pthread $LIBS"
else
{ { echo "$as_me:$LINENO: error: Not found Pthread library" >&5
as_fn_error "Not found Pthread library" "$LINENO" 5

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

@ -1,6 +1,6 @@
$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.6 2010/12/27 17:19:17 ajacoutot Exp $
--- misc/conf/zabbix_proxy.conf.orig Thu Dec 23 17:51:28 2010
+++ misc/conf/zabbix_proxy.conf Mon Dec 27 16:19:44 2010
$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
# Mandatory: no
# Default:
@ -26,7 +26,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.6 2010/12/27 17:19:17 ajacoutot
# Option: DBPort
# Database port when not using local socket. Ignored for SQLite.
@@ -380,6 +382,7 @@ DBUser=root
@@ -372,6 +374,7 @@ DBUser=root
# Mandatory: no
# Default:
# ExternalScripts=/etc/zabbix/externalscripts
@ -34,7 +34,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.6 2010/12/27 17:19:17 ajacoutot
### Option: FpingLocation
# Location of fping.
@@ -388,6 +391,7 @@ DBUser=root
@@ -380,6 +383,7 @@ DBUser=root
# Mandatory: no
# Default:
# FpingLocation=/usr/sbin/fping
@ -42,7 +42,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.6 2010/12/27 17:19:17 ajacoutot
### Option: Fping6Location
# Location of fping6.
@@ -397,6 +401,7 @@ DBUser=root
@@ -389,6 +393,7 @@ DBUser=root
# Mandatory: no
# Default:
# Fping6Location=/usr/sbin/fping6

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

@ -0,0 +1,29 @@
$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))
{

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.5 2010/12/27 17:19:17 ajacoutot Exp $
--- src/libs/zbxnix/daemon.c.orig Thu Dec 23 17:51:28 2010
+++ src/libs/zbxnix/daemon.c Mon Dec 27 16:19:44 2010
@@ -148,7 +148,7 @@ int daemon_start(int allow_root)
$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)
pid_t pid;
struct passwd *pwd;
struct sigaction phan;

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.12 2010/12/27 17:19:17 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.13 2011/04/25 07:42:37 ajacoutot Exp $
@pkgpath net/zabbix,-web,mysql
@pkgpath net/zabbix,-web,pgsql
conf/modules.sample/zabbix.conf
@ -35,6 +35,7 @@ zabbix/api/classes/class.cscreen.php
zabbix/api/classes/class.cscript.php
zabbix/api/classes/class.ctemplate.php
zabbix/api/classes/class.ctrigger.php
zabbix/api/classes/class.ctriggerexpression.php
zabbix/api/classes/class.cuser.php
zabbix/api/classes/class.cusergroup.php
zabbix/api/classes/class.cusermacro.php
@ -275,7 +276,6 @@ zabbix/include/classes/class.cicon.php
zabbix/include/classes/class.ciframe.php
zabbix/include/classes/class.cimagetexttable.php
zabbix/include/classes/class.cimg.php
zabbix/include/classes/class.cipbox.php
zabbix/include/classes/class.cjson.php
zabbix/include/classes/class.cjsscript.php
zabbix/include/classes/class.clabel.php
@ -342,6 +342,7 @@ zabbix/include/locales/nl_nl.inc.php
zabbix/include/locales/pl_pl.inc.php
zabbix/include/locales/pt_br.inc.php
zabbix/include/locales/ru_ru.inc.php
zabbix/include/locales/sk_sk.inc.php
zabbix/include/locales/sp_sp.inc.php
zabbix/include/locales/sv_se.inc.php
zabbix/include/locales/ua_ua.inc.php