svn commit: r434567 - in branches/2017Q1/net-mgmt/icinga2: . files

[Lars Engels]

Author: lme
Date: Wed Feb 22 06:13:25 2017
New Revision: 434567
URL: https://svnweb.freebsd.org/changeset/ports/434567

Log:
  MFH: r434522
  
  net-mgmt/icinga2:
  - Add $PREFIX/sbin to PATH in icinga2.in to fix some API issues (icingaweb2-module-director now works!) [1]
  - Remove SIGPIPE trap in icinga2.in which was fixed upstream
  - Bump PORTREVISION
  
  PR:		217266 [1]
  Submitted by:	Philip Jocks
  
  Approved by:	ports-secteam (junovitch)

Modified:
  branches/2017Q1/net-mgmt/icinga2/Makefile
  branches/2017Q1/net-mgmt/icinga2/files/icinga2.in
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/net-mgmt/icinga2/Makefile
==============================================================================
--- branches/2017Q1/net-mgmt/icinga2/Makefile	Wed Feb 22 04:48:12 2017	(r434566)
+++ branches/2017Q1/net-mgmt/icinga2/Makefile	Wed Feb 22 06:13:25 2017	(r434567)
@@ -3,6 +3,7 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme at FreeBSD.org

Modified: branches/2017Q1/net-mgmt/icinga2/files/icinga2.in
==============================================================================
--- branches/2017Q1/net-mgmt/icinga2/files/icinga2.in	Wed Feb 22 04:48:12 2017	(r434566)
+++ branches/2017Q1/net-mgmt/icinga2/files/icinga2.in	Wed Feb 22 06:13:25 2017	(r434567)
@@ -19,14 +19,9 @@
 
 . /etc/rc.subr
 
-# XXX temporary workaround for a bug in Icinga 2. See
-# https://dev.icinga.org/issues/13567
-
-trap "" SIGPIPE
-
 # Add /usr/local/bin to path, so that the notification scripts 
 # can work (#!/usr/bin/env bash)
-export PATH=$PATH:%%LOCALBASE%%/bin
+export PATH=$PATH:%%LOCALBASE%%/bin:%%PREFIX%%/sbin
 
 name="icinga2"
 rcvar=icinga2_enable