Attachment #124505 for bug #167988

View | Details | Raw Unified | Return to bug 167988
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= icinga	8	PORTNAME= icinga
9	PORTVERSION= 1.6.1	9	PORTVERSION= 1.7.0
10	PORTREVISION= 1
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (icinga-1.6.1.tar.gz) = 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b	1	SHA256 (icinga-1.7.0.tar.gz) = e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b
2	SIZE (icinga-1.6.1.tar.gz) = 12880538	2	SIZE (icinga-1.7.0.tar.gz) = 12939198




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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

@dirrmtry libexec/icinga
@dirrmtry etc/icinga/objects
@dirrmtry etc/icinga/modules
@dirrmtry etc/icinga/conf.d
@dirrmtry etc/icinga
@dirrmtry %%ICINGAWWWDIR%%/stylesheets/interface
@dirrmtry %%ICINGAWWWDIR%%/stylesheets




--- 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:

 	fi;
 
 	@echo ""
@@ -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

-	$(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/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

-	$(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 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/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

 
 	@echo ""
 	@echo "*** Config files installed ***"
@@ -432,7 +432,7 @@
 	@echo ""
 
 install-webconf:

 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf
 
 	@echo ""
@@ -481,7 +481,7 @@
 
 
 install-commandmode:
-	$(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 "*** Sample Eventhandlers installed ***"




--- 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 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(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@

Lines 1-6 Link Here

(-)files/patch-cgi-Makefile.in (-3 / +3 lines)
1	--- cgi/Makefile.in.orig 2011-08-24 13:57:57.000000000 +0000	1	--- cgi/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
2	+++ cgi/Makefile.in 2011-09-05 22:27:34.493376507 +0000	2	+++ cgi/Makefile.in 2012-05-16 19:18:25.683923624 +0000
3	@@ -198,10 +198,10 @@	3	@@ -199,10 +199,10 @@
4	$(MAKE) install-basic	4	$(MAKE) install-basic
5		5
6	install-basic:	6	install-basic:




--- 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)
-AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
 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

+	have_pthreads="yes"
+	have_thr="yes"
+else
 
 dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
 dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
@@ -205,6 +213,7 @@
@@ -205,6 +212,7 @@
 if test $have_pthreads = "no"; then
 	AC_PTHREAD_FREEBSD
 fi

 
 AC_SUBST(THREADLIBS)
 
@@ -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])

 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)
