Attachment 108797 Details for Bug 149711 – zabbix-server-1.8.3,2.patch

[patch] zabbix-server-1.8.3,2.patch

zabbix-server-1.8.3,2.patch (text/plain), 13.99 KB, created by Jim Riggs on 2010-08-16 17:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim Riggs

Created: 2010-08-16 17:50:02 UTC

Size: 13.99 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/Makefile /root/portwork/zabbix/net-mgmt/zabbix-server/Makefile
>--- /usr/ports/net-mgmt/zabbix-server/Makefile	2010-06-30 14:43:40.000000000 -0500
>+++ /root/portwork/zabbix/net-mgmt/zabbix-server/Makefile	2010-08-16 11:46:19.000000000 -0500
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	zabbix
>-PORTVERSION=	1.8.2
>-PORTREVISION?=	2
>+PORTVERSION=	1.8.3
> PORTEPOCH=	2
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
>@@ -59,11 +58,14 @@
> 		PGSQL "Use PostgreSQL backend" off \
> 		SQLITE "Use SQLite backend" off \
> 		IPV6 "Support for IPv6" on \
>+		FPING "Use fping for pinging hosts" on \
>+		JABBER "Support for jabber media type" on \
>+		CURL "Support web monitoring with cURL" on \
> 		LDAP "Support for checking LDAP servers" on \
> 		IPMI "Support for IPMI" off \
>-		JABBER "Use jabber media type" on \
>-		FPING "Use fping for pinging hosts" on \
>-		SSH "Use libssh2 for SSH-based checks" off
>+		SSH "Support for SSH-based checks" off \
>+		IODBC "Support for iODBC" off \
>+		UNIXODBC "Support for unixODBC" off
> 
> .include <bsd.port.options.mk>
> 
>@@ -83,6 +85,10 @@
> IGNORE=		zabbix requires a database backend
> .endif
> 
>+.ifdef WITHOUT_CURL
>+CONFIGURE_ARGS+=	--without-libcurl
>+.endif
>+
> .ifndef WITHOUT_LDAP
> USE_OPENLDAP=	yes
> CONFIGURE_ARGS+=	--with-ldap
>@@ -106,6 +112,20 @@
> LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
> CONFIGURE_ARGS+=	--with-ssh2
> .endif
>+
>+.if defined(WITH_IODBC) && defined(WITH_UNIXODBC)
>+IGNORE=	cannot build with both iODBC and unixODBC
>+.endif
>+
>+.ifdef WITH_IODBC
>+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
>+CONFIGURE_ARGS+=	--with-iodbc
>+.endif
>+
>+.ifdef WITH_UNIXODBC
>+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
>+CONFIGURE_ARGS+=	--with-unixodbc
>+.endif
> .endif # if ${ZABBIX_BUILD} != "agent"
> 
> .ifdef WITH_IPV6
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/distinfo /root/portwork/zabbix/net-mgmt/zabbix-server/distinfo
>--- /usr/ports/net-mgmt/zabbix-server/distinfo	2010-04-02 07:08:29.000000000 -0500
>+++ /root/portwork/zabbix/net-mgmt/zabbix-server/distinfo	2010-08-16 11:41:21.000000000 -0500
>@@ -1,3 +1,3 @@
>-MD5 (zabbix-1.8.2.tar.gz) = fa4be4fa7ac20a33cc0aa5c27b827746
>-SHA256 (zabbix-1.8.2.tar.gz) = ba1d00454551c1c6f0d270f76718b69ce9f54c427e22acb5a13ccbc9e621fd81
>-SIZE (zabbix-1.8.2.tar.gz) = 3706540
>+MD5 (zabbix-1.8.3.tar.gz) = 575c31880d73f6fe41e730874ebfc633
>+SHA256 (zabbix-1.8.3.tar.gz) = 37262d751c9661a361380bf1480d277d81621d8a49c60a81667cbe258021065c
>+SIZE (zabbix-1.8.3.tar.gz) = 4106152
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/files/patch-configure /root/portwork/zabbix/net-mgmt/zabbix-server/files/patch-configure
>--- /usr/ports/net-mgmt/zabbix-server/files/patch-configure	2010-06-05 14:26:08.000000000 -0500
>+++ /root/portwork/zabbix/net-mgmt/zabbix-server/files/patch-configure	1969-12-31 18:00:00.000000000 -0600
>@@ -1,23 +0,0 @@
>-
>---- configure.orig	2010-05-17 15:38:52.189911152 +0400
>-+++ configure	2010-05-17 15:39:13.793087125 +0400
>-@@ -12472,7 +12472,7 @@
>-      fi #if test "x$_libssh2_dir" = "xno"; then
>-   fi # if test "x$want_ssh2" != "xno"; then
>- 
>--  if test "x$found_ssh2" == "xyes"; then
>-+  if test "x$found_ssh2" = "xyes"; then
>-     am_save_cflags="$CFLAGS"
>-     am_save_ldflags="$LDFLAGS"
>-     am_save_libs="$LIBS"
>-@@ -12537,7 +12537,7 @@
>-     LDFLAGS="$am_save_ldflags"
>-     LIBS="$am_save_libs"
>- 
>--    if test "x$found_ssh2" == "xyes"; then
>-+    if test "x$found_ssh2" = "xyes"; then
>- 
>- cat >>confdefs.h <<\_ACEOF
>- #define HAVE_SSH2 1
>-
>-
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist /root/portwork/zabbix/net-mgmt/zabbix-server/pkg-plist
>--- /usr/ports/net-mgmt/zabbix-server/pkg-plist	2009-12-13 16:30:17.000000000 -0600
>+++ /root/portwork/zabbix/net-mgmt/zabbix-server/pkg-plist	2010-08-16 11:41:21.000000000 -0500
>@@ -33,10 +33,10 @@
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
>+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/patch.sql
>+%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/upgrade
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle/patch.sql
> %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql/patch.sql
>-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/upgrade
>-%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql/patch.sql
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle
> @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql
>diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend /root/portwork/zabbix/net-mgmt/zabbix-server/pkg-plist.frontend
>--- /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend	2010-04-02 07:08:29.000000000 -0500
>+++ /root/portwork/zabbix/net-mgmt/zabbix-server/pkg-plist.frontend	2010-08-16 11:41:21.000000000 -0500
>@@ -7,15 +7,21 @@
> %%WWWDIR%%/api/classes/class.calert.php
> %%WWWDIR%%/api/classes/class.capiinfo.php
> %%WWWDIR%%/api/classes/class.capplication.php
>+%%WWWDIR%%/api/classes/class.cdcheck.php
>+%%WWWDIR%%/api/classes/class.cdhost.php
>+%%WWWDIR%%/api/classes/class.cdrule.php
>+%%WWWDIR%%/api/classes/class.cdservice.php
> %%WWWDIR%%/api/classes/class.cevent.php
> %%WWWDIR%%/api/classes/class.cgraph.php
> %%WWWDIR%%/api/classes/class.cgraphitem.php
>+%%WWWDIR%%/api/classes/class.chistory.php
> %%WWWDIR%%/api/classes/class.chost.php
> %%WWWDIR%%/api/classes/class.chostgroup.php
> %%WWWDIR%%/api/classes/class.cimage.php
> %%WWWDIR%%/api/classes/class.citem.php
> %%WWWDIR%%/api/classes/class.cmaintenance.php
> %%WWWDIR%%/api/classes/class.cmap.php
>+%%WWWDIR%%/api/classes/class.cmediatype.php
> %%WWWDIR%%/api/classes/class.cproxy.php
> %%WWWDIR%%/api/classes/class.cscreen.php
> %%WWWDIR%%/api/classes/class.cscript.php
>@@ -29,12 +35,13 @@
> %%WWWDIR%%/api/rpc/class.czbxrpc.php
> %%WWWDIR%%/api_jsonrpc.php
> %%WWWDIR%%/applications.php
>-%%WWWDIR%%/audio/trigger_off.wav
>-%%WWWDIR%%/audio/trigger_on.wav
>-%%WWWDIR%%/audio/trigger_on_average.wav
>-%%WWWDIR%%/audio/trigger_on_disaster.wav
>-%%WWWDIR%%/audio/trigger_on_high.wav
>-%%WWWDIR%%/audio/trigger_on_warning.wav
>+%%WWWDIR%%/audio/alarm_average.wav
>+%%WWWDIR%%/audio/alarm_disaster.wav
>+%%WWWDIR%%/audio/alarm_high.wav
>+%%WWWDIR%%/audio/alarm_information.wav
>+%%WWWDIR%%/audio/alarm_ok.wav
>+%%WWWDIR%%/audio/alarm_warning.wav
>+%%WWWDIR%%/audio/no_sound.wav
> %%WWWDIR%%/auditacts.php
> %%WWWDIR%%/auditlogs.php
> %%WWWDIR%%/authentication.php
>@@ -59,7 +66,6 @@
> %%WWWDIR%%/discovery.php
> %%WWWDIR%%/discoveryconf.php
> %%WWWDIR%%/events.php
>-%%WWWDIR%%/export.php
> %%WWWDIR%%/fonts/DejaVuSans.ttf
> %%WWWDIR%%/graphs.php
> %%WWWDIR%%/history.php
>@@ -85,37 +91,24 @@
> %%WWWDIR%%/images/general/bar/right.png
> %%WWWDIR%%/images/general/bar/right_arr.png
> %%WWWDIR%%/images/general/bttn/arrowdown.png
>-%%WWWDIR%%/images/general/bttn/arrowdown_bb.png
> %%WWWDIR%%/images/general/bttn/arrowleft.png
>-%%WWWDIR%%/images/general/bttn/arrowleft_bb.png
> %%WWWDIR%%/images/general/bttn/arrowright.png
>-%%WWWDIR%%/images/general/bttn/arrowright_bb.png
> %%WWWDIR%%/images/general/bttn/arrowup.png
>-%%WWWDIR%%/images/general/bttn/arrowup_bb.png
>+%%WWWDIR%%/images/general/bttn/close.png
> %%WWWDIR%%/images/general/bttn/config.png
>-%%WWWDIR%%/images/general/bttn/config_bb.png
> %%WWWDIR%%/images/general/bttn/config_hl.png
>-%%WWWDIR%%/images/general/bttn/config_hl_bb.png
> %%WWWDIR%%/images/general/bttn/down.png
>-%%WWWDIR%%/images/general/bttn/down_bb.png
> %%WWWDIR%%/images/general/bttn/fullscreen.png
>-%%WWWDIR%%/images/general/bttn/fullscreen_bb.png
> %%WWWDIR%%/images/general/bttn/help.png
>-%%WWWDIR%%/images/general/bttn/help_bb.png
> %%WWWDIR%%/images/general/bttn/menu.png
>-%%WWWDIR%%/images/general/bttn/menu_bb.png
> %%WWWDIR%%/images/general/bttn/minus.png
>-%%WWWDIR%%/images/general/bttn/minus_bb.png
>+%%WWWDIR%%/images/general/bttn/move.png
> %%WWWDIR%%/images/general/bttn/mute.png
>-%%WWWDIR%%/images/general/bttn/mute_bb.png
> %%WWWDIR%%/images/general/bttn/plus.png
>-%%WWWDIR%%/images/general/bttn/plus_bb.png
> %%WWWDIR%%/images/general/bttn/reset.png
>-%%WWWDIR%%/images/general/bttn/reset_bb.png
>+%%WWWDIR%%/images/general/bttn/snooze.png
> %%WWWDIR%%/images/general/bttn/sound.png
>-%%WWWDIR%%/images/general/bttn/sound_bb.png
> %%WWWDIR%%/images/general/bttn/up.png
>-%%WWWDIR%%/images/general/bttn/up_bb.png
> %%WWWDIR%%/images/general/chart.png
> %%WWWDIR%%/images/general/closed.gif
> %%WWWDIR%%/images/general/dbl_arrow_down.png
>@@ -144,16 +137,10 @@
> %%WWWDIR%%/images/general/snmp_available_bb.png
> %%WWWDIR%%/images/general/snmp_unavailable.png
> %%WWWDIR%%/images/general/snmp_unknown.png
>-%%WWWDIR%%/images/general/sort_down.png
>-%%WWWDIR%%/images/general/sort_down_bb.png
>-%%WWWDIR%%/images/general/sort_downw.gif
>-%%WWWDIR%%/images/general/sort_up.png
>-%%WWWDIR%%/images/general/sort_up_bb.png
>-%%WWWDIR%%/images/general/sort_upw.gif
>-%%WWWDIR%%/images/general/sortdown.gif
>-%%WWWDIR%%/images/general/sortdown_off.gif
>-%%WWWDIR%%/images/general/sortup.gif
>-%%WWWDIR%%/images/general/sortup_off.gif
>+%%WWWDIR%%/images/general/sort_down.gif
>+%%WWWDIR%%/images/general/sort_down_od.gif
>+%%WWWDIR%%/images/general/sort_up.gif
>+%%WWWDIR%%/images/general/sort_up_od.gif
> %%WWWDIR%%/images/general/tick.png
> %%WWWDIR%%/images/general/tr_space.gif
> %%WWWDIR%%/images/general/tr_top_bottom.gif
>@@ -168,6 +155,7 @@
> %%WWWDIR%%/images/general/up_icon.png
> %%WWWDIR%%/images/general/warning16r.gif
> %%WWWDIR%%/images/general/warning_small.gif
>+%%WWWDIR%%/images/general/x.gif
> %%WWWDIR%%/images/general/zabbix.ico
> %%WWWDIR%%/images/general/zabbix.png
> %%WWWDIR%%/images/general/zabbix_available.png
>@@ -175,6 +163,7 @@
> %%WWWDIR%%/images/general/zabbix_bb.ico
> %%WWWDIR%%/images/general/zabbix_bb.png
> %%WWWDIR%%/images/general/zabbix_ob.ico
>+%%WWWDIR%%/images/general/zabbix_od.png
> %%WWWDIR%%/images/general/zabbix_unavailable.png
> %%WWWDIR%%/images/general/zabbix_unknown.png
> %%WWWDIR%%/images/general/zero.gif
>@@ -223,11 +212,9 @@
> %%WWWDIR%%/images/sysmaps/old/Server.png
> %%WWWDIR%%/images/sysmaps/old/Workstation.png
> %%WWWDIR%%/imgstore.php
>-%%WWWDIR%%/import.php
> %%WWWDIR%%/include/.htaccess
> %%WWWDIR%%/include/acknow.inc.php
> %%WWWDIR%%/include/actions.inc.php
>-%%WWWDIR%%/include/apicalls.inc.php
> %%WWWDIR%%/include/audit.inc.php
> %%WWWDIR%%/include/blocks.inc.php
> %%WWWDIR%%/include/classes/.htaccess
>@@ -252,11 +239,13 @@
> %%WWWDIR%%/include/classes/class.cflashclock.php
> %%WWWDIR%%/include/classes/class.cflashembed.php
> %%WWWDIR%%/include/classes/class.cform.php
>+%%WWWDIR%%/include/classes/class.cformelement.php
> %%WWWDIR%%/include/classes/class.cformtable.php
> %%WWWDIR%%/include/classes/class.cgraphdraw.php
> %%WWWDIR%%/include/classes/class.chelp.php
> %%WWWDIR%%/include/classes/class.chostsinfo.php
> %%WWWDIR%%/include/classes/class.chttp_request.php
>+%%WWWDIR%%/include/classes/class.cicon.php
> %%WWWDIR%%/include/classes/class.ciframe.php
> %%WWWDIR%%/include/classes/class.cimagetexttable.php
> %%WWWDIR%%/include/classes/class.cimg.php
>@@ -270,6 +259,7 @@
> %%WWWDIR%%/include/classes/class.clistitem.php
> %%WWWDIR%%/include/classes/class.cnumericbox.php
> %%WWWDIR%%/include/classes/class.cobject.php
>+%%WWWDIR%%/include/classes/class.cpagefilter.php
> %%WWWDIR%%/include/classes/class.cparam.php
> %%WWWDIR%%/include/classes/class.cpassbox.php
> %%WWWDIR%%/include/classes/class.cpie.php
>@@ -277,6 +267,7 @@
> %%WWWDIR%%/include/classes/class.crow.php
> %%WWWDIR%%/include/classes/class.cserverinfo.php
> %%WWWDIR%%/include/classes/class.cspan.php
>+%%WWWDIR%%/include/classes/class.cstringparser.php
> %%WWWDIR%%/include/classes/class.ctable.php
> %%WWWDIR%%/include/classes/class.ctableinfo.php
> %%WWWDIR%%/include/classes/class.ctag.php
>@@ -310,6 +301,7 @@
> %%WWWDIR%%/include/js.inc.php
> %%WWWDIR%%/include/locales.inc.php
> %%WWWDIR%%/include/locales/cn_zh.inc.php
>+%%WWWDIR%%/include/locales/cs_cz.inc.php
> %%WWWDIR%%/include/locales/de_de.inc.php
> %%WWWDIR%%/include/locales/en_gb.inc.php
> %%WWWDIR%%/include/locales/fr_fr.inc.php
>@@ -337,38 +329,50 @@
> %%WWWDIR%%/include/regexp.inc.php
> %%WWWDIR%%/include/reports.inc.php
> %%WWWDIR%%/include/requirements.inc.php
>+%%WWWDIR%%/include/schema.inc.php
> %%WWWDIR%%/include/screens.inc.php
> %%WWWDIR%%/include/scripts.inc.php
> %%WWWDIR%%/include/services.inc.php
> %%WWWDIR%%/include/setup.inc.php
>+%%WWWDIR%%/include/sounds.inc.php
> %%WWWDIR%%/include/triggers.inc.php
> %%WWWDIR%%/include/users.inc.php
> %%WWWDIR%%/include/validate.inc.php
>+%%WWWDIR%%/include/valuemap.inc.php
> %%WWWDIR%%/index.php
> %%WWWDIR%%/instal.php
> %%WWWDIR%%/items.php
>+%%WWWDIR%%/js/class.bbcode.js
> %%WWWDIR%%/js/class.calendar.js
> %%WWWDIR%%/js/class.cdate.js
>+%%WWWDIR%%/js/class.cdebug.js
> %%WWWDIR%%/js/class.cmap.js
>+%%WWWDIR%%/js/class.cmessages.js
> %%WWWDIR%%/js/class.cookie.js
> %%WWWDIR%%/js/class.cscreen.js
>+%%WWWDIR%%/js/class.csuggest.js
> %%WWWDIR%%/js/class.cswitcher.js
> %%WWWDIR%%/js/class.ctree.js
> %%WWWDIR%%/js/class.curl.js
>+%%WWWDIR%%/js/class.cviewswitcher.js
> %%WWWDIR%%/js/class.pmaster.js
>+%%WWWDIR%%/js/class.rpc.js
> %%WWWDIR%%/js/common.js
>+%%WWWDIR%%/js/dom.js
> %%WWWDIR%%/js/functions.js
> %%WWWDIR%%/js/gtlc.js
>+%%WWWDIR%%/js/ie6fix.js
> %%WWWDIR%%/js/main.js
> %%WWWDIR%%/js/menu.js
> %%WWWDIR%%/js/prototype.js
>-%%WWWDIR%%/js/scriptaculous.js
> %%WWWDIR%%/js/scriptaculous/builder.js
> %%WWWDIR%%/js/scriptaculous/controls.js
> %%WWWDIR%%/js/scriptaculous/dragdrop.js
> %%WWWDIR%%/js/scriptaculous/effects.js
> %%WWWDIR%%/js/scriptaculous/slider.js
> %%WWWDIR%%/js/scriptaculous/sound.js
>+%%WWWDIR%%/jsLoader.php
>+%%WWWDIR%%/jsrpc.php
> %%WWWDIR%%/latest.php
> %%WWWDIR%%/locales.php
> %%WWWDIR%%/maintenance.php
>@@ -406,15 +410,19 @@
> %%WWWDIR%%/services.php
> %%WWWDIR%%/services_form.php
> %%WWWDIR%%/setup.php
>+%%WWWDIR%%/slideconf.php
> %%WWWDIR%%/slides.php
> %%WWWDIR%%/srv_status.php
> %%WWWDIR%%/styles/blocks.css
> %%WWWDIR%%/styles/calendar.css
> %%WWWDIR%%/styles/css_bb.css
> %%WWWDIR%%/styles/css_ob.css
>+%%WWWDIR%%/styles/css_od.css
> %%WWWDIR%%/styles/default.css
> %%WWWDIR%%/styles/div.css
> %%WWWDIR%%/styles/form.css
>+%%WWWDIR%%/styles/ie.css
>+%%WWWDIR%%/styles/ie_css_od.css
> %%WWWDIR%%/styles/link.css
> %%WWWDIR%%/styles/p.css
> %%WWWDIR%%/styles/popupmenu.css

Actions: View | Diff

Attachments on bug 149711: 108797