Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jan 2015 20:35:39 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r376500 - in branches/2015Q1/net-mgmt/icinga2: . files
Message-ID:  <201501072035.t07KZdWm096142@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Wed Jan  7 20:35:38 2015
New Revision: 376500
URL: https://svnweb.freebsd.org/changeset/ports/376500
QAT: https://qat.redports.org/buildarchive/r376500/

Log:
  MFH: r376495
  
  - Fix segfault at startup by hardcoding "--no-stack-rlimit" in lib/base/application.cpp
  - Bump PORTREVISION
  
  Noticed by:	ohauer
  Approved by:	portmgr (bapt)

Added:
  branches/2015Q1/net-mgmt/icinga2/files/patch-lib_base_application.cpp
     - copied unchanged from r376495, head/net-mgmt/icinga2/files/patch-lib_base_application.cpp
Modified:
  branches/2015Q1/net-mgmt/icinga2/Makefile
Directory Properties:
  branches/2015Q1/   (props changed)

Modified: branches/2015Q1/net-mgmt/icinga2/Makefile
==============================================================================
--- branches/2015Q1/net-mgmt/icinga2/Makefile	Wed Jan  7 20:12:37 2015	(r376499)
+++ branches/2015Q1/net-mgmt/icinga2/Makefile	Wed Jan  7 20:35:38 2015	(r376500)
@@ -2,6 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/
 

Copied: branches/2015Q1/net-mgmt/icinga2/files/patch-lib_base_application.cpp (from r376495, head/net-mgmt/icinga2/files/patch-lib_base_application.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q1/net-mgmt/icinga2/files/patch-lib_base_application.cpp	Wed Jan  7 20:35:38 2015	(r376500, copy of r376495, head/net-mgmt/icinga2/files/patch-lib_base_application.cpp)
@@ -0,0 +1,14 @@
+--- 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)");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501072035.t07KZdWm096142>