Date: Sat, 25 Jul 2015 15:39:10 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392889 - in head/net-mgmt/icinga: . files Message-ID: <201507251539.t6PFdALP098216@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Sat Jul 25 15:39:09 2015 New Revision: 392889 URL: https://svnweb.freebsd.org/changeset/ports/392889 Log: - Update to 1.13.3 - Remove no longer needed patches or convert them to use ${REINPLACE_CMD} - Without the patches autoconf is obsolete - Install Apache 2.x sample config to apache2 subdir - Do some more s/Linux/${OPSYS}/ in the sample config files - Set mode for the CGIs in plist Committed from: Essen FreeBSD Hackathon Deleted: head/net-mgmt/icinga/files/patch-cgi-Makefile.in head/net-mgmt/icinga/files/patch-configure.in head/net-mgmt/icinga/files/patch-contrib-Makefile.in head/net-mgmt/icinga/files/patch-include-locations.h.in head/net-mgmt/icinga/files/patch-module-idoutils-src-Makefile.in head/net-mgmt/icinga/files/patch-sample-config-template-object-localhost.cfg.in head/net-mgmt/icinga/files/patch-sample-config-template-object-templates.cfg.in Modified: head/net-mgmt/icinga/Makefile head/net-mgmt/icinga/distinfo head/net-mgmt/icinga/files/patch-Makefile.in head/net-mgmt/icinga/files/patch-include_config.h.in head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in head/net-mgmt/icinga/files/pkg-message.in head/net-mgmt/icinga/pkg-plist Modified: head/net-mgmt/icinga/Makefile ============================================================================== --- head/net-mgmt/icinga/Makefile Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/Makefile Sat Jul 25 15:39:09 2015 (r392889) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= icinga -PORTVERSION= 1.13.1 -PORTREVISION= 1 +PORTVERSION= 1.13.3 CATEGORIES= net-mgmt MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/ @@ -15,8 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \ libgd.so:${PORTSDIR}/graphics/gd -USES= cpe gmake -USE_AUTOTOOLS= autoconf +USES= cpe gmake perl5 USE_RC_SUBR= icinga GNU_CONFIGURE= yes @@ -50,7 +48,7 @@ CONFIGURE_ARGS= --with-command-user=${IC --libexecdir=${PREFIX}/libexec/icinga \ --with-plugin-dir=${LOCALBASE}/libexec/nagios \ --with-log-dir=${ICINGALOGDIR} \ - --with-httpd-conf=${EXAMPLESDIR}/apache22 \ + --with-httpd-conf=${EXAMPLESDIR}/apache2 \ --enable-event-broker \ --enable-nanosleep \ ac_cv_lib_iconv_main=no @@ -58,6 +56,8 @@ CONFIGURE_ARGS= --with-command-user=${IC CONFIGURE_ENV= PERL=${PERL} \ HOME=${WRKDIR} # prevent creation of .rnd file +MAKE_ARGS= INSTALL_OPTS= INSTALL_OPTS_WEB= + INSTALL_TARGET= install install-config install-eventhandlers install-webconf PLIST_SUB= ICINGADIR=${ICINGADIR} \ @@ -105,8 +105,14 @@ CONFIGURE_ARGS+= --disable-idoutils post-patch: @${REINPLACE_CMD} -e 's#/bin/ping#/sbin/ping#' \ ${WRKSRC}/sample-config/cgi.cfg.in +.for f in icinga.cfg.in \ + cgiauth.cfg.in \ + template-object/localhost.cfg.in \ + template-object/templates.cfg.in @${REINPLACE_CMD} -e 's#Linux#${OPSYS}#' \ - ${WRKSRC}/sample-config/icinga.cfg.in + -e 's#linux#${OPSYS:tl}#' \ + ${WRKSRC}/sample-config/${f} +.endfor @${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \ ${WRKSRC}/html/Makefile.in # Use correct make(1) syntax to unbreak parallel builds Modified: head/net-mgmt/icinga/distinfo ============================================================================== --- head/net-mgmt/icinga/distinfo Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/distinfo Sat Jul 25 15:39:09 2015 (r392889) @@ -1,2 +1,2 @@ -SHA256 (icinga-1.13.1.tar.gz) = 5dd382bb3bf7edb1dc87818fc74ad8e96b581f27c39a198e0afa7dd2776dcf7b -SIZE (icinga-1.13.1.tar.gz) = 18736941 +SHA256 (icinga-1.13.3.tar.gz) = d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 +SIZE (icinga-1.13.3.tar.gz) = 18738204 Modified: head/net-mgmt/icinga/files/patch-Makefile.in ============================================================================== --- head/net-mgmt/icinga/files/patch-Makefile.in Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/files/patch-Makefile.in Sat Jul 25 15:39:09 2015 (r392889) @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2015-03-30 10:38:53.000000000 +0200 -+++ Makefile.in 2015-03-30 23:20:40.445568000 +0200 +--- Makefile.in.orig 2015-07-15 13:04:09.000000000 +0200 ++++ Makefile.in 2015-07-25 16:26:11.654840000 +0200 @@ -139,16 +139,16 @@ none: ############################### @@ -134,7 +134,7 @@ cp ${SRC_DOCBOOK_IMAGES}/*.png ${SRC_DOCS_IMAGES}/ @echo "updated docs :)" -@@ -349,37 +349,33 @@ submodule-update-latest: +@@ -349,37 +349,32 @@ submodule-update-latest: install-html: @@ -175,28 +175,30 @@ install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) if [ $(INSTALLPERLSTUFF) = yes ]; then \ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(P1FILELOC); \ $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(P1FILELOC); \ -@@ -425,8 +421,8 @@ install-basic: +@@ -424,32 +419,31 @@ install-basic: + @echo "" install-cgiconf: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg.sample ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) ++ $(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-config: install-cgiconf -@@ -434,22 +430,21 @@ install-config: install-cgiconf - $(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) -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 @@ -213,43 +215,51 @@ - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/pnp4nagios.cfg $(DESTDIR)$(CFGDIR)/modules/pnp4nagios.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/flapjack.cfg $(DESTDIR)$(CFGDIR)/modules/flapjack.cfg - -+ $(INSTALL) -b -m 664 $(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 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/livestatus.cfg $(DESTDIR)$(CFGDIR)/modules/livestatus.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/mod_gearman.cfg $(DESTDIR)$(CFGDIR)/modules/mod_gearman.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/pnp4nagios.cfg $(DESTDIR)$(CFGDIR)/modules/pnp4nagios.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/modules/flapjack.cfg $(DESTDIR)$(CFGDIR)/modules/flapjack.cfg.sample ++ $(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 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 ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/modules/livestatus.cfg $(DESTDIR)$(CFGDIR)/modules/livestatus.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/modules/mod_gearman.cfg $(DESTDIR)$(CFGDIR)/modules/mod_gearman.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/modules/pnp4nagios.cfg $(DESTDIR)$(CFGDIR)/modules/pnp4nagios.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/modules/flapjack.cfg $(DESTDIR)$(CFGDIR)/modules/flapjack.cfg.sample @echo "" @echo "*** Config files installed ***" @echo "" -@@ -466,7 +461,7 @@ install-testconfig: +@@ -465,8 +459,8 @@ install-testconfig: + install-webconf: - $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) +- $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) - $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE) ++ $(MKDIR) -p -m 755 $(DESTDIR)$(HTTPD_CONF) + $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE).sample @if [ x$(APACHE24_DEBIAN) = xyes ]; then \ echo " Debian Apache 2.4 detected. " ;\ echo " Run 'a2enconf icinga' and 'service apache2 reload'" ;\ -@@ -479,7 +474,7 @@ install-webconf: +@@ -478,8 +472,8 @@ install-webconf: + install-webconf-auth: - $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) +- $(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF) - $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE) -+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE).sample ++ $(MKDIR) -p -m 755 $(DESTDIR)$(HTTPD_CONF) ++ $(INSTALL) -b -m 640 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE).sample @echo "" @echo "*** Icinga http auth file installed ***" -@@ -488,7 +483,7 @@ install-webconf-auth: +@@ -488,7 +482,7 @@ install-webconf-auth: install-idoutils: @if [ x$(USE_IDOUTILS) = xyes ]; then \ @@ -258,3 +268,61 @@ fi @if [ x$(USE_IDOUTILS) = xyes ]; then \ echo "" ;\ +@@ -537,27 +531,27 @@ install-commandmode: + @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 744 $(INSTALL_OPTS) contrib/eventhandlers/submit_check_result $(DESTDIR)$(EVENTHANDLERDIR)/submit_check_result ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/disable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/disable_active_service_checks ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/enable_active_service_checks $(DESTDIR)$(EVENTHANDLERDIR)/enable_active_service_checks ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/disable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/disable_notifications ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/enable_notifications $(DESTDIR)$(EVENTHANDLERDIR)/enable_notifications ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/obsessive_svc_handler ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca $(DESTDIR)$(EVENTHANDLERDIR)/distributed-monitoring/submit_check_result_via_nsca ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-host-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-host-event ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event $(DESTDIR)$(EVENTHANDLERDIR)/redundancy-scenario1/handle-master-proc-event + + @echo "" + @echo "*** Sample Eventhandlers installed ***" + @echo "" + + install-downtimes: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(DOWNTIMESDIR) +- $(INSTALL) -b -m 774 $(INSTALL_OPTS) tools/downtimes/sched_down.pl $(DESTDIR)$(DOWNTIMESDIR)/sched_down.pl +- $(INSTALL) -b -m 774 $(INSTALL_OPTS) tools/downtimes/sched_conv.pl $(DESTDIR)$(DOWNTIMESDIR)/sched_conv.pl ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DOWNTIMESDIR) ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) tools/downtimes/sched_down.pl $(DESTDIR)$(DOWNTIMESDIR)/sched_down.pl ++ $(INSTALL) -b -m 744 $(INSTALL_OPTS) tools/downtimes/sched_conv.pl $(DESTDIR)$(DOWNTIMESDIR)/sched_conv.pl + + @echo "" + @echo "*** Recurring downtimes scripts installed ***" +@@ -572,10 +566,10 @@ install-classicui-standalone-conf: insta + install-classicui-standalone: install-cgis install-html + + # make sure we keep all the needed dirs for data +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives +- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) ++ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives ++ $(INSTALL) -m 755 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR) + + @echo "" + @echo "*** Icinga Classic UI Standalone installed. ***" Modified: head/net-mgmt/icinga/files/patch-include_config.h.in ============================================================================== --- head/net-mgmt/icinga/files/patch-include_config.h.in Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/files/patch-include_config.h.in Sat Jul 25 15:39:09 2015 (r392889) @@ -1,9 +1,10 @@ ---- include/config.h.in.orig 2014-03-13 11:46:50.000000000 +0100 -+++ include/config.h.in 2014-03-13 21:48:34.174302852 +0100 -@@ -217,10 +217,12 @@ +--- include/config.h.in.orig 2015-07-15 13:04:09.000000000 +0200 ++++ include/config.h.in 2015-07-25 16:05:16.168060000 +0200 +@@ -217,10 +217,13 @@ #include <errno.h> #endif ++/* remove inclusion of sys/timeb.h to suppress a lot of warnings during build */ +#if 0 #undef HAVE_SYS_TIMEB_H #if HAVE_SYS_TIMEB_H Modified: head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in ============================================================================== --- head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/files/patch-module-idoutils-Makefile.in Sat Jul 25 15:39:09 2015 (r392889) @@ -33,8 +33,8 @@ - $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR) - $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules - $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)/ido2db.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)/idomod.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules/idoutils.cfg.sample -+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)/ido2db.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)/idomod.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules/idoutils.cfg.sample ++ $(INSTALL) -b -m 644 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg.sample Modified: head/net-mgmt/icinga/files/pkg-message.in ============================================================================== --- head/net-mgmt/icinga/files/pkg-message.in Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/files/pkg-message.in Sat Jul 25 15:39:09 2015 (r392889) @@ -11,10 +11,12 @@ install and configure one to finish off your Icinga installation. A sample Apache 2.x configuration is installed as - %%PREFIX%%/%%EXAMPLESDIR%%/apache22/icinga.conf-sample + %%PREFIX%%/%%EXAMPLESDIR%%/apache2/icinga.conf-sample If you like to use database backend with IDOutils the SQL scripts to setup the database have been installed in %%PREFIX%%/%%EXAMPLESDIR%%/idoutils/db/. + You also need to install databases/libdbi-drivers to connect to a + database. ************************************************************************* Modified: head/net-mgmt/icinga/pkg-plist ============================================================================== --- head/net-mgmt/icinga/pkg-plist Sat Jul 25 15:20:51 2015 (r392888) +++ head/net-mgmt/icinga/pkg-plist Sat Jul 25 15:39:09 2015 (r392889) @@ -33,7 +33,7 @@ libexec/icinga/eventhandlers/enable_noti libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-host-event libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-proc-event libexec/icinga/eventhandlers/submit_check_result -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache22/icinga.conf.sample +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache2/icinga.conf.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample.in %%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db_check_proc.cfg @@ -156,6 +156,7 @@ libexec/icinga/eventhandlers/submit_chec %%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/prepsql.in %%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/upgradedb %%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/scripts/upgradedb.in +@mode 755 %%ICINGAWWWDIR%%/cgi-bin/avail.cgi %%ICINGAWWWDIR%%/cgi-bin/cmd.cgi %%ICINGAWWWDIR%%/cgi-bin/config.cgi @@ -170,6 +171,7 @@ libexec/icinga/eventhandlers/submit_chec %%ICINGAWWWDIR%%/cgi-bin/summary.cgi %%ICINGAWWWDIR%%/cgi-bin/tac.cgi %%ICINGAWWWDIR%%/cgi-bin/trends.cgi +@mode %%ICINGAWWWDIR%%/docs/de/about.html %%ICINGAWWWDIR%%/docs/de/activechecks.html %%ICINGAWWWDIR%%/docs/de/adaptive.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507251539.t6PFdALP098216>