diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile index 178b5f5b820..02c84af00ee 100644 --- a/net/zabbix/Makefile +++ b/net/zabbix/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.68 2012/01/20 10:40:42 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.69 2012/03/20 12:00:37 robert 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.10 +VERSION = 1.8.11 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 = 0 -REVISION-server = 0 -REVISION-web = 0 - MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/} HOMEPAGE = http://www.zabbix.com/ @@ -54,7 +50,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 pthread +WANTLIB-server = ${WANTLIB} crypto idn intl ssl z curl netsnmp iksemel pthread CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --enable-server \ diff --git a/net/zabbix/distinfo b/net/zabbix/distinfo index bd7dc21e57c..e0f5e78a8ea 100644 --- a/net/zabbix/distinfo +++ b/net/zabbix/distinfo @@ -1,5 +1,5 @@ -MD5 (zabbix-1.8.10.tar.gz) = fon4DBgieHwIMffA2+/New== -RMD160 (zabbix-1.8.10.tar.gz) = lud2lW1wVfmUWDFNu5Mb5dH5qXM= -SHA1 (zabbix-1.8.10.tar.gz) = PTZBO5vQTaZndeklUkMkLSBafpw= -SHA256 (zabbix-1.8.10.tar.gz) = 2WXSPyzox93uehUyhjogj64olY4/wIceAin/oG+IpUs= -SIZE (zabbix-1.8.10.tar.gz) = 4217417 +MD5 (zabbix-1.8.11.tar.gz) = a2zthAJPGPIs5eDpAukZNg== +RMD160 (zabbix-1.8.11.tar.gz) = 0uh0mkOwhGp7yTohxlRtrQ1mtng= +SHA1 (zabbix-1.8.11.tar.gz) = LvuU4LV/HduzjvP42iJdiO/7Bok= +SHA256 (zabbix-1.8.11.tar.gz) = xFgZuXCCeZuyU+TGo5N6/9B6LNJ0TYYNZXEHqko+dys= +SIZE (zabbix-1.8.11.tar.gz) = 4224738 diff --git a/net/zabbix/patches/patch-configure b/net/zabbix/patches/patch-configure index 569e7b96342..639b18e0be6 100644 --- a/net/zabbix/patches/patch-configure +++ b/net/zabbix/patches/patch-configure @@ -1,7 +1,7 @@ -$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" +$OpenBSD: patch-configure,v 1.5 2012/03/20 12:00:37 robert Exp $ +--- configure.orig Tue Mar 20 12:21:39 2012 ++++ configure Tue Mar 20 12:23:20 2012 +@@ -566,6 +566,9 @@ ac_unique_file="src/zabbix_server/server.c" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.4 2011/08/21 09:21:02 ajacoutot Exp $ #ifdef HAVE_SYS_TYPES_H # include #endif -@@ -5810,6 +5813,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ +@@ -5901,6 +5904,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. */ @@ -19,34 +19,34 @@ $OpenBSD: patch-configure,v 1.4 2011/08/21 09:21:02 ajacoutot Exp $ #include int main () -@@ -8262,7 +8266,7 @@ $as_echo "yes" >&6; } +@@ -8332,7 +8336,7 @@ $as_echo "yes" >&6; } - JABBER_INCDIR=$IKSEMEL_CPPFLAGS - JABBER_LIBDIR=$IKSEMEL_LIBS + JABBER_INCDIR="$IKSEMEL_CPPFLAGS" + JABBER_LIBDIR="$IKSEMEL_LDFLAGS" - JABBER_LIBS="-liksemel" + JABBER_LIBS="-liksemel -pthread" fi else -@@ -8272,7 +8276,7 @@ $as_echo_n "checking for iksemel support... " >&6; } +@@ -8342,7 +8346,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_INCDIR="-I$_libiksemel_with/include" + JABBER_LIBDIR="-L$_libiksemel_with/lib" - JABBER_LIBS="-liksemel" + JABBER_LIBS="-liksemel -pthread" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else -@@ -10011,7 +10015,7 @@ $as_echo "no" >&6; } - if test "x$found_ldap" != "xno" ; then +@@ -10079,7 +10083,7 @@ $as_echo "no" >&6; } + if test "x$found_ldap" != "xno"; then if test "x$enable_static" = "xyes"; then - LDAP_LIBS=" -lgnutls -lpthread -lsasl2 $LDAP_LIBS" + LDAP_LIBS=" -lgnutls -pthread -lsasl2 $LDAP_LIBS" fi - LDAP_CPPFLAGS=-I$LDAP_INCDIR -@@ -10071,13 +10075,13 @@ else + LDAP_CPPFLAGS="-I$LDAP_INCDIR" +@@ -10138,13 +10142,13 @@ else as_fn_error $? "Not found GnuTLS library" "$LINENO" 5 fi @@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.4 2011/08/21 09:21:02 ajacoutot Exp $ -$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 : + if ${ac_cv_lib_pthread_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.4 2011/08/21 09:21:02 ajacoutot Exp $ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -10106,7 +10110,7 @@ if test "x$ac_cv_lib_pthread_main" = x""yes; then : +@@ -10173,7 +10177,7 @@ if test "x$ac_cv_lib_pthread_main" = xyes; then : #define HAVE_LIBPTHREAD 1 _ACEOF diff --git a/net/zabbix/patches/patch-misc_conf_zabbix_proxy_conf b/net/zabbix/patches/patch-misc_conf_zabbix_proxy_conf index 9bb97814123..30338f70598 100644 --- a/net/zabbix/patches/patch-misc_conf_zabbix_proxy_conf +++ b/net/zabbix/patches/patch-misc_conf_zabbix_proxy_conf @@ -1,6 +1,6 @@ -$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 +$OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.9 2012/03/20 12:00:37 robert Exp $ +--- misc/conf/zabbix_proxy.conf.orig Tue Mar 20 10:15:16 2012 ++++ misc/conf/zabbix_proxy.conf Tue Mar 20 12:21:24 2012 @@ -104,6 +104,7 @@ LogFile=/tmp/zabbix_proxy.log # Mandatory: no # Default: @@ -26,7 +26,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.8 2011/08/21 09:21:02 ajacoutot # Option: DBPort # Database port when not using local socket. Ignored for SQLite. -@@ -374,6 +376,7 @@ DBUser=root +@@ -357,6 +359,7 @@ DBUser=root # Mandatory: no # Default: # ExternalScripts=/etc/zabbix/externalscripts @@ -34,7 +34,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.8 2011/08/21 09:21:02 ajacoutot ### Option: FpingLocation # Location of fping. -@@ -382,6 +385,7 @@ DBUser=root +@@ -365,6 +368,7 @@ DBUser=root # Mandatory: no # Default: # FpingLocation=/usr/sbin/fping @@ -42,7 +42,7 @@ $OpenBSD: patch-misc_conf_zabbix_proxy_conf,v 1.8 2011/08/21 09:21:02 ajacoutot ### Option: Fping6Location # Location of fping6. -@@ -391,6 +395,7 @@ DBUser=root +@@ -374,6 +378,7 @@ DBUser=root # Mandatory: no # Default: # Fping6Location=/usr/sbin/fping6 diff --git a/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c b/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c index 15021d2936a..804f0116e1b 100644 --- a/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c +++ b/net/zabbix/patches/patch-src_libs_zbxnix_daemon_c @@ -1,7 +1,7 @@ -$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) +$OpenBSD: patch-src_libs_zbxnix_daemon_c,v 1.8 2012/03/20 12:00:37 robert Exp $ +--- src/libs/zbxnix/daemon.c.orig Tue Mar 20 10:15:16 2012 ++++ src/libs/zbxnix/daemon.c Tue Mar 20 12:21:24 2012 +@@ -194,7 +194,7 @@ int daemon_start(int allow_root) pid_t pid; struct passwd *pwd; struct sigaction phan;