From owner-svn-ports-all@freebsd.org Tue Feb 26 14:58:11 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25F47151BD32; Tue, 26 Feb 2019 14:58:11 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE3B288E3A; Tue, 26 Feb 2019 14:58:10 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B01BB6B71; Tue, 26 Feb 2019 14:58:10 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1QEwAak071908; Tue, 26 Feb 2019 14:58:10 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1QEw9WX071905; Tue, 26 Feb 2019 14:58:09 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201902261458.x1QEw9WX071905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Tue, 26 Feb 2019 14:58:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r493969 - in branches/2019Q1/net-mgmt/icinga2: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: lme X-SVN-Commit-Paths: in branches/2019Q1/net-mgmt/icinga2: . files X-SVN-Commit-Revision: 493969 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BE3B288E3A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2019 14:58:11 -0000 Author: lme Date: Tue Feb 26 14:58:09 2019 New Revision: 493969 URL: https://svnweb.freebsd.org/changeset/ports/493969 Log: MFH: r493968 net-mgmt/icinga2: - Update to Bugfix release 2.10.3 - Make Icinga user, group and webgroup configurable in rc.conf [1] Submitted by: Alexey Kuznetsov (via mail) Approved by: ports-secteam (joneum) Deleted: branches/2019Q1/net-mgmt/icinga2/files/patch-lib_base_tcpsocket.cpp Modified: branches/2019Q1/net-mgmt/icinga2/Makefile branches/2019Q1/net-mgmt/icinga2/distinfo branches/2019Q1/net-mgmt/icinga2/files/icinga2.in branches/2019Q1/net-mgmt/icinga2/pkg-plist Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/net-mgmt/icinga2/Makefile ============================================================================== --- branches/2019Q1/net-mgmt/icinga2/Makefile Tue Feb 26 14:47:55 2019 (r493968) +++ branches/2019Q1/net-mgmt/icinga2/Makefile Tue Feb 26 14:58:09 2019 (r493969) @@ -2,8 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.10.2 -PORTREVISION= 3 +DISTVERSION= 2.10.3 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org Modified: branches/2019Q1/net-mgmt/icinga2/distinfo ============================================================================== --- branches/2019Q1/net-mgmt/icinga2/distinfo Tue Feb 26 14:47:55 2019 (r493968) +++ branches/2019Q1/net-mgmt/icinga2/distinfo Tue Feb 26 14:58:09 2019 (r493969) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542285281 -SHA256 (icinga-icinga2-v2.10.2_GH0.tar.gz) = 99ab0c511a8a7014b9cf9467fe126d4a369026e9353f6e64c05ae39a15b32ad9 -SIZE (icinga-icinga2-v2.10.2_GH0.tar.gz) = 4408535 +TIMESTAMP = 1551186744 +SHA256 (icinga-icinga2-v2.10.3_GH0.tar.gz) = 81d250ca7e609097dc78cb7fea646bdede5ecb4fd435b37d21f8ba3335fb7fd4 +SIZE (icinga-icinga2-v2.10.3_GH0.tar.gz) = 4421984 Modified: branches/2019Q1/net-mgmt/icinga2/files/icinga2.in ============================================================================== --- branches/2019Q1/net-mgmt/icinga2/files/icinga2.in Tue Feb 26 14:47:55 2019 (r493968) +++ branches/2019Q1/net-mgmt/icinga2/files/icinga2.in Tue Feb 26 14:58:09 2019 (r493969) @@ -32,12 +32,14 @@ load_rc_config "${name}" : ${icinga2_enable:="NO"} : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"} : ${icinga2_mkvar:="NO"} +: ${icinga2_user:="%%ICINGA2USER%%"} +: ${icinga2_group:="%%ICINGA2GROUP%%"} +: ${icinga2_webgroup:="www"} + command="%%PREFIX%%/sbin/${name}" procname="/usr/local/lib/icinga2/sbin/icinga2" extra_commands="reload checkconfig configtest" -icinga2_user="%%ICINGA2USER%%" -icinga2_group="%%ICINGA2GROUP%%" icinga2_cachedir="/var/cache/${name}" icinga2_libdir="/var/lib/${name}" @@ -98,14 +100,16 @@ start_precmd() { fi done - install -d -o ${icinga2_user} -g www "${icinga2_rundir}/cmd" + install -d -o ${icinga2_user} -g ${icinga2_webgroup} "${icinga2_rundir}/cmd" + fi chown -R ${icinga2_user}:${icinga2_group} "${icinga2_libdir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_spooldir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_cachedir}" - chown -R ${icinga2_user}:www "${icinga2_rundir}/cmd" + chown -R ${icinga2_user}:${icinga2_webgroup} "${icinga2_rundir}/cmd" + if ! icinga2_checkconfig; then return 1 Modified: branches/2019Q1/net-mgmt/icinga2/pkg-plist ============================================================================== --- branches/2019Q1/net-mgmt/icinga2/pkg-plist Tue Feb 26 14:47:55 2019 (r493968) +++ branches/2019Q1/net-mgmt/icinga2/pkg-plist Tue Feb 26 14:58:09 2019 (r493969) @@ -37,9 +37,9 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README %%MYSQL%%lib/icinga2/libmysql_shim.so -%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.2 +%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.3 %%PGSQL%%lib/icinga2/libpgsql_shim.so -%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.2 +%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.3 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api man/man8/icinga2.8.gz