ports/167988: [patch] net-mgmt/icinga: update to latest version
Glen Barber
gjb at FreeBSD.org
Thu May 17 01:40:02 UTC 2012
>Number: 167988
>Category: ports
>Synopsis: [patch] net-mgmt/icinga: update to latest version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 17 01:40:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Glen Barber
>Release: 10.0-CURRENT r234559M
>Organization:
>Environment:
n/a
>Description:
Update net-mgmt/icinga 1.7.0
>How-To-Repeat:
>Fix:
Patch is attached.
Tinderbox logs can be found here:
https://builder.glenbarber.us/tb/logs/10-64-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/9-64-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/8-64-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/7-64-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/10-32-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/9-32-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/8-32-FreeBSD/icinga-1.7.0.log
https://builder.glenbarber.us/tb/logs/7-32-FreeBSD/icinga-1.7.0.log
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 3 Feb 2012 05:31:39 -0000 1.8
+++ Makefile 17 May 2012 01:22:05 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= icinga
-PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTVERSION= 1.7.0
CATEGORIES= net-mgmt
MASTER_SITES= SF
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 31 Jan 2012 05:49:23 -0000 1.4
+++ distinfo 17 May 2012 01:22:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (icinga-1.6.1.tar.gz) = 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
-SIZE (icinga-1.6.1.tar.gz) = 12880538
+SHA256 (icinga-1.7.0.tar.gz) = e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b
+SIZE (icinga-1.7.0.tar.gz) = 12939198
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 31 Jan 2012 05:49:23 -0000 1.3
+++ pkg-plist 17 May 2012 01:22:05 -0000
@@ -9,6 +9,7 @@
bin/icingastats
etc/icinga/cgi.cfg-sample
etc/icinga/cgiauth.cfg-sample
+etc/icinga/conf.d
etc/icinga/icinga.cfg-sample
etc/icinga/objects/commands.cfg-sample
etc/icinga/objects/contacts.cfg-sample
@@ -170,8 +171,10 @@
%%ICINGAWWWDIR%%/docs/de/largeinstalltweaks.html
%%ICINGAWWWDIR%%/docs/de/macrolist.html
%%ICINGAWWWDIR%%/docs/de/macros.html
+%%ICINGAWWWDIR%%/docs/de/modified_attr.html
%%ICINGAWWWDIR%%/docs/de/monitoring-linux.html
%%ICINGAWWWDIR%%/docs/de/monitoring-netware.html
+%%ICINGAWWWDIR%%/docs/de/monitoring-overview.html
%%ICINGAWWWDIR%%/docs/de/monitoring-printers.html
%%ICINGAWWWDIR%%/docs/de/monitoring-publicservices.html
%%ICINGAWWWDIR%%/docs/de/monitoring-routers.html
@@ -179,6 +182,7 @@
%%ICINGAWWWDIR%%/docs/de/mrtggraphs.html
%%ICINGAWWWDIR%%/docs/de/networkreachability.html
%%ICINGAWWWDIR%%/docs/de/notifications.html
+%%ICINGAWWWDIR%%/docs/de/notifications2.html
%%ICINGAWWWDIR%%/docs/de/nrpe.html
%%ICINGAWWWDIR%%/docs/de/nsca.html
%%ICINGAWWWDIR%%/docs/de/objectdefinitions.html
@@ -196,6 +200,7 @@
%%ICINGAWWWDIR%%/docs/de/quickstart-idoutils-freebsd.html
%%ICINGAWWWDIR%%/docs/de/quickstart-idoutils.html
%%ICINGAWWWDIR%%/docs/de/quickstart.html
+%%ICINGAWWWDIR%%/docs/de/recurring_downtimes.html
%%ICINGAWWWDIR%%/docs/de/redundancy.html
%%ICINGAWWWDIR%%/docs/de/reporting_1.6.html
%%ICINGAWWWDIR%%/docs/de/reporting.html
@@ -285,8 +290,10 @@
%%ICINGAWWWDIR%%/docs/en/largeinstalltweaks.html
%%ICINGAWWWDIR%%/docs/en/macrolist.html
%%ICINGAWWWDIR%%/docs/en/macros.html
+%%ICINGAWWWDIR%%/docs/en/modified_attr.html
%%ICINGAWWWDIR%%/docs/en/monitoring-linux.html
%%ICINGAWWWDIR%%/docs/en/monitoring-netware.html
+%%ICINGAWWWDIR%%/docs/en/monitoring-overview.html
%%ICINGAWWWDIR%%/docs/en/monitoring-printers.html
%%ICINGAWWWDIR%%/docs/en/monitoring-publicservices.html
%%ICINGAWWWDIR%%/docs/en/monitoring-routers.html
@@ -294,6 +301,7 @@
%%ICINGAWWWDIR%%/docs/en/mrtggraphs.html
%%ICINGAWWWDIR%%/docs/en/networkreachability.html
%%ICINGAWWWDIR%%/docs/en/notifications.html
+%%ICINGAWWWDIR%%/docs/en/notifications2.html
%%ICINGAWWWDIR%%/docs/en/nrpe.html
%%ICINGAWWWDIR%%/docs/en/nsca.html
%%ICINGAWWWDIR%%/docs/en/objectdefinitions.html
@@ -311,6 +319,7 @@
%%ICINGAWWWDIR%%/docs/en/quickstart-idoutils-freebsd.html
%%ICINGAWWWDIR%%/docs/en/quickstart-idoutils.html
%%ICINGAWWWDIR%%/docs/en/quickstart.html
+%%ICINGAWWWDIR%%/docs/en/recurring_downtimes.html
%%ICINGAWWWDIR%%/docs/en/redundancy.html
%%ICINGAWWWDIR%%/docs/en/reporting_1.6.html
%%ICINGAWWWDIR%%/docs/en/reporting.html
@@ -328,6 +337,7 @@
%%ICINGAWWWDIR%%/docs/en/verifyconfig.html
%%ICINGAWWWDIR%%/docs/en/volatileservices.html
%%ICINGAWWWDIR%%/docs/en/whatsnew.html
+%%ICINGAWWWDIR%%/docs/images/Architecture_1.5_800px.png
%%ICINGAWWWDIR%%/docs/images/MyServiceStatus.png
%%ICINGAWWWDIR%%/docs/images/activechecks.png
%%ICINGAWWWDIR%%/docs/images/cachedcheckgraphs.png
@@ -416,6 +426,7 @@
%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.5.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.5.png
@@ -425,11 +436,14 @@
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.5.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.6.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.5.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.6.png
@@ -454,9 +468,11 @@
%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.5.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-search1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.3.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-settings.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-settings_1.5.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.5.png
@@ -470,6 +486,7 @@
%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle4.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.6.png
+%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.7.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2.png
%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2_1.3.png
%%ICINGAWWWDIR%%/docs/images/idoutils.png
@@ -583,6 +600,7 @@
%%ICINGAWWWDIR%%/images/icinga-logo.png
%%ICINGAWWWDIR%%/images/icon_collapse.gif
%%ICINGAWWWDIR%%/images/icon_expand.gif
+%%ICINGAWWWDIR%%/images/icon_reload.png
%%ICINGAWWWDIR%%/images/info.png
%%ICINGAWWWDIR%%/images/interface/bar.gif
%%ICINGAWWWDIR%%/images/interface/menu_blank.gif
@@ -593,9 +611,12 @@
%%ICINGAWWWDIR%%/images/interface/menu_more.gif
%%ICINGAWWWDIR%%/images/left.gif
%%ICINGAWWWDIR%%/images/logofullsize.png
+%%ICINGAWWWDIR%%/images/logos/Stats1.gif
+%%ICINGAWWWDIR%%/images/logos/Stats2.png
%%ICINGAWWWDIR%%/images/logos/icinga.gd2
%%ICINGAWWWDIR%%/images/logos/icinga.gif
%%ICINGAWWWDIR%%/images/logos/icingavrml.png
+%%ICINGAWWWDIR%%/images/logos/s.gif
%%ICINGAWWWDIR%%/images/logos/unknown.gd2
%%ICINGAWWWDIR%%/images/logos/unknown.gif
%%ICINGAWWWDIR%%/images/logrotate.png
@@ -646,6 +667,7 @@
%%ICINGAWWWDIR%%/js/jquery-1.6.2.min.js
%%ICINGAWWWDIR%%/js/jquery.dd.js
%%ICINGAWWWDIR%%/js/menu.js
+%%ICINGAWWWDIR%%/js/page_refresh.js
%%ICINGAWWWDIR%%/js/skinnytip.js
%%ICINGAWWWDIR%%/log/.htaccess
%%ICINGAWWWDIR%%/log/index.htm
@@ -678,6 +700,7 @@
@dirrmtry libexec/icinga
@dirrmtry etc/icinga/objects
@dirrmtry etc/icinga/modules
+ at dirrmtry etc/icinga/conf.d
@dirrmtry etc/icinga
@dirrmtry %%ICINGAWWWDIR%%/stylesheets/interface
@dirrmtry %%ICINGAWWWDIR%%/stylesheets
Index: files/patch-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/files/patch-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile.in
--- files/patch-Makefile.in 20 Sep 2011 15:51:55 -0000 1.2
+++ files/patch-Makefile.in 17 May 2012 01:22:05 -0000
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2011-08-24 13:57:57.000000000 +0000
-+++ Makefile.in 2011-09-06 00:15:49.832669725 +0000
-@@ -383,13 +383,13 @@
+--- Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
++++ Makefile.in 2012-05-16 21:00:54.567967366 +0000
+@@ -362,13 +362,13 @@
$(MAKE) install-basic
install-basic:
@@ -20,12 +20,13 @@
fi;
@echo ""
-@@ -418,22 +418,22 @@
+@@ -405,23 +405,23 @@
install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg
- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
@@ -34,7 +35,7 @@
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
-- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
@@ -42,15 +43,16 @@
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg-sample
-+ $(INSTALL) -b -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
++ $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample
-+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample
++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg-sample
@@ -59,7 +61,7 @@
@echo ""
@echo "*** Config files installed ***"
-@@ -444,7 +444,7 @@
+@@ -432,7 +432,7 @@
@echo ""
install-webconf:
@@ -68,11 +70,43 @@
$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf
@echo ""
-@@ -497,7 +497,6 @@
+@@ -481,7 +481,7 @@
+
install-commandmode:
- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
-- chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
+- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
++ $(INSTALL) -m 755 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
+ chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
+
+ @echo ""
+@@ -489,18 +489,18 @@
+ @echo ""
+
+ install-eventhandlers:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
+- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
++ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
@echo ""
- @echo "*** External command directory configured ***"
+ @echo "*** Sample Eventhandlers installed ***"
Index: files/patch-base-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/files/patch-base-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-base-Makefile.in
--- files/patch-base-Makefile.in 23 Feb 2011 17:45:16 -0000 1.1
+++ files/patch-base-Makefile.in 17 May 2012 01:22:05 -0000
@@ -1,15 +1,13 @@
---- base/Makefile.in~ 2010-10-23 01:22:32.000000000 +0800
-+++ base/Makefile.in 2011-02-16 13:42:58.000000000 +0800
-@@ -205,9 +205,9 @@
+--- base/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
++++ base/Makefile.in 2012-05-16 19:18:25.684923160 +0000
+@@ -207,8 +207,8 @@
$(MAKE) install-basic
install-basic:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
-- $(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m 755 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
- strip-post-install:
- $(STRIP) $(DESTDIR)$(BINDIR)/@icinga_name@
Index: files/patch-cgi-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/files/patch-cgi-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-cgi-Makefile.in
--- files/patch-cgi-Makefile.in 20 Sep 2011 15:51:55 -0000 1.2
+++ files/patch-cgi-Makefile.in 17 May 2012 01:22:05 -0000
@@ -1,6 +1,6 @@
---- cgi/Makefile.in.orig 2011-08-24 13:57:57.000000000 +0000
-+++ cgi/Makefile.in 2011-09-05 22:27:34.493376507 +0000
-@@ -198,10 +198,10 @@
+--- cgi/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
++++ cgi/Makefile.in 2012-05-16 19:18:25.683923624 +0000
+@@ -199,10 +199,10 @@
$(MAKE) install-basic
install-basic:
Index: files/patch-configure.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/files/patch-configure.in,v
retrieving revision 1.2
diff -u -r1.2 patch-configure.in
--- files/patch-configure.in 20 Sep 2011 15:51:55 -0000 1.2
+++ files/patch-configure.in 17 May 2012 01:22:05 -0000
@@ -1,19 +1,19 @@
---- configure.in.orig 2011-08-24 13:57:57.000000000 +0000
-+++ configure.in 2011-09-05 22:30:37.899355262 +0000
+--- configure.in.orig 2012-05-15 13:00:56.000000000 +0000
++++ configure.in 2012-05-16 21:05:28.973178226 +0000
@@ -6,7 +6,6 @@
AC_INIT(base/icinga.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h)
+ AC_CONFIG_HEADER(include/config.h)
-AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
- PKG_VERSION="1.5.0"
-@@ -144,7 +143,15 @@
+ PKG_VERSION="1.7.0"
+@@ -144,6 +143,15 @@
dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
THREADLIBS=""
have_pthreads="no"
+have_thr="no"
-
++
+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
+AC_CHECK_LIB(thr,pthread_create)
+if test $ac_cv_lib_thr_pthread_create = yes; then
@@ -21,10 +21,10 @@
+ have_pthreads="yes"
+ have_thr="yes"
+else
+
dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad at yahoo-inc.com>
dnl FreeBSD -pthread check - Jonathan McDowell <noodles at earth.li>
- AC_DEFUN([AC_PTHREAD_FREEBSD],[
-@@ -205,6 +212,7 @@
+@@ -205,6 +213,7 @@
if test $have_pthreads = "no"; then
AC_PTHREAD_FREEBSD
fi
@@ -32,7 +32,7 @@
AC_SUBST(THREADLIBS)
-@@ -223,7 +231,7 @@
+@@ -223,7 +232,7 @@
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])
AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])
@@ -41,7 +41,16 @@
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$icinga_user)
-@@ -950,6 +958,9 @@
+@@ -414,7 +423,7 @@
+ P1FILELOC=no
+ AC_ARG_WITH(p1-file-dir,AC_HELP_STRING([--with-p1-file-dir=<path>],[sets path to embedded perl p1.pl directory]),P1FILELOC=$withval,P1FILELOC=no)
+ if test x$P1FILELOC = xno; then
+- P1FILELOC="$libdir"
++ P1FILELOC="$bindir"
+ fi
+ AC_SUBST(P1FILELOC)
+
+@@ -1033,6 +1042,9 @@
AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
Index: files/patch-contrib-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/files/patch-contrib-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-contrib-Makefile.in
--- files/patch-contrib-Makefile.in 20 Sep 2011 15:51:55 -0000 1.2
+++ files/patch-contrib-Makefile.in 17 May 2012 01:22:05 -0000
@@ -1,6 +1,6 @@
---- contrib/Makefile.in.orig 2011-08-24 13:57:57.000000000 +0000
-+++ contrib/Makefile.in 2011-09-05 22:31:21.616521093 +0000
-@@ -51,10 +51,10 @@
+--- contrib/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
++++ contrib/Makefile.in 2012-05-16 19:18:25.684923160 +0000
+@@ -52,10 +52,10 @@
devclean: distclean
install:
Index: files/patch-include-locations.h.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/icinga/files/patch-include-locations.h.in,v
retrieving revision 1.1
diff -u -r1.1 patch-include-locations.h.in
--- files/patch-include-locations.h.in 23 Feb 2011 17:45:16 -0000 1.1
+++ files/patch-include-locations.h.in 17 May 2012 01:22:05 -0000
@@ -1,11 +1,11 @@
---- include/locations.h.in.orig Tue May 1 08:15:57 2007
-+++ include/locations.h.in Fri Jul 20 15:52:49 2007
-@@ -20,7 +20,7 @@
+--- include/locations.h.in.orig 2012-05-15 13:00:56.000000000 +0000
++++ include/locations.h.in 2012-05-16 19:25:19.455922365 +0000
+@@ -21,7 +21,7 @@
- #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"
+ #define DEFAULT_TEMP_FILE "@STATEDIR@/tempfile"
#define DEFAULT_TEMP_PATH "/tmp"
--#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"
-+#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults"
- #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"
- #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log"
- #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/"
+-#define DEFAULT_CHECK_RESULT_PATH "@STATEDIR@/spool/checkresults"
++#define DEFAULT_CHECK_RESULT_PATH "@STATEDIR@/checkresults"
+ #define DEFAULT_STATUS_FILE "@STATEDIR@/status.dat"
+ #define DEFAULT_LOG_FILE "@LOGDIR@/icinga.log"
+ #define DEFAULT_LOG_ARCHIVE_PATH "@LOGDIR@/archives/"
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list