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

update to 2.0.3 and fix the traceroute binary path

Browse Source
This commit is contained in:
robert 2012-11-04 22:16:04 +00:00
parent 4ebf3e2517
commit 9a4503a30f
5 changed files with 76 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/zabbix/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.76 2012/10/10 22:04:57 robert Exp $
# $OpenBSD: Makefile,v 1.77 2012/11/04 22:16:04 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 = 2.0.2
VERSION = 2.0.3
DISTNAME = zabbix-${VERSION}
FULLPKGNAME-main = zabbix-agent-${VERSION}
FULLPKGPATH-main = net/zabbix,-main
@ -135,7 +135,6 @@ post-install:
tar -C ${PREFIX}/share/zabbix -xf -
@find ${PREFIX}/share/zabbix/schema -name data.sql -exec \
perl -pi -e "s,/bin/ping,/sbin/ping,g;" \
"s,/usr/bin/traceroute,/usr/sbin/traceroute,g" {} \;
perl -pi -e "s,/bin/ping,/sbin/ping,g;s,/usr/bin/traceroute,/usr/sbin/traceroute,g" {} \;
.include <bsd.port.mk>

4
net/zabbix/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zabbix-2.0.2.tar.gz) = LbVuT8KR9UaVhIRHA/aBX+c5w7M7TC1YVChaeAZQz7s=
SIZE (zabbix-2.0.2.tar.gz) = 12070505
SHA256 (zabbix-2.0.3.tar.gz) = tv6+q3bmrz79wSS84btRowZRurz0Hy0i/kKP9pqz92Q=
SIZE (zabbix-2.0.3.tar.gz) = 12329606

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
--- configure.orig Tue Jul 31 11:17:05 2012
+++ configure Tue Oct 2 21:08:50 2012
@@ -6011,6 +6011,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
$OpenBSD: patch-configure,v 1.8 2012/11/04 22:16:04 robert Exp $
--- configure.orig Sun Nov 4 23:05:14 2012
+++ configure Sun Nov 4 23:06:19 2012
@@ -5989,6 +5989,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. */
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
#include <sys/socket.h>
int
main ()
@@ -8517,7 +8518,7 @@ $as_echo "yes" >&6; }
@@ -8668,7 +8669,7 @@ $as_echo "yes" >&6; }
JABBER_INCDIR="$IKSEMEL_CPPFLAGS"
JABBER_LIBDIR="$IKSEMEL_LDFLAGS"
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
fi
else
@@ -8527,7 +8528,7 @@ $as_echo_n "checking for iksemel support... " >&6; }
@@ -8678,7 +8679,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"
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -10361,7 +10362,7 @@ $as_echo "no" >&6; }
@@ -10509,7 +10510,7 @@ $as_echo "no" >&6; }
if test "x$found_ldap" != "xno"; then
if test "x$enable_static" = "xyes"; then
@ -36,15 +36,15 @@ $OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
fi
LDAP_CPPFLAGS="-I$LDAP_INCDIR"
@@ -10420,13 +10421,13 @@ else
as_fn_error $? "Not found GnuTLS library" "$LINENO" 5
@@ -10568,13 +10569,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
-$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 ${ac_cv_lib_pthread_main+:} false; then :
if test "${ac_cv_lib_pthread_main+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -53,7 +53,7 @@ $OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -10455,7 +10456,7 @@ if test "x$ac_cv_lib_pthread_main" = xyes; then :
@@ -10603,7 +10604,7 @@ if test "x$ac_cv_lib_pthread_main" = x""yes; then :
#define HAVE_LIBPTHREAD 1
_ACEOF
@ -61,4 +61,4 @@ $OpenBSD: patch-configure,v 1.7 2012/10/10 22:04:57 robert Exp $
+ LIBS="-pthread $LIBS"
else
as_fn_error $? "Not found Pthread library" "$LINENO" 5
as_fn_error "Not found Pthread library" "$LINENO" 5

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

