Index: head/net-mgmt/icinga2/Makefile =================================================================== --- head/net-mgmt/icinga2/Makefile (revision 376974) +++ head/net-mgmt/icinga2/Makefile (revision 376975) @@ -1,85 +1,84 @@ # $FreeBSD$ PORTNAME= icinga2 -DISTVERSION= 2.2.2 -PORTREVISION= 1 +DISTVERSION= 2.2.3 CATEGORIES= net-mgmt MASTER_SITES= http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/ MAINTAINER= lme@FreeBSD.org COMMENT= Monitoring and management system for hosts, services and networks LICENSE= GPLv2 LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libyajl.so:${PORTSDIR}/devel/yajl \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash USES= alias bison cmake USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_DEFAULT= MYSQL PGSQL MONPLUGINS MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins MYSQL_CMAKE_ON= -DICINGA2_WITH_MYSQL:BOOL=true PGSQL_CMAKE_ON= -DICINGA2_WITH_PGSQL:BOOL=true ICINGA2USER?= icinga ICINGA2GROUP?= icinga USERS= ${ICINGA2USER} GROUPS= ${ICINGA2GROUP} LOCALSTATEDIR?= /var ICINGA2LOGDIR?= /var/log/${PORTNAME} CMAKE_ARGS+= -DICINGA2_USER=${ICINGA2USER} \ -DICINGA2_GROUP=${ICINGA2GROUP} \ -DICINGA2_COMMAND_USER=${ICINGA2USER} \ -DICINGA2_COMMAND_GROUP=${ICINGA2USER} \ -DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} \ ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf MYSQL_USE= mysql=yes PGSQL_USES= pgsql OPTIONS_SUB= yes .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=2.5.31:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex CXXFLAGS+= -I${LOCALBASE}/include/flex .endif post-patch: .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; ${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \ -exec ${MV} {} {}.sample \; .include Index: head/net-mgmt/icinga2/distinfo =================================================================== --- head/net-mgmt/icinga2/distinfo (revision 376974) +++ head/net-mgmt/icinga2/distinfo (revision 376975) @@ -1,2 +1,2 @@ -SHA256 (icinga2-2.2.2.tar.gz) = b04f49b8083d4507b4a3902843cd8d29a655833327706b390bf2a9c060d96caa -SIZE (icinga2-2.2.2.tar.gz) = 689056 +SHA256 (icinga2-2.2.3.tar.gz) = 1cd6eebc5f9427d03ed12f188f73af0fe26b5b34f2bbdf29fe31024a0d8846b1 +SIZE (icinga2-2.2.3.tar.gz) = 690095 Index: head/net-mgmt/icinga2/files/patch-lib_base_application.cpp =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_base_application.cpp (revision 376974) +++ head/net-mgmt/icinga2/files/patch-lib_base_application.cpp (nonexistent) @@ -1,14 +0,0 @@ ---- lib/base/application.cpp.orig 2015-01-07 20:24:52.914349279 +0100 -+++ lib/base/application.cpp 2015-01-07 20:28:25.822333330 +0100 -@@ -216,10 +216,7 @@ - rl.rlim_max = RLIM_INFINITY; - } - -- if (set_stack_rlimit) -- rl.rlim_cur = 256 * 1024; -- else -- rl.rlim_cur = rl.rlim_max; -+ rl.rlim_cur = rl.rlim_max; - - if (setrlimit(RLIMIT_STACK, &rl) < 0) - Log(LogNotice, "Application", "Could not adjust resource limit for stack size (RLIMIT_STACK)"); Property changes on: head/net-mgmt/icinga2/files/patch-lib_base_application.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property