@@ -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`"

Lines 1-6 Link Here

(-)files/patch-contrib-Makefile.in (-3 / +3 lines)
1	--- contrib/Makefile.in.orig 2011-08-24 13:57:57.000000000 +0000	1	--- contrib/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
2	+++ contrib/Makefile.in 2011-09-05 22:31:21.616521093 +0000	2	+++ contrib/Makefile.in 2012-05-16 19:18:25.684923160 +0000
3	@@ -51,10 +51,10 @@	3	@@ -52,10 +52,10 @@
4	devclean: distclean	4	devclean: distclean
5		5
6	install:	6	install:

Lines 1-11 Link Here

(-)files/patch-include-locations.h.in (-9 / +9 lines)
1	--- include/locations.h.in.orig Tue May 1 08:15:57 2007	1	--- include/locations.h.in.orig 2012-05-15 13:00:56.000000000 +0000
2	+++ include/locations.h.in Fri Jul 20 15:52:49 2007	2	+++ include/locations.h.in 2012-05-16 19:25:19.455922365 +0000
3	@@ -20,7 +20,7 @@	3	@@ -21,7 +21,7 @@
4		4
5	#define DEFAULT_TEMP_FILE "@localstatedir@/tempfile"	5	#define DEFAULT_TEMP_FILE "@STATEDIR@/tempfile"
6	#define DEFAULT_TEMP_PATH "/tmp"	6	#define DEFAULT_TEMP_PATH "/tmp"
7	-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"	7	-#define DEFAULT_CHECK_RESULT_PATH "@STATEDIR@/spool/checkresults"
8	+#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults"	8	+#define DEFAULT_CHECK_RESULT_PATH "@STATEDIR@/checkresults"
9	#define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"	9	#define DEFAULT_STATUS_FILE "@STATEDIR@/status.dat"
10	#define DEFAULT_LOG_FILE "@localstatedir@/nagios.log"	10	#define DEFAULT_LOG_FILE "@LOGDIR@/icinga.log"
11	#define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/"	11	#define DEFAULT_LOG_ARCHIVE_PATH "@LOGDIR@/archives/"

Return to bug 167988

Lines 9-14 Link Here

(-)pkg-plist (+23 lines)
9	bin/icingastats	9	bin/icingastats
10	etc/icinga/cgi.cfg-sample	10	etc/icinga/cgi.cfg-sample
11	etc/icinga/cgiauth.cfg-sample	11	etc/icinga/cgiauth.cfg-sample
		12	etc/icinga/conf.d
12	etc/icinga/icinga.cfg-sample	13	etc/icinga/icinga.cfg-sample
13	etc/icinga/objects/commands.cfg-sample	14	etc/icinga/objects/commands.cfg-sample
14	etc/icinga/objects/contacts.cfg-sample	15	etc/icinga/objects/contacts.cfg-sample
Lines 170-177 Link Here
170	%%ICINGAWWWDIR%%/docs/de/largeinstalltweaks.html	171	%%ICINGAWWWDIR%%/docs/de/largeinstalltweaks.html
171	%%ICINGAWWWDIR%%/docs/de/macrolist.html	172	%%ICINGAWWWDIR%%/docs/de/macrolist.html
172	%%ICINGAWWWDIR%%/docs/de/macros.html	173	%%ICINGAWWWDIR%%/docs/de/macros.html
		174	%%ICINGAWWWDIR%%/docs/de/modified_attr.html
173	%%ICINGAWWWDIR%%/docs/de/monitoring-linux.html	175	%%ICINGAWWWDIR%%/docs/de/monitoring-linux.html
174	%%ICINGAWWWDIR%%/docs/de/monitoring-netware.html	176	%%ICINGAWWWDIR%%/docs/de/monitoring-netware.html
		177	%%ICINGAWWWDIR%%/docs/de/monitoring-overview.html
175	%%ICINGAWWWDIR%%/docs/de/monitoring-printers.html	178	%%ICINGAWWWDIR%%/docs/de/monitoring-printers.html
176	%%ICINGAWWWDIR%%/docs/de/monitoring-publicservices.html	179	%%ICINGAWWWDIR%%/docs/de/monitoring-publicservices.html
177	%%ICINGAWWWDIR%%/docs/de/monitoring-routers.html	180	%%ICINGAWWWDIR%%/docs/de/monitoring-routers.html
Lines 179-184 Link Here
179	%%ICINGAWWWDIR%%/docs/de/mrtggraphs.html	182	%%ICINGAWWWDIR%%/docs/de/mrtggraphs.html
180	%%ICINGAWWWDIR%%/docs/de/networkreachability.html	183	%%ICINGAWWWDIR%%/docs/de/networkreachability.html
181	%%ICINGAWWWDIR%%/docs/de/notifications.html	184	%%ICINGAWWWDIR%%/docs/de/notifications.html
		185	%%ICINGAWWWDIR%%/docs/de/notifications2.html
182	%%ICINGAWWWDIR%%/docs/de/nrpe.html	186	%%ICINGAWWWDIR%%/docs/de/nrpe.html
183	%%ICINGAWWWDIR%%/docs/de/nsca.html	187	%%ICINGAWWWDIR%%/docs/de/nsca.html
184	%%ICINGAWWWDIR%%/docs/de/objectdefinitions.html	188	%%ICINGAWWWDIR%%/docs/de/objectdefinitions.html
Lines 196-201 Link Here
196	%%ICINGAWWWDIR%%/docs/de/quickstart-idoutils-freebsd.html	200	%%ICINGAWWWDIR%%/docs/de/quickstart-idoutils-freebsd.html
197	%%ICINGAWWWDIR%%/docs/de/quickstart-idoutils.html	201	%%ICINGAWWWDIR%%/docs/de/quickstart-idoutils.html
198	%%ICINGAWWWDIR%%/docs/de/quickstart.html	202	%%ICINGAWWWDIR%%/docs/de/quickstart.html
		203	%%ICINGAWWWDIR%%/docs/de/recurring_downtimes.html
199	%%ICINGAWWWDIR%%/docs/de/redundancy.html	204	%%ICINGAWWWDIR%%/docs/de/redundancy.html
200	%%ICINGAWWWDIR%%/docs/de/reporting_1.6.html	205	%%ICINGAWWWDIR%%/docs/de/reporting_1.6.html
201	%%ICINGAWWWDIR%%/docs/de/reporting.html	206	%%ICINGAWWWDIR%%/docs/de/reporting.html
Lines 285-292 Link Here
285	%%ICINGAWWWDIR%%/docs/en/largeinstalltweaks.html	290	%%ICINGAWWWDIR%%/docs/en/largeinstalltweaks.html
286	%%ICINGAWWWDIR%%/docs/en/macrolist.html	291	%%ICINGAWWWDIR%%/docs/en/macrolist.html
287	%%ICINGAWWWDIR%%/docs/en/macros.html	292	%%ICINGAWWWDIR%%/docs/en/macros.html
		293	%%ICINGAWWWDIR%%/docs/en/modified_attr.html
288	%%ICINGAWWWDIR%%/docs/en/monitoring-linux.html	294	%%ICINGAWWWDIR%%/docs/en/monitoring-linux.html
289	%%ICINGAWWWDIR%%/docs/en/monitoring-netware.html	295	%%ICINGAWWWDIR%%/docs/en/monitoring-netware.html
		296	%%ICINGAWWWDIR%%/docs/en/monitoring-overview.html
290	%%ICINGAWWWDIR%%/docs/en/monitoring-printers.html	297	%%ICINGAWWWDIR%%/docs/en/monitoring-printers.html
291	%%ICINGAWWWDIR%%/docs/en/monitoring-publicservices.html	298	%%ICINGAWWWDIR%%/docs/en/monitoring-publicservices.html
292	%%ICINGAWWWDIR%%/docs/en/monitoring-routers.html	299	%%ICINGAWWWDIR%%/docs/en/monitoring-routers.html
Lines 294-299 Link Here
294	%%ICINGAWWWDIR%%/docs/en/mrtggraphs.html	301	%%ICINGAWWWDIR%%/docs/en/mrtggraphs.html
295	%%ICINGAWWWDIR%%/docs/en/networkreachability.html	302	%%ICINGAWWWDIR%%/docs/en/networkreachability.html
296	%%ICINGAWWWDIR%%/docs/en/notifications.html	303	%%ICINGAWWWDIR%%/docs/en/notifications.html
		304	%%ICINGAWWWDIR%%/docs/en/notifications2.html
297	%%ICINGAWWWDIR%%/docs/en/nrpe.html	305	%%ICINGAWWWDIR%%/docs/en/nrpe.html
298	%%ICINGAWWWDIR%%/docs/en/nsca.html	306	%%ICINGAWWWDIR%%/docs/en/nsca.html
299	%%ICINGAWWWDIR%%/docs/en/objectdefinitions.html	307	%%ICINGAWWWDIR%%/docs/en/objectdefinitions.html
Lines 311-316 Link Here
311	%%ICINGAWWWDIR%%/docs/en/quickstart-idoutils-freebsd.html	319	%%ICINGAWWWDIR%%/docs/en/quickstart-idoutils-freebsd.html
312	%%ICINGAWWWDIR%%/docs/en/quickstart-idoutils.html	320	%%ICINGAWWWDIR%%/docs/en/quickstart-idoutils.html
313	%%ICINGAWWWDIR%%/docs/en/quickstart.html	321	%%ICINGAWWWDIR%%/docs/en/quickstart.html
		322	%%ICINGAWWWDIR%%/docs/en/recurring_downtimes.html
314	%%ICINGAWWWDIR%%/docs/en/redundancy.html	323	%%ICINGAWWWDIR%%/docs/en/redundancy.html
315	%%ICINGAWWWDIR%%/docs/en/reporting_1.6.html	324	%%ICINGAWWWDIR%%/docs/en/reporting_1.6.html
316	%%ICINGAWWWDIR%%/docs/en/reporting.html	325	%%ICINGAWWWDIR%%/docs/en/reporting.html
Lines 328-333 Link Here
328	%%ICINGAWWWDIR%%/docs/en/verifyconfig.html	337	%%ICINGAWWWDIR%%/docs/en/verifyconfig.html
329	%%ICINGAWWWDIR%%/docs/en/volatileservices.html	338	%%ICINGAWWWDIR%%/docs/en/volatileservices.html
330	%%ICINGAWWWDIR%%/docs/en/whatsnew.html	339	%%ICINGAWWWDIR%%/docs/en/whatsnew.html
		340	%%ICINGAWWWDIR%%/docs/images/Architecture_1.5_800px.png
331	%%ICINGAWWWDIR%%/docs/images/MyServiceStatus.png	341	%%ICINGAWWWDIR%%/docs/images/MyServiceStatus.png
332	%%ICINGAWWWDIR%%/docs/images/activechecks.png	342	%%ICINGAWWWDIR%%/docs/images/activechecks.png
333	%%ICINGAWWWDIR%%/docs/images/cachedcheckgraphs.png	343	%%ICINGAWWWDIR%%/docs/images/cachedcheckgraphs.png
Lines 416-421 Link Here
416	%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.3.png	426	%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.3.png
417	%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.5.png	427	%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.5.png
418	%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.6.png	428	%%ICINGAWWWDIR%%/docs/images/icinga-web-commands_svc_1.6.png
		429	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.7.png
419	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1.png	430	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1.png
420	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.3.png	431	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.3.png
421	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.5.png	432	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks1_1.5.png
Lines 425-435 Link Here
425	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.5.png	436	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.5.png
426	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.6.png	437	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.6.png
427	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a.png	438	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a.png
		439	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2_1.7.png
428	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.6.png	440	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.6.png
		441	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks2a_1.7.png
429	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3.png	442	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3.png
430	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.3.png	443	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.3.png
431	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.5.png	444	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.5.png
432	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.6.png	445	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.6.png
		446	%%ICINGAWWWDIR%%/docs/images/icinga-web-cronks3_1.7.png
433	%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1.png	447	%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1.png
434	%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.3.png	448	%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.3.png
435	%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.6.png	449	%%ICINGAWWWDIR%%/docs/images/icinga-web-filter1_1.6.png
Lines 454-462 Link Here
454	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.3.png	468	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.3.png
455	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.5.png	469	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.5.png
456	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.6.png	470	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.6.png
		471	%%ICINGAWWWDIR%%/docs/images/icinga-web-overview_1.7.png
457	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1.png	472	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1.png
458	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.3.png	473	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.3.png
459	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.6.png	474	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.6.png
		475	%%ICINGAWWWDIR%%/docs/images/icinga-web-search1_1.7.png
460	%%ICINGAWWWDIR%%/docs/images/icinga-web-settings.png	476	%%ICINGAWWWDIR%%/docs/images/icinga-web-settings.png
461	%%ICINGAWWWDIR%%/docs/images/icinga-web-settings_1.5.png	477	%%ICINGAWWWDIR%%/docs/images/icinga-web-settings_1.5.png
462	%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.5.png	478	%%ICINGAWWWDIR%%/docs/images/icinga-web-srv_1.5.png
Lines 470-475 Link Here
470	%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle4.png	486	%%ICINGAWWWDIR%%/docs/images/icinga-web-tackle4.png
471	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1.png	487	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1.png
472	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.6.png	488	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.6.png
		489	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu1_1.7.png
473	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2.png	490	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2.png
474	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2_1.3.png	491	%%ICINGAWWWDIR%%/docs/images/icinga-web-topmenu2_1.3.png
475	%%ICINGAWWWDIR%%/docs/images/idoutils.png	492	%%ICINGAWWWDIR%%/docs/images/idoutils.png
Lines 583-588 Link Here
583	%%ICINGAWWWDIR%%/images/icinga-logo.png	600	%%ICINGAWWWDIR%%/images/icinga-logo.png
584	%%ICINGAWWWDIR%%/images/icon_collapse.gif	601	%%ICINGAWWWDIR%%/images/icon_collapse.gif
585	%%ICINGAWWWDIR%%/images/icon_expand.gif	602	%%ICINGAWWWDIR%%/images/icon_expand.gif
		603	%%ICINGAWWWDIR%%/images/icon_reload.png
586	%%ICINGAWWWDIR%%/images/info.png	604	%%ICINGAWWWDIR%%/images/info.png
587	%%ICINGAWWWDIR%%/images/interface/bar.gif	605	%%ICINGAWWWDIR%%/images/interface/bar.gif
588	%%ICINGAWWWDIR%%/images/interface/menu_blank.gif	606	%%ICINGAWWWDIR%%/images/interface/menu_blank.gif
Lines 593-601 Link Here
593	%%ICINGAWWWDIR%%/images/interface/menu_more.gif	611	%%ICINGAWWWDIR%%/images/interface/menu_more.gif
594	%%ICINGAWWWDIR%%/images/left.gif	612	%%ICINGAWWWDIR%%/images/left.gif
595	%%ICINGAWWWDIR%%/images/logofullsize.png	613	%%ICINGAWWWDIR%%/images/logofullsize.png
		614	%%ICINGAWWWDIR%%/images/logos/Stats1.gif
		615	%%ICINGAWWWDIR%%/images/logos/Stats2.png
596	%%ICINGAWWWDIR%%/images/logos/icinga.gd2	616	%%ICINGAWWWDIR%%/images/logos/icinga.gd2
597	%%ICINGAWWWDIR%%/images/logos/icinga.gif	617	%%ICINGAWWWDIR%%/images/logos/icinga.gif
598	%%ICINGAWWWDIR%%/images/logos/icingavrml.png	618	%%ICINGAWWWDIR%%/images/logos/icingavrml.png
		619	%%ICINGAWWWDIR%%/images/logos/s.gif
599	%%ICINGAWWWDIR%%/images/logos/unknown.gd2	620	%%ICINGAWWWDIR%%/images/logos/unknown.gd2
600	%%ICINGAWWWDIR%%/images/logos/unknown.gif	621	%%ICINGAWWWDIR%%/images/logos/unknown.gif
601	%%ICINGAWWWDIR%%/images/logrotate.png	622	%%ICINGAWWWDIR%%/images/logrotate.png
Lines 646-651 Link Here
646	%%ICINGAWWWDIR%%/js/jquery-1.6.2.min.js	667	%%ICINGAWWWDIR%%/js/jquery-1.6.2.min.js
647	%%ICINGAWWWDIR%%/js/jquery.dd.js	668	%%ICINGAWWWDIR%%/js/jquery.dd.js
648	%%ICINGAWWWDIR%%/js/menu.js	669	%%ICINGAWWWDIR%%/js/menu.js
		670	%%ICINGAWWWDIR%%/js/page_refresh.js
649	%%ICINGAWWWDIR%%/js/skinnytip.js	671	%%ICINGAWWWDIR%%/js/skinnytip.js
650	%%ICINGAWWWDIR%%/log/.htaccess	672	%%ICINGAWWWDIR%%/log/.htaccess
651	%%ICINGAWWWDIR%%/log/index.htm	673	%%ICINGAWWWDIR%%/log/index.htm
Lines 678-683 Link Here
678	@dirrmtry libexec/icinga	700	@dirrmtry libexec/icinga
679	@dirrmtry etc/icinga/objects	701	@dirrmtry etc/icinga/objects
680	@dirrmtry etc/icinga/modules	702	@dirrmtry etc/icinga/modules
		703	@dirrmtry etc/icinga/conf.d
681	@dirrmtry etc/icinga	704	@dirrmtry etc/icinga
682	@dirrmtry %%ICINGAWWWDIR%%/stylesheets/interface	705	@dirrmtry %%ICINGAWWWDIR%%/stylesheets/interface
683	@dirrmtry %%ICINGAWWWDIR%%/stylesheets	706	@dirrmtry %%ICINGAWWWDIR%%/stylesheets

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-12 / +46 lines)
1	--- Makefile.in.orig 2011-08-24 13:57:57.000000000 +0000	1	--- Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
2	+++ Makefile.in 2011-09-06 00:15:49.832669725 +0000	2	+++ Makefile.in 2012-05-16 21:00:54.567967366 +0000
3	@@ -383,13 +383,13 @@	3	@@ -362,13 +362,13 @@
4	$(MAKE) install-basic	4	$(MAKE) install-basic
5		5
6	install-basic:	6	install-basic:
Lines 20-31 Link Here
20	fi;	20	fi;
21		21
22	@echo ""	22	@echo ""
23	@@ -418,22 +418,22 @@	23	@@ -405,23 +405,23 @@
24		24
25		25
26	install-config:	26	install-config:
27	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	27	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
28	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects	28	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
		29	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
29	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules	30	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
30	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg	31	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg
31	- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg	32	- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
Lines 34-40 Link Here
34	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg	35	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
35	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg	36	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
36	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg	37	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
37	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg	38	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg
38	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg	39	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
39	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg	40	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
40	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg	41	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
Lines 42-56 Link Here
42	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg	43	- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
43	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	44	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
44	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects	45	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
		46	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
45	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules	47	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
46	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg-sample	48	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg-sample
47	+ $(INSTALL) -b -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample	49	+ $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
48	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample	50	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
49	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg-sample	51	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg-sample
50	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample	52	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample
51	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample	53	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample
52	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample	54	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample
53	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample	55	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample
54	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample	56	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample
55	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample	57	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample
56	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg-sample	58	+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg-sample
Lines 59-65 Link Here
59		61
60	@echo ""	62	@echo ""
61	@echo "* Config files installed *"	63	@echo "* Config files installed *"
62	@@ -444,7 +444,7 @@	64	@@ -432,7 +432,7 @@
63	@echo ""	65	@echo ""
64		66
65	install-webconf:	67	install-webconf:
Lines 68-78 Link Here
68	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf	70	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf
69		71
70	@echo ""	72	@echo ""
71	@@ -497,7 +497,6 @@	73	@@ -481,7 +481,7 @@
		74
72		75
73	install-commandmode:	76	install-commandmode:
74	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)	77	- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
75	- chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)	78	+ $(INSTALL) -m 755 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
		79	chmod g+s $(DESTDIR)$(EXTCMDFILEDIR)
		80
		81	@echo ""
		82	@@ -489,18 +489,18 @@
		83	@echo ""
		84
		85	install-eventhandlers:
		86	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)
		87	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring
		88	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
		89	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
		90	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
		91	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
		92	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
		93	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
		94	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
		95	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
		96	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
		97	- $(INSTALL) -b -m 774 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
		98	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)
		99	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring
		100	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1
		101	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result
		102	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks
		103	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks
		104	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications
		105	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications
		106	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler
		107	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca
		108	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event
		109	+ $(INSTALL) -b -m 755 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event
76		110
77	@echo ""	111	@echo ""
78	@echo "* External command directory configured *"	112	@echo "* Sample Eventhandlers installed *"

Lines 1-15 Link Here

(-)files/patch-base-Makefile.in (-9 / +7 lines)
1	--- base/Makefile.in~ 2010-10-23 01:22:32.000000000 +0800	1	--- base/Makefile.in.orig 2012-05-15 13:00:56.000000000 +0000
2	+++ base/Makefile.in 2011-02-16 13:42:58.000000000 +0800	2	+++ base/Makefile.in 2012-05-16 19:18:25.684923160 +0000
3	@@ -205,9 +205,9 @@	3	@@ -207,8 +207,8 @@
4	$(MAKE) install-basic	4	$(MAKE) install-basic
5		5
6	install-basic:	6	install-basic:
7	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)	7	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
8	- $(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)	8	- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
9	- $(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
10	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)	9	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
11	+ $(INSTALL) -m 755 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)	10	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
12	+ $(INSTALL) -m 755 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)	11	$(INSTALL) -m 774 $(INSTALL_OPTS) @icinga_name@ $(DESTDIR)$(BINDIR)
		12	$(INSTALL) -m 774 $(INSTALL_OPTS) @icingastats_name@ $(DESTDIR)$(BINDIR)
13		13
14	strip-post-install:
15	$(STRIP) $(DESTDIR)$(BINDIR)/@icinga_name@

Lines 1-19 Link Here

(-)files/patch-configure.in (-10 / +19 lines)
1	--- configure.in.orig 2011-08-24 13:57:57.000000000 +0000	1	--- configure.in.orig 2012-05-15 13:00:56.000000000 +0000
2	+++ configure.in 2011-09-05 22:30:37.899355262 +0000	2	+++ configure.in 2012-05-16 21:05:28.973178226 +0000
3	@@ -6,7 +6,6 @@	3	@@ -6,7 +6,6 @@
4		4
5	AC_INIT(base/icinga.c)	5	AC_INIT(base/icinga.c)
6	AC_CONFIG_HEADER(include/config.h include/snprintf.h)	6	AC_CONFIG_HEADER(include/config.h)
7	-AC_PREFIX_DEFAULT(/usr/local/icinga)	7	-AC_PREFIX_DEFAULT(/usr/local/icinga)
8		8
9	PKG_NAME=icinga-core	9	PKG_NAME=icinga-core
10	PKG_VERSION="1.5.0"	10	PKG_VERSION="1.7.0"
11	@@ -144,7 +143,15 @@	11	@@ -144,6 +143,15 @@
12	dnl Test for pthreads support - taken from ICU FreeBSD Port configure script	12	dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
13	THREADLIBS=""	13	THREADLIBS=""
14	have_pthreads="no"	14	have_pthreads="no"
15	+have_thr="no"	15	+have_thr="no"
16		16	+
17	+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues	17	+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
18	+AC_CHECK_LIB(thr,pthread_create)	18	+AC_CHECK_LIB(thr,pthread_create)
19	+if test $ac_cv_lib_thr_pthread_create = yes; then	19	+if test $ac_cv_lib_thr_pthread_create = yes; then
Lines 21-30 Link Here
21	+ have_pthreads="yes"	21	+ have_pthreads="yes"
22	+ have_thr="yes"	22	+ have_thr="yes"
23	+else	23	+else
		24
24	dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>	25	dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com>
25	dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>	26	dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
26	AC_DEFUN([AC_PTHREAD_FREEBSD],[	27	@@ -205,6 +213,7 @@
27	@@ -205,6 +212,7 @@
28	if test $have_pthreads = "no"; then	28	if test $have_pthreads = "no"; then
29	AC_PTHREAD_FREEBSD	29	AC_PTHREAD_FREEBSD
30	fi	30	fi
Lines 32-38 Link Here
32		32
33	AC_SUBST(THREADLIBS)	33	AC_SUBST(THREADLIBS)
34		34
35	@@ -223,7 +231,7 @@	35	@@ -223,7 +232,7 @@
36	AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])	36	AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$icinga_user",[user name to run nagios])
37	AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])	37	AC_DEFINE_UNQUOTED(DEFAULT_ICINGA_GROUP,"$icinga_grp",[group name to run nagios])
38	AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])	38	AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$icinga_grp",[group name to run nagios])
Lines 41-47 Link Here
41	AC_SUBST(INSTALL_OPTS)	41	AC_SUBST(INSTALL_OPTS)
42		42
43	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)	43	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)
44	@@ -950,6 +958,9 @@	44	@@ -414,7 +423,7 @@
		45	P1FILELOC=no
		46	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)
		47	if test x$P1FILELOC = xno; then
		48	- P1FILELOC="$libdir"
		49	+ P1FILELOC="$bindir"
		50	fi
		51	AC_SUBST(P1FILELOC)
		52
		53	@@ -1033,6 +1042,9 @@
45		54
46	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])	55	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
47	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"	56	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"