@ -1,7 +1,7 @@
$OpenBSD: patch-src_zabbix_agent_zabbix_agentd_c,v 1.1 2012/10/10 22:04:57 robert Exp $
--- src/zabbix_agent/zabbix_agentd.c.orig Wed Oct 10 23:46:28 2012
+++ src/zabbix_agent/zabbix_agentd.c Wed Oct 10 23:46:48 2012
@@ -46,7 +46,7 @@ const char *progname = NULL;
$OpenBSD: patch-src_zabbix_agent_zabbix_agentd_c,v 1.2 2012/11/04 22:16:04 robert Exp $
--- src/zabbix_agent/zabbix_agentd.c.orig Wed Oct 3 16:41:35 2012
+++ src/zabbix_agent/zabbix_agentd.c Sun Nov 4 23:05:05 2012
@@ -48,7 +48,7 @@ const char *progname = NULL;
#ifdef _WINDOWS
static char DEFAULT_CONFIG_FILE[] = "C:\\zabbix_agentd.conf";
#else

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.17 2012/10/10 22:04:57 robert Exp $
@comment $OpenBSD: PLIST-web,v 1.18 2012/11/04 22:16:04 robert Exp $
@pkgpath net/zabbix,-web,mysql
@pkgpath net/zabbix,-web,pgsql
conf/modules.sample/zabbix.conf
@ -37,6 +37,7 @@ zabbix/api/classes/CGraphItem.php
zabbix/api/classes/CGraphPrototype.php
zabbix/api/classes/CHistory.php
zabbix/api/classes/CHost.php
zabbix/api/classes/CHostGeneral.php
zabbix/api/classes/CHostGroup.php
zabbix/api/classes/CHostInterface.php
zabbix/api/classes/CIconMap.php
@ -56,6 +57,7 @@ zabbix/api/classes/CScript.php
zabbix/api/classes/CService.php
zabbix/api/classes/CTemplate.php
zabbix/api/classes/CTemplateScreen.php
zabbix/api/classes/CTemplateScreenItem.php
zabbix/api/classes/CTrigger.php
zabbix/api/classes/CTriggerExpression.php
zabbix/api/classes/CTriggerGeneral.php
@ -124,8 +126,10 @@ zabbix/images/
zabbix/images/flash/
zabbix/images/flash/zbxclock.swf
zabbix/images/general/
zabbix/images/general/arrowdown.gif
zabbix/images/general/arrowup.gif
zabbix/images/general/arrow_down.png
zabbix/images/general/arrow_down2.png
zabbix/images/general/arrow_up.png
zabbix/images/general/arrow_up2.png
zabbix/images/general/bar/
zabbix/images/general/bar/arrow_down.gif
zabbix/images/general/bar/arrow_sm.gif
@ -166,19 +170,13 @@ zabbix/images/general/bttn/snooze.png
zabbix/images/general/bttn/sound.png
zabbix/images/general/bttn/up.png
zabbix/images/general/chart.png
zabbix/images/general/closed.gif
zabbix/images/general/dbl_arrow_down.png
zabbix/images/general/dbl_arrow_down2.png
zabbix/images/general/dbl_arrow_up.png
zabbix/images/general/dbl_arrow_up2.png
zabbix/images/general/down_icon.png
zabbix/images/general/error.png
zabbix/images/general/error_icon.png
zabbix/images/general/error_small.gif
zabbix/images/general/help.gif
zabbix/images/general/inst_completed.gif
zabbix/images/general/inst_current.gif
zabbix/images/general/inst_step.gif
zabbix/images/general/error2.png
zabbix/images/general/error3.png
zabbix/images/general/ipmi_available.png
zabbix/images/general/ipmi_available_bb.png
zabbix/images/general/ipmi_unavailable.png
@ -191,12 +189,13 @@ zabbix/images/general/login/
zabbix/images/general/login/background.png
zabbix/images/general/login/logo.png
zabbix/images/general/login/username_pass_field.png
zabbix/images/general/minus.png
zabbix/images/general/no_icon.png
zabbix/images/general/ok.png
zabbix/images/general/ok_bb.png
zabbix/images/general/ok_icon.png
zabbix/images/general/ok_icon_bb.png
zabbix/images/general/opened.gif
zabbix/images/general/plus.png
zabbix/images/general/setup/
zabbix/images/general/setup/background.png
zabbix/images/general/setup/logo.png
@ -205,17 +204,13 @@ zabbix/images/general/snmp_available.png
zabbix/images/general/snmp_available_bb.png
zabbix/images/general/snmp_unavailable.png
zabbix/images/general/snmp_unknown.png
zabbix/images/general/sort_down.gif
zabbix/images/general/sort_down_blue.gif
zabbix/images/general/sort_down_od.gif
zabbix/images/general/sort_up.gif
zabbix/images/general/sort_up_blue.gif
zabbix/images/general/sort_up_od.gif
zabbix/images/general/sort_down.png
zabbix/images/general/sort_down_blue.png
zabbix/images/general/sort_down_od.png
zabbix/images/general/sort_up.png
zabbix/images/general/sort_up_blue.png
zabbix/images/general/sort_up_od.png
zabbix/images/general/tick.png
zabbix/images/general/tr_space.gif
zabbix/images/general/tr_top_bottom.gif
zabbix/images/general/tr_top_right.gif
zabbix/images/general/tr_top_right_bottom.gif
zabbix/images/general/transparent.png
zabbix/images/general/tree/
zabbix/images/general/tree/minus.gif
@ -225,11 +220,9 @@ zabbix/images/general/tree/pointc.gif
zabbix/images/general/tree/pointl.gif
zabbix/images/general/tree/zero.gif
zabbix/images/general/unknown_icon.png
zabbix/images/general/up_icon.png
zabbix/images/general/warning16r.gif
zabbix/images/general/warning_icon.png
zabbix/images/general/warning_small.gif
zabbix/images/general/x.gif
zabbix/images/general/warning.png
zabbix/images/general/warning2.png
zabbix/images/general/wrench12transp.png
zabbix/images/general/zabbix.ico
zabbix/images/general/zabbix.png
zabbix/images/general/zabbix_available.png
@ -240,7 +233,7 @@ 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
zabbix/images/general/zero.png
zabbix/images/gradients/
zabbix/images/gradients/blink.gif
zabbix/images/gradients/button.gif
@ -424,6 +417,28 @@ zabbix/include/classes/import/readers/CImportReader.php
zabbix/include/classes/import/readers/CImportReaderFactory.php
zabbix/include/classes/import/readers/CJsonImportReader.php
zabbix/include/classes/import/readers/CXmlImportReader.php
zabbix/include/classes/screens/
zabbix/include/classes/screens/CScreenActions.php
zabbix/include/classes/screens/CScreenBase.php
zabbix/include/classes/screens/CScreenBuilder.php
zabbix/include/classes/screens/CScreenChart.php
zabbix/include/classes/screens/CScreenClock.php
zabbix/include/classes/screens/CScreenDataOverview.php
zabbix/include/classes/screens/CScreenEvents.php
zabbix/include/classes/screens/CScreenGraph.php
zabbix/include/classes/screens/CScreenHistory.php
zabbix/include/classes/screens/CScreenHostTriggers.php
zabbix/include/classes/screens/CScreenHostgroupTriggers.php
zabbix/include/classes/screens/CScreenHostsInfo.php
zabbix/include/classes/screens/CScreenMap.php
zabbix/include/classes/screens/CScreenPlainText.php
zabbix/include/classes/screens/CScreenScreen.php
zabbix/include/classes/screens/CScreenServerInfo.php
zabbix/include/classes/screens/CScreenSimpleGraph.php
zabbix/include/classes/screens/CScreenSystemStatus.php
zabbix/include/classes/screens/CScreenTriggersInfo.php
zabbix/include/classes/screens/CScreenTriggersOverview.php
zabbix/include/classes/screens/CScreenUrl.php
zabbix/include/classes/sysmaps/
zabbix/include/classes/sysmaps/CCanvas.php
zabbix/include/classes/sysmaps/CMapPainter.php
@ -574,8 +589,15 @@ zabbix/include/views/js/configuration.sysmaps.js.php
zabbix/include/views/js/configuration.triggers.edit.js.php
zabbix/include/views/js/configuration.triggers.expression.js.php
zabbix/include/views/js/general.script.confirm.js.php
zabbix/include/views/js/monitoring.history.js.php
zabbix/include/views/js/monitoring.maps.js.php
zabbix/include/views/js/setup.js.php
zabbix/include/views/monitoring.charts.php
zabbix/include/views/monitoring.discovery.php
zabbix/include/views/monitoring.history.php
zabbix/include/views/monitoring.hostscreen.php
zabbix/include/views/monitoring.maps.php
zabbix/include/views/monitoring.overview.php
zabbix/include/views/monitoring.screen.php
zabbix/include/views/monitoring.slides.php
zabbix/index.php
@ -598,6 +620,7 @@ zabbix/js/class.cviewswitcher.js
zabbix/js/class.pmaster.js
zabbix/js/class.rpc.js
zabbix/js/common.js
zabbix/js/flickerfreescreen.js
zabbix/js/functions.js
zabbix/js/gtlc.js
zabbix/js/init.js
@ -626,6 +649,10 @@ zabbix/locale/el/
zabbix/locale/el/LC_MESSAGES/
zabbix/locale/el/LC_MESSAGES/frontend.mo
zabbix/locale/el/LC_MESSAGES/frontend.po
zabbix/locale/en_US/
zabbix/locale/en_US/LC_MESSAGES/
zabbix/locale/en_US/LC_MESSAGES/frontend.mo
zabbix/locale/en_US/LC_MESSAGES/frontend.po
zabbix/locale/es/
zabbix/locale/es/LC_MESSAGES/
zabbix/locale/es/LC_MESSAGES/frontend.mo